fix: 添加计划时间

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalPlan.java

@@ -1,16 +1,14 @@
 package com.kms.yxgh.df.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.SyBaseEntity;
-import com.shuili.common.core.domain.BaseEntity;
+import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.shuili.common.annotation.Excel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
 
+import java.util.Date;
 
 
 /**
@@ -22,77 +20,107 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_df_hdjh")
 @Data
 @ApiModel("害堤动物防治计划")
-public class DfAnimalPlan extends SyBaseEntity
-{
+public class DfAnimalPlan extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 堤防代码 */
+    /**
+     * 堤防代码
+     */
     @Excel(name = "堤防代码")
     @ApiModelProperty("堤防代码")
     private String dikeCode;
 
-    /** 害堤动物防治计划名称 */
+    /**
+     * 害堤动物防治计划名称
+     */
     @Excel(name = "害堤动物防治计划名称")
     @ApiModelProperty("害堤动物防治计划名称")
     private String name;
 
-    /** 防治类型 */
+    /**
+     * 防治类型
+     */
     @Excel(name = "防治类型")
     @ApiModelProperty("防治类型")
     private String type;
 
-    /** 堤防级别 */
+    /**
+     * 堤防级别
+     */
     @Excel(name = "堤防级别")
     @ApiModelProperty("堤防级别")
     private String dikeLevel;
 
-    /** 堤防类型 */
+    /**
+     * 堤防类型
+     */
     @Excel(name = "堤防类型")
     @ApiModelProperty("堤防类型")
     private String dikeType;
 
-    /** 防治说明 */
+    /**
+     * 防治说明
+     */
     @Excel(name = "防治说明")
     @ApiModelProperty("防治说明")
     private String instruction;
 
-    /** 工作月份 */
+    /**
+     * 工作月份
+     */
     @Excel(name = "工作月份")
     @ApiModelProperty("工作月份")
     private Long month;
 
-    /** 检查次数 */
+    @ApiModelProperty("计划时间")
+    private Date planTime;
+
+    /**
+     * 检查次数
+     */
     @Excel(name = "检查次数")
     @ApiModelProperty("检查次数")
     private Long frequency;
 
-    /** 周期 */
+    /**
+     * 周期
+     */
     @Excel(name = "周期")
     @ApiModelProperty("周期")
     private String cycleType;
 
-    /** 是否提醒 */
+    /**
+     * 是否提醒
+     */
     @Excel(name = "是否提醒")
     @ApiModelProperty("是否提醒")
     private Long isReminder;
 
-    /** 提醒时间 */
+    /**
+     * 提醒时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("提醒时间")
     private Date reminderTime;
 
-    /** 附加配置 */
+    /**
+     * 附加配置
+     */
     @Excel(name = "附加配置")
     @ApiModelProperty("附加配置")
     private String otherConfig;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人")
     @ApiModelProperty("创建人")
     private String createUid;
 
-    /** 最近修改人 */
+    /**
+     * 最近修改人
+     */
     @Excel(name = "最近修改人")
     @ApiModelProperty("最近修改人")
     private String updateUid;

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java

@@ -1,16 +1,12 @@
 package com.kms.yxgh.df.dto;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -70,6 +66,10 @@ public class DfAnimalPlanSimpleDto {
     @ApiModelProperty("工作月份")
     private String month;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("计划时间")
+    private Date planTime;
+
     /**
      * 检查次数
      */
@@ -113,6 +113,7 @@ public class DfAnimalPlanSimpleDto {
     @ApiModelProperty("最近修改人")
     private String updateUid;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
     private Date createTime;
 

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java

@@ -1,14 +1,13 @@
 package com.kms.yxgh.df.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.df.domain.DfAnimalPlan;
 import com.kms.yxgh.df.dto.DfAnimalPlanSimpleDto;
-import com.kms.yxgh.df.dto.DfYhPlanDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 害堤动物防治计划Mapper接口
@@ -21,7 +20,7 @@ public interface DfAnimalPlanMapper extends BaseMapper<DfAnimalPlan> {
 
 
     @Select("<script>" +
-            "SELECT p.id, p.dike_code AS dikeCode, j.dike_name AS dikeName, p.name, p.type, j.dike_grad AS dikeGrad, j.dike_type AS dikeType, " +
+            "SELECT p.id, p.dike_code AS dikeCode, j.dike_name AS dikeName, p.plan_time, p.name, p.type, j.dike_grad AS dikeGrad, j.dike_type AS dikeType, " +
             "p.instruction, p.month, p.frequency, p.cycle_type AS cycleType, p.is_reminder AS isReminder, p.reminder_time AS reminderTime, " +
             "p.other_config AS otherConfig, p.create_uid AS createUid, p.update_uid AS updateUid, p.create_time as createTime,p.update_time as updateTime " +
             "FROM bs_sgc_df_hdjh p " +

sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

@@ -4,6 +4,8 @@ ALTER TABLE `bs_sgc_df_yhjl` MODIFY COLUMN `PLAN_ID` varchar(18) COLLATE utf8mb4
 ALTER TABLE `bs_sgc_sz_yhjl` MODIFY COLUMN WAGA_CODE varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '水闸代码';
 ALTER TABLE `bs_sgc_sz_yhjl` MODIFY COLUMN `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci  COMMENT '计划代码';
 
+ALTER TABLE `bs_sgc_df_hdjh` ADD  `PLAN_TIME` datetime DEFAULT NULL COMMENT '计划时间';
+
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
 ALTER TABLE `bs_sgc_df_xsjh` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
 ALTER TABLE `bs_sgc_df_hdjl` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';