assess-admin/src/main/resources/db/migration/V20240809001_change_estimate_schedule.sql
对比新文件 @@ -0,0 +1,3 @@ ALTER TABLE `smart_assess`.`ass_estimate_schedule` MODIFY COLUMN `start_date` datetime(0) NULL COMMENT '开始时间', MODIFY COLUMN `end_date` datetime(0) NULL COMMENT '结束时间'; assess-admin/src/main/resources/logback-spring.xml
@@ -14,10 +14,7 @@ <property name="log.path" value="logs"/> <!--日志文件保存路径--> <property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <!--LogStash访问host--> <springProperty name="LOG_STASH_HOST" scope="context" source="logstash.host" defaultValue="localhost"/> <!--是否开启LogStash插件内部日志--> <springProperty name="ENABLE_INNER_LOG" scope="context" source="logstash.enableInnerLog" defaultValue="false"/> <!-- 控制台输出 --> assess-system/src/main/java/com/gkhy/assess/system/domain/AssEstimateSchedule.java
@@ -47,12 +47,12 @@ @TableField("schedule_type") private Integer scheduleType; @NotNull(message = "开始时间不能为空") // @NotNull(message = "开始时间不能为空") @ApiModelProperty("开始时间") @TableField("start_date") private LocalDateTime startDate; @NotNull(message = "结束时间不能为空") // @NotNull(message = "结束时间不能为空") @ApiModelProperty("结束时间") @TableField("end_date") private LocalDateTime endDate; assess-system/src/main/java/com/gkhy/assess/system/domain/AssProjectSupplement.java
@@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.util.List; import com.gkhy.assess.common.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -28,7 +29,7 @@ @Setter @TableName("ass_project_supplement") @ApiModel(value = "AssProjectSupplement对象", description = "项目补录表") public class AssProjectSupplement implements Serializable { public class AssProjectSupplement extends BaseEntity { private static final long serialVersionUID = 1L; @@ -72,26 +73,6 @@ @ApiModelProperty("乐观锁") @TableField("version") private Integer version; @ApiModelProperty("创建人") @TableField("create_by") private String createBy; @ApiModelProperty("创建时间") @TableField("create_time") private LocalDateTime createTime; @ApiModelProperty("更新人") @TableField("update_by") private String updateBy; @ApiModelProperty("更新时间") @TableField("update_time") private LocalDateTime updateTime; @ApiModelProperty("备注") @TableField("remark") private String remark; @NotEmpty(message = "附件列表不能为空") @ApiModelProperty(value = "附件列表",required = true) assess-system/src/main/resources/mapper/AssProjectSupplementMapper.xml
@@ -28,11 +28,17 @@ left join sys_agency a on a.id=s.agency_id <where> <if test="name!=null and name!=''"> and s.name like ('%',#{name},'%') and s.name like concat('%',#{name},'%') </if> <if test="agencyId!=null"> and s.agency_id =#{agencyId} </if> <if test="params.startTime!=null and params.startTime!=''"> and s.filing_date >= #{params.startTime} </if> <if test="params.endTime!=null and params.endTime!=''"> and s.filing_date <= #{params.endTime} </if> </where> order by s.create_time desc </select>