feat: 使用字典的字段修改为String类型

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

@@ -39,7 +39,7 @@ public class DfAnimalPlan extends SyBaseEntity
     /** 防治类型 */
     @Excel(name = "防治类型")
     @ApiModelProperty("防治类型")
-    private Long type;
+    private String type;
 
     /** 堤防级别 */
     @Excel(name = "堤防级别")
@@ -69,7 +69,7 @@ public class DfAnimalPlan extends SyBaseEntity
     /** 周期 */
     @Excel(name = "周期")
     @ApiModelProperty("周期")
-    private Long cycleType;
+    private String cycleType;
 
     /** 是否提醒 */
     @Excel(name = "是否提醒")

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

@@ -1,16 +1,13 @@
 package com.kms.yxgh.df.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.kms.yxgh.base.SyBaseEntity;
-import com.shuili.common.core.domain.BaseEntity;
+import com.shuili.common.annotation.Excel;
 import com.shuili.common.mybaitsplus.NoQuery;
 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;
-
 
 
 /**
@@ -22,36 +19,47 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName("bs_sgc_df_hdjhxq")
 @Data
 @ApiModel("害堤动物防治计划详情")
-public class DfAnimalPlanDetail extends SyBaseEntity
-{
+public class DfAnimalPlanDetail extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 害堤动物防治计划ID */
+    /**
+     * 害堤动物防治计划ID
+     */
     @Excel(name = "害堤动物防治计划ID")
     @ApiModelProperty("害堤动物防治计划ID")
     private String planId;
 
-    /** 工作内容 */
+    /**
+     * 工作内容
+     */
     @Excel(name = "工作内容")
     @ApiModelProperty("工作内容")
     private String jobContent;
 
-    /** 施工日期 */
+    /**
+     * 施工日期
+     */
     @Excel(name = "施工日期")
     @ApiModelProperty("施工日期")
     private String constructionDate;
 
-    /** 计划工日 */
+    /**
+     * 计划工日
+     */
     @Excel(name = "计划工日")
     @ApiModelProperty("计划工日")
     private Long planDays;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人")
     @ApiModelProperty("创建人")
     private String createUid;
 
-    /** 最近修改人 */
+    /**
+     * 最近修改人
+     */
     @Excel(name = "最近修改人")
     @ApiModelProperty("最近修改人")
     private String updateUid;

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

@@ -3,7 +3,6 @@ package com.kms.yxgh.df.domain;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
-import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,7 +38,7 @@ public class DfAnimalRecord extends SyBaseEntity {
      */
     @Excel(name = "施工地点")
     @ApiModelProperty("施工地点")
-    private Long location;
+    private String location;
 
     /**
      * 检查施工情况
@@ -53,14 +52,14 @@ public class DfAnimalRecord extends SyBaseEntity {
      */
     @Excel(name = "有害生物")
     @ApiModelProperty("有害生物")
-    private Long pest;
+    private String pest;
 
     /**
      * 状态
      */
     @Excel(name = "状态")
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
     /**
      * 创建人

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

@@ -1,12 +1,10 @@
 package com.kms.yxgh.df.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.Data;
 
 
@@ -21,20 +19,20 @@ import lombok.Data;
 @ApiModel("堤防巡视检查")
 public class DfChecking extends SyBaseEntity {
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  /**
-   * 巡查名称
-   */
-  @Excel(name = "巡查名称")
-  @ApiModelProperty("巡查名称")
-  private String name;
+    /**
+     * 巡查名称
+     */
+    @Excel(name = "巡查名称")
+    @ApiModelProperty("巡查名称")
+    private String name;
 
-  /**
-   * 巡查类型
-   */
-  @Excel(name = "巡查类型")
-  @ApiModelProperty("巡查类型")
-  private Long type;
+    /**
+     * 巡查类型
+     */
+    @Excel(name = "巡查类型")
+    @ApiModelProperty("巡查类型")
+    private String type;
 
 }

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

@@ -1,12 +1,10 @@
 package com.kms.yxgh.df.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
 import lombok.Data;
 
 
