fix: 补充content字段,去除depict字段

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * 缺陷记录 bs_sgc_df_xcqx
  *
@@ -44,7 +45,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity {
     private String recordId;
 
 
-
     /**
      * 巡查状态字典:patrol_maintenance_status
      */
@@ -52,7 +52,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity {
     private String status;
 
 
-
     /**
      * 巡查项目名称
      */
@@ -60,7 +59,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity {
     private String checkingName;
 
 
-
     /**
      * 巡查类型 字典：patrol_maintenance_type
      */
@@ -74,7 +72,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity {
     private String category;
 
 
-
     /**
      * 巡查责任人
      */
@@ -114,21 +111,14 @@ public class DfCheckingProblemV2 extends SyBaseEntity {
     @ApiModelProperty("巡查结束时间")
     private Date endDate;
 
-
-    /**
-     * 描述
-     */
-    @ApiModelProperty("描述")
-    private String depict;
-
-
     /**
      * 问题位置
      */
     @ApiModelProperty("问题位置")
     private String position;
 
-
+    @ApiModelProperty("检查内容")
+    private String content;
     /**
      * 文档
      */

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

@@ -3,7 +3,6 @@ package com.kms.yxgh.df.dto.v2;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.AddGroup;
 import com.kms.yxgh.base.UpdateGroup;
-import com.kms.yxgh.common.dto.DocDto;
 import com.kms.yxgh.common.dto.DocV2Dto;
 import com.kms.yxgh.df.dto.DfCheckingDetailDto;
 import io.swagger.annotations.ApiModel;
@@ -89,7 +88,7 @@ public class DfRecordDetailV2Dto {
         private String id;
 
         @ApiModelProperty("检查部位")
-        private List<String> parts=Collections.emptyList();;
+        private List<String> parts = Collections.emptyList();
 
         @ApiModelProperty("位置")
         private String position;
@@ -97,9 +96,6 @@ public class DfRecordDetailV2Dto {
         @ApiModelProperty("检查内容")
         private String content;
 
-        @ApiModelProperty("描述")
-        private String depict;
-
         @ApiModelProperty("问题等级")
         private String problemLevel;
 
@@ -112,6 +108,7 @@ public class DfRecordDetailV2Dto {
     }
 
     @ApiModelProperty("检查项")
-    private List<DfCheckingDetailDto.DfCheckingItemDto> items=Collections.emptyList();;
+    private List<DfCheckingDetailDto.DfCheckingItemDto> items = Collections.emptyList();
+    ;
 
 }

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

@@ -1,8 +1,5 @@
 package com.kms.yxgh.df.service;
 
-import com.alibaba.druid.sql.visitor.functions.If;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -10,15 +7,15 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kms.yxgh.common.dto.DocV2Dto;
 import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
-import com.kms.yxgh.df.domain.*;
-import com.kms.yxgh.df.dto.DfCheckingDetailDto;
+import com.kms.yxgh.df.domain.DfCheckingProblemV2;
+import com.kms.yxgh.df.domain.DfCheckingRecord;
+import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem;
+import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.DfProblemV2Dto;
 import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto;
 import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
 import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper;
-import com.kms.yxgh.util.ListUtil;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.BeanUtils;
@@ -26,7 +23,9 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -45,6 +44,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
     private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
 
     private final DfCheckingProblemV2Service dfCheckingProblemV2Service;
+
     public IPage<DfRecordDetailV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DfCheckingRecord> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -83,7 +83,6 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
         }
 
 
-
         // 查询分页数据
         Page<DfCheckingRecord> queryPage = page(page, queryWrapper);
         if (queryPage == null) {
@@ -152,6 +151,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
         }
         return dto;
     }
+
     @Transactional(rollbackFor = Exception.class)
     public DfRecordDetailV2Dto edit(DfRecordDetailV2Dto dfRecord, Boolean commit) {
         // 先删后加
@@ -206,21 +206,20 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
             dfCheckingProblemV2.setDutyHolderId(dfRecord.getCreateUid());
             dfCheckingProblemV2.setStartDate(dfRecord.getStartDate());
             dfCheckingProblemV2.setEndDate(dfRecord.getEndDate());
-            dfCheckingProblemV2.setDepict(dfRecord.getDepict());
             dfCheckingProblemV2.setType(dfRecord.getType());
             dfCheckingProblemV2.setCategory(dfRecord.getCategory());
             if (null != e.getParts()) {
-                dfCheckingProblemV2.setParts(e.getParts().stream().collect(Collectors.joining(",")));
+                dfCheckingProblemV2.setParts(String.join(",", e.getParts()));
             }
             if (null != e.getProblemImages()) {
-                dfCheckingProblemV2.setDoc(e.getProblemImages().stream().collect(Collectors.joining(",")));
+                dfCheckingProblemV2.setDoc(String.join(",", e.getProblemImages()));
 
             }
-            dfCheckingProblemV2.setDepict(e.getDepict());
             dfCheckingProblemV2s.add(dfCheckingProblemV2);
         });
         return dfCheckingProblemV2s;
     }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean myRemove(String[] ids) {
         if (null != ids && ids.length > 0) {