fix: 调整处置状态

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

@@ -38,6 +38,9 @@ public class DfRecord extends SyBaseEntity {
     @ApiModelProperty("状态")
     private String status;
 
+    @ApiModelProperty("处置状态")
+    private String handleStatus;
+
     @ApiModelProperty("计划名称")
     private String planName;
 

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

@@ -46,7 +46,10 @@ public class DfRecordDetailDto {
     private String dikeType;
 
     @ApiModelProperty("状态")
-    private String status;
+    private String status = "0";
+
+    @ApiModelProperty("隐患状态")
+    private String handleStatus;
 
     @ApiModelProperty("计划名称")
     private String planName;

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

@@ -86,6 +86,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         if (record == null) {
             throw new DfException("巡查记录不能为空");
         }
+        record.setHandleStatus(handleStatus(dto));
         int rsp = getBaseMapper().insert(record);
         if (rsp <= 0) {
             throw new DfException("新增巡查记录失败");
@@ -100,6 +101,19 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         return this.getDetailById(id);
     }
 
+    private String handleStatus(DfRecordDetailDto dto) {
+        if (CollectionUtil.isEmpty(dto.getItems()) || dto.getItems().stream().allMatch(r -> CollectionUtil.isEmpty(r.getProblemImages()))) {
+            //无异常
+            return "0";
+        }
+        if (dto.getItems().stream().anyMatch(r -> CollectionUtil.isEmpty(r.getHandleImages()) && CollectionUtil.isNotEmpty(r.getProblemImages()))) {
+            //未处置
+            return "1";
+        }
+        //已处置
+        return "2";
+    }
+
     private static Function<DfRecordItemDto, DfRecordItem> getDfRecordItemDtoDfRecordItemFunction(String recordId) {
         return o -> {
             DfRecordItem item = BeanCopyUtils.copy(o, DfRecordItem.class);
@@ -149,6 +163,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         if (record == null) {
             throw new DfException("巡查记录不存在");
         }
+        record.setHandleStatus(handleStatus(dfRecord));
         if (CollectionUtil.isNotEmpty(dfRecord.getItems())) {
             List<DfRecordItem> items = dfRecord.getItems()
                     .stream().map(getDfRecordItemDtoDfRecordItemFunction(dfRecord.getId()))

sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql

@@ -94,7 +94,8 @@ CREATE TABLE `bs_sgc_df_xsjhjl` (
   `DIKE_TYPE` int  COMMENT '堤防类型',
   `SCOPE` varchar(50) COLLATE utf8mb4_general_ci COMMENT '巡查范围',
   `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称',
-  `STATUS` int NOT NULL COMMENT '状态',
+  `HANDLE_STATUS` int NOT NULL COMMENT '处置状态',
+  `STATUS` int NOT NULL COMMENT '记录状态',
   `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
   `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
   `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',

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

@@ -39,6 +39,7 @@ ALTER TABLE `bs_sgc_df_xsjhjl` ADD  `SUB_PLAN_END_DATE` datetime DEFAULT NULL CO
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SCOPE` varchar(50) COLLATE utf8mb4_general_ci COMMENT '巡查范围';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_TYPE` int  COMMENT '堤防类型';
+ALTER TABLE `bs_sgc_df_xsjhjl` ADD `HANDLE_STATUS` int NOT NULL COMMENT '处置状态';
 
 ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `HANDLE_TIME` datetime DEFAULT NULL COMMENT '处置时间';
 ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片';