@@ -21,27 +19,27 @@ import lombok.Data;
 @ApiModel("堤防巡视检查项")
 public class DfCheckingItem extends SyBaseEntity {
 
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * 巡查ID
-   */
-  @Excel(name = "巡查ID")
-  @ApiModelProperty("巡查ID")
-  private String xcId;
-
-  /**
-   * 检查部位
-   */
-  @Excel(name = "检查部位")
-  @ApiModelProperty("检查部位")
-  private String parts;
-
-  /**
-   * 检查内容
-   */
-  @Excel(name = "检查内容")
-  @ApiModelProperty("检查内容")
-  private String content;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 巡查ID
+     */
+    @Excel(name = "巡查ID")
+    @ApiModelProperty("巡查ID")
+    private String xcId;
+
+    /**
+     * 检查部位
+     */
+    @Excel(name = "检查部位")
+    @ApiModelProperty("检查部位")
+    private String parts;
+
+    /**
+     * 检查内容
+     */
+    @Excel(name = "检查内容")
+    @ApiModelProperty("检查内容")
+    private String content;
 
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.SyBaseEntity;
 import com.shuili.common.annotation.Excel;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,7 +46,7 @@ public class DfPlan extends SyBaseEntity {
      */
     @Excel(name = "巡查类型")
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
     /**
      * 检查次数
@@ -61,7 +60,7 @@ public class DfPlan extends SyBaseEntity {
      */
     @Excel(name = "周期")
     @ApiModelProperty("周期")
-    private Long cycleType;
+    private String cycleType;
 
     /**
      * 是否提醒

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

@@ -30,6 +30,6 @@ public class DfProjectCheckingRel extends SyBaseEntity {
     private String dikeCode;
 
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
 }

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

@@ -43,6 +43,6 @@ public class DfRecord extends SyBaseEntity {
      */
     @Excel(name = "状态")
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
 }

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

@@ -47,7 +47,7 @@ public class DfRecordItem extends SyBaseEntity {
      */
     @Excel(name = "状态")
     @ApiModelProperty("状态")
-    private Integer status;
+    private String status;
 
     /**
      * 存在问题

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

@@ -80,5 +80,5 @@ public class DfYhRecord extends SyBaseEntity {
    */
   @Excel(name = "状态")
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 }

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

@@ -37,7 +37,7 @@ public class DfAnimalPlanDto {
      * 防治类型
      */
     @ApiModelProperty("防治类型")
-    private Long type;
+    private String type;
 
     /**
      * 防治说明
@@ -49,7 +49,7 @@ public class DfAnimalPlanDto {
      * 工作月份
      */
     @ApiModelProperty("工作月份")
-    private Long month;
+    private String month;
 
     /**
      * 检查次数
@@ -61,7 +61,7 @@ public class DfAnimalPlanDto {
      * 周期
      */
     @ApiModelProperty("周期")
-    private Long cycleType;
+    private String cycleType;
 
     /**
      * 是否提醒

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

@@ -43,7 +43,7 @@ public class DfAnimalPlanSimpleDto {
      * 防治类型
      */
     @ApiModelProperty("防治类型")
-    private Long type;
+    private String type;
 
     /**
      * 堤防级别
@@ -68,7 +68,7 @@ public class DfAnimalPlanSimpleDto {
      * 工作月份
      */
     @ApiModelProperty("工作月份")
-    private Long month;
+    private String month;
 
     /**
      * 检查次数
@@ -80,7 +80,7 @@ public class DfAnimalPlanSimpleDto {
      * 周期
      */
     @ApiModelProperty("周期")
-    private Long cycleType;
+    private String cycleType;
 
     /**
      * 是否提醒

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

@@ -33,7 +33,7 @@ public class DfAnimalRecordDto {
      * 施工地点
      */
     @ApiModelProperty("施工地点")
-    private Long location;
+    private String location;
 
     /**
      * 检查施工情况
@@ -45,13 +45,13 @@ public class DfAnimalRecordDto {
      * 有害生物
      */
     @ApiModelProperty("有害生物")
-    private Long pest;
+    private String pest;
 
     /**
      * 状态
      */
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
     @ApiModelProperty("用药")
     private List<Drug> drugs;

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

@@ -23,7 +23,7 @@ public class DfCheckingDetailDto {
   private String name;
 
   @ApiModelProperty("巡查类型")
-  private Long type;
+  private String type;
 
   @ApiModelProperty("检查项")
   private List<DfCheckingItemDto> items;

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

@@ -33,13 +33,13 @@ public class DfPlanDetailDto {
     private String xcId;
 
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
     @ApiModelProperty("检查次数")
     private Long frequency;
 
     @ApiModelProperty("周期")
-    private Long cycleType;
+    private String cycleType;
 
     @ApiModelProperty("是否提醒")
     private Boolean isReminder;

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

@@ -29,7 +29,7 @@ public class DfPlanSimpleDto {
     private String xcId;
 
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
     @ApiModelProperty("最后巡检时间")
     private Date lastTime;

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

@@ -31,6 +31,6 @@ public class DfProjectCheckingRelDto {
         @ApiModelProperty(value = "巡查id")
         private String xcId;
         @ApiModelProperty(value = "巡查类型")
-        private Long type;
+        private String type;
     }
 }

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

@@ -31,7 +31,7 @@ public class DfRecordDetailDto {
     private String name;
 
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
     @ApiModelProperty("巡查项")
     private List<DfRecordItemDto> items;
@@ -49,7 +49,7 @@ public class DfRecordDetailDto {
         private String content;
 
         @ApiModelProperty("状态")
-        private Integer status;
+        private String status;
 
         @ApiModelProperty("存在问题")
         private String problem;

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

@@ -26,7 +26,7 @@ public class DfRecordSearchDto {
   private String name;
 
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 
   @ApiModelProperty("异常部位")
   private List<String> parts;

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

@@ -41,7 +41,7 @@ public class DfYhRecordDetailDto {
   private String implement;
 
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 
   @ApiModelProperty("养护人员")
   private List<OperatorDto> operators;

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

@@ -20,5 +20,5 @@ public class StartPlan {
     @ApiModelProperty("堤防编号")
     private String dikeCode;
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 }

shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@@ -125,7 +125,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
             DfRecord record = new DfRecord();
             record.setPlanId(startPlan.getPlanId());
             record.setName(StringUtils.isEmpty(name) ? checkingDetailDto.getName() : name + DateUtils.getTime());
-            record.setStatus(RecordStatus.CHECKING.getValue());
+            record.setStatus(RecordStatus.CHECKING.getValue().toString());
             record.setDikeCode(startPlan.getDikeCode());
             getBaseMapper().insert(record);
             String id = record.getId();
@@ -135,7 +135,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
                     item.setRecordId(id);
                     item.setContent(o.getContent());
                     item.setParts(String.join(PART_SEPARATOR, o.getParts()));
-                    item.setStatus(CheckingStatus.NORMAL.getValue());
+                    item.setStatus(CheckingStatus.NORMAL.getValue().toString());
                     item.setProblem("");
                     dfRecordItemMapper.insert(item);
                 });

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java

@@ -35,6 +35,6 @@ public class SzChecking extends SyBaseEntity {
    */
   @Excel(name = "巡查类型")
   @ApiModelProperty("巡查类型")
-  private Long type;
+  private String type;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlan.java

@@ -45,7 +45,7 @@ public class SzPlan extends SyBaseEntity {
    */
   @Excel(name = "巡查类型")
   @ApiModelProperty("巡查类型")
-  private Long type;
+  private String type;
 
   /**
    * 检查次数
@@ -59,7 +59,7 @@ public class SzPlan extends SyBaseEntity {
    */
   @Excel(name = "周期")
   @ApiModelProperty("周期")
-  private Long cycleType;
+  private String cycleType;
 
   /**
    * 是否提醒

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzProjectCheckingRel.java

@@ -30,6 +30,6 @@ public class SzProjectCheckingRel extends SyBaseEntity {
     private String wagaCode;
 
     @ApiModelProperty("巡查类型")
-    private Long type;
+    private String type;
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecord.java

@@ -43,7 +43,7 @@ public class SzRecord extends SyBaseEntity {
      */
     @Excel(name = "状态")
     @ApiModelProperty("状态")
-    private Long status;
+    private String status;
 
 
 }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzRecordItem.java

@@ -47,7 +47,7 @@ public class SzRecordItem extends SyBaseEntity {
    */
   @Excel(name = "状态")
   @ApiModelProperty("状态")
-  private Integer status;
+  private String status;
 
   /**
    * 存在问题

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhRecord.java

@@ -80,5 +80,5 @@ public class SzYhRecord extends SyBaseEntity {
    */
   @Excel(name = "状态")
   @ApiModelProperty("状态")
-  private Long status;
+  private String status;
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzProjectCheckingRelDto.java

@@ -31,6 +31,6 @@ public class SzProjectCheckingRelDto {
         @ApiModelProperty(value = "巡查id")
         private String xcId;
         @ApiModelProperty(value = "巡查类型")
-        private Long type;
+        private String type;
     }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordDetailDto.java

@@ -48,7 +48,7 @@ public class SzRecordDetailDto {
     private String content;
 
     @ApiModelProperty("状态")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty("存在问题")
     private String problem;

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

@@ -114,7 +114,7 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
             SzRecord record = new SzRecord();
             record.setPlanId(startPlan.getPlanId());
             record.setName(StringUtils.isEmpty(name) ? checkingDetailDto.getName() : name + DateUtils.getTime());
-            record.setStatus(RecordStatus.CHECKING.getValue());
+            record.setStatus(RecordStatus.CHECKING.getValue().toString());
             record.setWagaCode(startPlan.getWagaCode());
             getBaseMapper().insert(record);
             String id = record.getId();
@@ -124,7 +124,7 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
                     item.setRecordId(id);
                     item.setContent(o.getContent());
                     item.setParts(String.join(PART_SEPARATOR, o.getParts()));
-                    item.setStatus(CheckingStatus.NORMAL.getValue());
+                    item.setStatus(CheckingStatus.NORMAL.getValue().toString());
                     item.setProblem("");
                     szRecordItemMapper.insert(item);
                 });