add：提防v2

shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java

@@ -9,6 +9,8 @@ public enum DfYhV2StatusEnum {
     INSPECTED("已巡检", "2"),
     UNDER_MAINTENANCE("养护中", "3"),
     NO_DEFECTS("无缺陷", "4"),
+    YES_UNDER("已养护", "6"),
+
     ACCEPTED("已验收", "5");
 
 

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

@@ -23,7 +23,7 @@ public class DfCheckingV2ProjectItem extends SyBaseEntity {
      * 项目id
      */
     @ApiModelProperty("项目id")
-    private Integer checkingId;
+    private String checkingId;
 
     /**
      * 检查部位

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

@@ -61,7 +61,7 @@ public class DfYhV2 extends SyBaseEntity {
      * 问题等级
      */
     @ApiModelProperty("问题等级")
-    private String issueLevel;
+    private String problemLevel;
 
 
     /**
@@ -112,7 +112,7 @@ public class DfYhV2 extends SyBaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("维养开始时间")
-    private Date startTime;
+    private Date startDate;
 
     /**
      * 维养结束时间
@@ -132,7 +132,7 @@ public class DfYhV2 extends SyBaseEntity {
      * 问题位置
      */
     @ApiModelProperty("问题位置")
-    private String problemLocation;
+    private String location;
 
 
 

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

@@ -59,12 +59,12 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
                     .ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status));
 
             Optional.ofNullable(data.getStartDate())
-                    .filter(startTime -> startTime != null)
-                    .ifPresent(startTime -> queryWrapper.ge(DfCheckingProblemV2::getCreateTime, startTime));
+                    .filter(startDate -> startDate != null)
+                    .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate));
 
             Optional.ofNullable(data.getEndDate())
-                    .filter(endTime -> endTime != null)
-                    .ifPresent(endTime -> queryWrapper.le(DfCheckingProblemV2::getEndTime, endTime));
+                    .filter(endDate -> endDate != null)
+                    .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate));
 
             Optional.ofNullable(data.getProblemLevel())
                     .filter(StringUtils::isNotBlank)

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

@@ -8,10 +8,7 @@ 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.enums.DfYhV2StatusEnum;
-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.DfCheckingV2ProjectManage;
+import com.kms.yxgh.df.domain.*;
 import com.kms.yxgh.df.dto.DfCheckingDetailDto;
 import com.kms.yxgh.df.dto.v2.DfProblemV2Dto;
 import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto;
@@ -38,6 +35,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Mapper, DfCheckingRecord> {
 
+    private final DfYhV2Service dfYhV2Service;
+
 
     private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
 
@@ -71,12 +70,12 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                     .ifPresent(status -> queryWrapper.like(DfCheckingRecord::getStatus, status));
 
             Optional.ofNullable(data.getStartDate())
-                    .filter(startTime -> startTime != null)
-                    .ifPresent(startTime -> queryWrapper.ge(DfCheckingRecord::getCreateTime, startTime));
+                    .filter(startDate -> startDate != null)
+                    .ifPresent(startDate -> queryWrapper.ge(DfCheckingRecord::getStartDate, startDate));
 
             Optional.ofNullable(data.getEndDate())
-                    .filter(endTime -> endTime != null)
-                    .ifPresent(endTime -> queryWrapper.le(DfCheckingRecord::getCreateTime, endTime));
+                    .filter(endDate -> endDate != null)
+                    .ifPresent(endDate -> queryWrapper.le(DfCheckingRecord::getEndDate, endDate));
         }
 
 
@@ -121,6 +120,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
         // 巡查详情列表
         SearchParam<DfRecordSearchV2Dto> sp=new SearchParam<>();
         DfRecordSearchV2Dto  searchV2Dto=new DfRecordSearchV2Dto();
+        assert dfCheckingRecord != null;
         searchV2Dto.setRecordId(dfCheckingRecord.getId());
         sp.setData(searchV2Dto);
         sp.setPageSize(Integer.MAX_VALUE);
@@ -132,7 +132,6 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                     ListUtil.copyListToResultList(records, DfRecordDetailV2Dto.DfRecordItemDetailV2Dto.class);
             dto.setProblems(dtoList);
         }
