Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

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

@@ -143,6 +143,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         if (CollectionUtil.isNotEmpty(dfRecord.getItems())) {
             dfRecord.getItems().forEach(o -> {
                 DfRecordItem item = new DfRecordItem();
+                item.setId(o.getId());
                 item.setRecordId(dfRecord.getId());
                 item.setContent(o.getContent());
                 item.setParts(String.join(PART_SEPARATOR, o.getParts()));
@@ -151,6 +152,8 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
                 dfRecordItemMapper.updateById(item);
             });
         }
+
+        this.baseMapper.updateById(BeanCopyUtils.copy(dfRecord, DfRecord.class));
         return dfRecord;
     }
 

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

@@ -1,7 +1,5 @@
 package com.kms.yxgh.sz.service;
 
-import static com.kms.yxgh.sz.service.SzCheckingService.PART_SEPARATOR;
-
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,12 +11,8 @@ import com.kms.yxgh.base.enums.CheckingStatus;
 import com.kms.yxgh.base.enums.RecordStatus;
 import com.kms.yxgh.sz.domain.SzRecord;
 import com.kms.yxgh.sz.domain.SzRecordItem;
-import com.kms.yxgh.sz.dto.StartPlan;
-import com.kms.yxgh.sz.dto.SzCheckingDetailDto;
-import com.kms.yxgh.sz.dto.SzPlanDetailDto;
-import com.kms.yxgh.sz.dto.SzRecordDetailDto;
+import com.kms.yxgh.sz.dto.*;
 import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto;
-import com.kms.yxgh.sz.dto.SzRecordSearchDto;
 import com.kms.yxgh.sz.mapper.SzRecordItemMapper;
 import com.kms.yxgh.sz.mapper.SzRecordMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
@@ -28,17 +22,15 @@ import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.DateUtils;
 import com.shuili.common.utils.StringUtils;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.kms.yxgh.sz.service.SzCheckingService.PART_SEPARATOR;
+
 /**
  * 水闸巡视检查记录Service接口
  *
@@ -147,11 +139,12 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
     }
 
     @Transactional(rollbackFor = Exception.class)
-  public SzRecordDetailDto update(SzRecordDetailDto SzRecord) {
-    if (CollectionUtil.isNotEmpty(SzRecord.getItems())) {
-      SzRecord.getItems().forEach(o -> {
+    public SzRecordDetailDto update(SzRecordDetailDto szRecord) {
+        if (CollectionUtil.isNotEmpty(szRecord.getItems())) {
+            szRecord.getItems().forEach(o -> {
                 SzRecordItem item = new SzRecordItem();
-        item.setRecordId(SzRecord.getId());
+                item.setId(o.getId());
+                item.setRecordId(szRecord.getId());
                 item.setContent(o.getContent());
                 item.setParts(String.join(PART_SEPARATOR, o.getParts()));
                 item.setStatus(o.getStatus());
@@ -159,7 +152,8 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
                 szRecordItemMapper.updateById(item);
             });
         }
-    return SzRecord;
+        this.baseMapper.updateById(BeanCopyUtils.copy(szRecord, SzRecord.class));
+        return szRecord;
     }
 
     @Transactional(rollbackFor = Exception.class)