Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -67,9 +67,9 @@ import java.text.ParseException;
 @Service
 public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto,JgInstallationNotice,JgInstallationNoticeMapper> implements IJgInstallationNoticeService {
 
-    public static final String SUBMIT_TYPE_FLOW = "1";
-    public static final String PROCESS_DEFINITION_KEY = "installationNotification";
-    public static final String TABLE_PAGE_ID = "1734141426742095873";
+    private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String PROCESS_DEFINITION_KEY = "installationNotification";
+    private static final String TABLE_PAGE_ID = "1734141426742095873";
 
 
     //西安行政区划code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -48,6 +50,9 @@ import java.util.stream.Collectors;
 @Service
 public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionResultModel, JyjcInspectionResult, JyjcInspectionResultMapper> implements IJyjcInspectionResultService {
 
+    private static final String JYJC_SUBMIT_FILE_PREFIX = "JYJC_";
+    private static final String JYJC_SUBMIT_KEY = "inspectResult";
+
     @Autowired
     private IJyjcInspectionResultAttachmentService iJyjcInspectionResultAttachmentService;
 
@@ -106,32 +111,61 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
     public JyjcInspectionResultModel updateJyjcInspectionResult(Map<String, Map<String, Object>> tableModel) {
 
-        Map<String, Object> map = tableModel.get("inspectResult");
+        Map<String, Object> map = tableModel.get(JYJC_SUBMIT_KEY);
         JyjcInspectionResultModel model = BeanUtil.mapToBean(map, JyjcInspectionResultModel.class, true);
+
+        // 更新结果主表
         updateWithModel(model);
 
+        // 更新附件表
         List<JyjcInspectionResultAttachment> attachmentList = new ArrayList<>();
+        LambdaQueryWrapper<JyjcInspectionResultAttachment> fileWrapper = new LambdaQueryWrapper<>();
+        Map<String, Object> fileMap = new HashMap<>();
         map.forEach((k, v) -> {
-            if (k.contains("JYJC_") && !ObjectUtils.isEmpty(map.get(k))) {
-                JyjcInspectionResultAttachment attachment = new JyjcInspectionResultAttachment();
-                attachment.setResultSeq(model.getSequenceNbr());
-                attachment.setAttachmentUrl(JSON.toJSONString(map.get(k)));
-                attachment.setAttachmentType(k);
-                attachmentList.add(attachment);
+            if (k.contains(JYJC_SUBMIT_FILE_PREFIX) && !ObjectUtils.isEmpty(map.get(k))) {
+                fileWrapper.eq(JyjcInspectionResultAttachment::getAttachmentType, k);
+                fileWrapper.eq(JyjcInspectionResultAttachment::getResultSeq, model.getSequenceNbr());
+                fileMap.put(k, map.get(k));
+            }
+        });
+        List<JyjcInspectionResultAttachment> fileList = attachmentService.list(fileWrapper);
+        fileMap.forEach((k, v) -> {
+            JyjcInspectionResultAttachment attachment = new JyjcInspectionResultAttachment();
+            attachment.setResultSeq(model.getSequenceNbr());
+            attachment.setAttachmentUrl(JSON.toJSONString(map.get(k)));
+            attachment.setAttachmentType(k);
+            // 新增时需要判断之前有就更新
+            if (!CollectionUtils.isEmpty(fileList)) {
+                List<JyjcInspectionResultAttachment> collect = fileList.stream().filter(obj -> k.equals(obj.getAttachmentType())).collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(collect)) {
+                    JyjcInspectionResultAttachment jyjcInspectionResultAttachment = collect.get(0);
+                    attachment.setSequenceNbr(jyjcInspectionResultAttachment.getSequenceNbr());
+                }
             }
+            attachmentList.add(attachment);
         });
         if (!CollectionUtils.isEmpty(attachmentList)) {
-            attachmentService.saveBatch(attachmentList);
+            attachmentService.saveOrUpdateBatch(attachmentList);
         }
 
-        if (!CollectionUtils.isEmpty(model.getResultParamModelMap())) {
+        // 更新参数表
+        if (!CollectionUtils.isEmpty(model.getResultParamModelMap())){
+            LambdaQueryWrapper<JyjcInspectionResultParam> paramWrapper = new LambdaQueryWrapper<>();
+            paramWrapper.eq(JyjcInspectionResultParam::getResultSeq, model.getSequenceNbr());
+            List<JyjcInspectionResultParam> params = resultParamService.list(paramWrapper);
             JyjcInspectionResultParam resultParam = new JyjcInspectionResultParam();
             resultParam.setResultSeq(model.getSequenceNbr());
             resultParam.setParamJson(JSON.toJSONString(model.getResultParamModelMap()));
-            resultParamService.save(resultParam);
+            if (!CollectionUtils.isEmpty(params)) {
+                JyjcInspectionResultParam jyjcInspectionResultParam = params.get(0);
+                resultParam.setSequenceNbr(jyjcInspectionResultParam.getSequenceNbr());
+            }
+            resultParamService.saveOrUpdate(resultParam);
         }
+
         //插入操作历史记录
         InspectionDetectionInfo info = new InspectionDetectionInfo();
         QueryWrapper<InspectionDetectionInfo> wrapper = new QueryWrapper<>();
@@ -209,7 +243,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             }
         }
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("inspectResult", map);
+        resultMap.put(JYJC_SUBMIT_KEY, map);
         return resultMap;
     }