-        // 子项
         return dto;
     }
     @Transactional(rollbackFor = Exception.class)
@@ -147,22 +146,22 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
             // 如果相关缺陷大于一条就是养护中
             if (!dfRecord.getProblems().isEmpty()) {
                 dfCheckingRecord.setStatus(DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue());
-            }
-            // 提交时缺陷无数据就是无缺陷
-            if (dfRecord.getProblems().isEmpty()) {
+            }else {
+                // 提交时缺陷无数据就是无缺陷
                 dfCheckingRecord.setStatus(DfYhV2StatusEnum.NO_DEFECTS.getValue());
             }
             updateById(dfCheckingRecord);
-            dfCheckingProblemV2Service.updateBatchById(convertToImages(dfRecord.getProblems()));
+            dfCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(dfRecord.getProblems()));
+            return  dfRecord;
+        }else {
+            DfCheckingRecord dfCheckingRecord=new DfCheckingRecord();
+            BeanUtils.copyProperties(dfRecord, dfCheckingRecord);
+            // 未提交维巡查中
+            dfCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
+            save(dfCheckingRecord);
+            dfCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(dfRecord.getProblems()));
             return  dfRecord;
         }
-        DfCheckingRecord dfCheckingRecord=new DfCheckingRecord();
-        BeanUtils.copyProperties(dfRecord, dfCheckingRecord);
-        // 未提交维巡查中
-        dfCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
-        save(dfCheckingRecord);
-        dfCheckingProblemV2Service.saveBatch(convertToImages(dfRecord.getProblems()));
-        return  dfRecord;
     }
 
     public void myRemovePraIds(DfRecordDetailV2Dto dfRecord) {
@@ -171,15 +170,16 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                 .map(DfRecordDetailV2Dto.DfRecordItemDetailV2Dto::getId).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(ids)) {
             dfCheckingProblemV2Service.remove(new LambdaQueryWrapper<DfCheckingProblemV2>().in(DfCheckingProblemV2::getId,ids));
+            dfYhV2Service.remove(new LambdaQueryWrapper<DfYhV2>().in(DfYhV2::getDefectId,ids));
         }
     }
 
     public static List<DfCheckingProblemV2> convertToImages(List<DfRecordDetailV2Dto.DfRecordItemDetailV2Dto> dtoList) {
         List<DfCheckingProblemV2> dfCheckingProblemV2s = new ArrayList<>();
-        dtoList.stream().forEach(e->{
+        dtoList.forEach(e->{
             DfCheckingProblemV2 dfCheckingProblemV2=new DfCheckingProblemV2();
             BeanUtils.copyProperties(e,dfCheckingProblemV2);
-            dfCheckingProblemV2.setDoc(e.getProblemImages().stream().collect(Collectors.joining(",")));
+            dfCheckingProblemV2.setDoc(String.join(",", e.getProblemImages()));
         });
         return  dfCheckingProblemV2s;
     }

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

@@ -124,7 +124,7 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
     public DfV2CheckingDto getInfo(String id) {
         DfCheckingV2ProjectManage dfCheckingV2ProjectManage = getById(id);
         DfV2CheckingDto dto = new DfV2CheckingDto();
-        if (dfCheckingV2ProjectManage != null) {
+        if (!Objects.isNull(dfCheckingV2ProjectManage)) {
             BeanUtils.copyProperties(dfCheckingV2ProjectManage, dto);
 
             List<DfCheckingV2ProjectItem> items = dfCheckingV2ProjectItemV2Service.list(
@@ -156,7 +156,7 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
                     List<DfCheckingV2ProjectItem> projectItems = items.parallelStream() // 使用并行流
                             .map(item -> {
                                 DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem();
-                                projectItem.setCheckingId(Integer.valueOf(dfCheckingV2ProjectManage.getId()));
+                                projectItem.setCheckingId(dfCheckingV2ProjectManage.getId());
                                 projectItem.setContent(item.getContent());
                                 projectItem.setParts(String.join(",", item.getParts()));
                                 return projectItem;
@@ -196,7 +196,7 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
                 .map(item -> {
                     DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem();
                     projectItem.setId(item.getId());
-                    projectItem.setCheckingId(Integer.valueOf(dfCheckingV2ProjectManage.getId()));
+                    projectItem.setCheckingId(dfCheckingV2ProjectManage.getId());
                     projectItem.setContent(item.getContent());
                     projectItem.setParts(String.join(",", item.getParts()));
                     return projectItem;
@@ -213,12 +213,6 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
     @Transactional(rollbackFor = Exception.class)
     public boolean myRemove(String[] ids) {
         if ( null!= ids && ids.length > 0) {
-            int count = dfCheckingV2ProjectItemV2Service.count(new LambdaQueryWrapper<DfCheckingV2ProjectItem>()
-                    .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids))
-            );
-            if (count > 0)  {
-                throw new RuntimeException("请先删除项目子项");
-            }
             dfCheckingV2ProjectItemV2Service.remove(new LambdaQueryWrapper<DfCheckingV2ProjectItem>()
                     .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids)));
 

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

@@ -1,6 +1,7 @@
 package com.kms.yxgh.df.service;
 import com.alibaba.fastjson.JSONArray;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,10 +12,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.ApprovalStatusEnum;
 import com.kms.yxgh.common.dto.ApprovalDetailDto;
 import com.kms.yxgh.common.dto.ApprovalSearchDto;
+import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
 import com.kms.yxgh.common.dto.DocV2Dto;
-import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem;
-import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
 import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.*;
 import com.kms.yxgh.df.mapper.DfYhV2Mapper;
@@ -67,16 +67,20 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
                     .ifPresent(status -> queryWrapper.like(DfYhV2::getStatus, status));
 
             Optional.ofNullable(data.getStartDate())
-                    .filter(startTime -> startTime != null)
-                    .ifPresent(startTime -> queryWrapper.ge(DfYhV2::getCreateTime, startTime));
+                    .filter(startDate -> startDate != null)
+                    .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate));
+
+            Optional.ofNullable(data.getEndDate())
+                    .filter(endDate -> endDate != null)
+                    .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate));
 
             Optional.ofNullable(data.getProblemLevel())
-                    .filter(problemLevel -> problemLevel != null)
-                    .ifPresent(problemLevel -> queryWrapper.le(DfYhV2::getIssueLevel, problemLevel));
+                    .filter(StringUtils::isNotBlank)
+                    .ifPresent(problemLevel -> queryWrapper.le(DfYhV2::getProblemLevel, problemLevel));
 
             Optional.ofNullable(data.getRecordId())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getIssueLevel, recordId));
+                    .filter(StringUtils::isBlank)
+                    .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getRecordId, recordId));
 
         }
 
@@ -108,7 +112,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
         DfYhV2 dfYhV2 = getById(id);
         if (dfYhV2 != null) {
             BeanUtils.copyProperties(dfYhV2, dto);
-            dto.setDoc(JSONArray.parseObject(dfYhV2.getDoc(), DocV2Dto.class));
+            dto.setDoc(JSONObject.parseObject(dfYhV2.getDoc(), DocV2Dto.class));
         }
         return dto;
     }
@@ -128,20 +132,24 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
         if (commit) {
             BeanUtils.copyProperties(dfYh, dfYhV2);
             dfYhV2.setDoc(getDocStrJson(dfYh.getDoc()));
+            dfYhV2.setStatus(DfYhV2StatusEnum.YES_UNDER.getValue());
             updateById(dfYhV2);
+            BeanUtils.copyProperties(dfYhV2, dto);
+            return  dto;
+        } else {
+            BeanUtils.copyProperties(dfYh, dfYhV2);
+            dfYhV2.setDoc(getDocStrJson(dfYh.getDoc()));
+            save(dfYhV2);
+            BeanUtils.copyProperties(dfYhV2, dto);
+            return  dto;
         }
-        BeanUtils.copyProperties(dfYh, dfYhV2);
-        dfYhV2.setDoc(getDocStrJson(dfYh.getDoc()));
-        save(dfYhV2);
-        BeanUtils.copyProperties(dfYhV2, dto);
-        return  dto;
     }
 
     private String getDocStrJson (DocV2Dto dto) {
         if (dto == null) {
             return null;
         }
-        return JSONArray.toJSONString(dto);
+        return JSONObject.toJSONString(dto);
 
     }