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/CommonServiceImpl.java

@@ -2074,6 +2074,14 @@ public class CommonServiceImpl implements ICommonService {
         return jgRegistrationHistory != null ? JSONObject.parseObject(jgRegistrationHistory.getChangeData()) : null;
     }
 
+    public JSONObject queryHistoryData(String currentDocumentId) {
+        LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
+        lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getIsDelete, false);
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
+        return jgRegistrationHistory != null ? JSONObject.parseObject(jgRegistrationHistory.getChangeData()) : null;
+    }
+
     @Override
     public JSONArray queryHistoryDataObj(Long currentDocumentId) {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();

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/JgChangeRegistrationReformServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
@@ -62,13 +64,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
 import static java.util.stream.Collectors.toList;
@@ -254,7 +252,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 } else {
                     jgChangeRegistrationReform.setInspectUnitName(reginParams.getCompany().getCompanyName());
                 }
-                setReveiveCompanyFields(map, jgChangeRegistrationReform);
+                setReceiveCompanyFields(map, jgChangeRegistrationReform);
                 // 统计用
                 CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
                 jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
@@ -354,7 +352,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 setUploadField(map, jgChangeRegistrationReform);
                 // 使用单位提交
                 jgChangeRegistrationReform.setUseUnitCreditCode(companyCode);
-                setReveiveCompanyFields(map, jgChangeRegistrationReform);
+                setReceiveCompanyFields(map, jgChangeRegistrationReform);
                 // 统计用
                 CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
                 jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
@@ -407,6 +405,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     saveEqRelation(reginParams, equipmentLists, jgChangeRegistrationReform);
                     // 3.历史表保存
                     jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
+                    // 原有汇总表保存 用来来恢复技术参数
+                    this.setOldData(jgRegistrationHistory, jgChangeRegistrationReform);
                     jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
                 }
                 if (!ObjectUtils.isEmpty(map.get("submit"))) {
@@ -443,7 +443,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
-    private static void setReveiveCompanyFields(JSONObject map, JgChangeRegistrationReform jgChangeRegistrationReform) {
+    private void setOldData(JgRegistrationHistory jgRegistrationHistory, JgChangeRegistrationReform jgChangeRegistrationReform) {
+        Map<String, Object> detailMap = getDeviceListByProjectContraption(jgChangeRegistrationReform.getProjectContraptionId());
+        jgRegistrationHistory.setOldData(JSONObject.toJSONString(detailMap));
+    }
+
+    private static void setReceiveCompanyFields(JSONObject map, JgChangeRegistrationReform jgChangeRegistrationReform) {
         if (map.containsKey("receiveCompanyCode")) {
             String receiveCompanyCode = String.valueOf(map.getString("receiveCompanyCode"));
             String[] receiveCompany = receiveCompanyCode.split("_");
@@ -577,30 +582,107 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setAuditPassDate(new Date());
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
-            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
-            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), null, jgChangeRegistrationReform.getApplyNo());
-            HashMap<String, Object> map = new HashMap<>();
+            jgChangeRegistrationReform.setNextExecuteUserIds("");
+            jgChangeRegistrationReform.setNextTaskId(nextTaskId);
+            Map<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
-            jgChangeRegistrationReform.setNextExecuteUserIds("");
-            jgChangeRegistrationReform.setNextTaskId(nextTaskId);
             map.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
             TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
-            // 生成流水信息
-            saveRecord(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform, taskV2Model);
+            if(!jgChangeRegistrationReform.getEquipListName().equals(EquipmentClassifityEnum.YLGD.getName())){ // 非压力管道逻辑
+                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
+                updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), null, jgChangeRegistrationReform.getApplyNo());
+                // 生成流水信息
+                saveRecord(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform, taskV2Model);
+            }  else {                                                                                         // 压力管道逻辑
+                // 1.批量更新技术参数
+                // 1.1 技术参数更新
+                List<IdxBizJgTechParamsPipeline> paramsPipelines = updatePieLineTechBatch(jgChangeRegistrationReform);
+                // 2.按照装置生成证流水
+                saveCertFlowBatch(jgChangeRegistrationReform, paramsPipelines, taskV2Model);
+            }
+
         }
         // redis流程实时数据更新
         commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgChangeRegistrationReform));
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
 
+    private void saveCertFlowBatch(JgChangeRegistrationReform jgChangeRegistrationReform, List<IdxBizJgTechParamsPipeline> paramsPipelines, TaskV2Model taskV2Model) {
+        // 1.更新使用登记证信息
+        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgChangeRegistrationReform.getUseRegistrationCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
+        jgUseRegistrationManage.setAuditPassDate(new Date());
+        jgUseRegistrationManage.setApplyNo(jgChangeRegistrationReform.getApplyNo());
+        jgUseRegistrationManage.setRecDate(new Date());
+        jgUseRegistrationManageService.updateById(jgUseRegistrationManage);
+        // 2.生成业务流水信息
+        JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+        jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
+        jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
+        jgCertificateChangeRecord.setAuditPassDate(new Date());
+        jgCertificateChangeRecord.setRegType(BUSINESS_TYPE);
+        jgCertificateChangeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
+        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(jgChangeRegistrationReform.getCreateUserId());
+        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() +"办理了【" + BUSINESS_TYPE + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
+                "】" + ",办理日期" + DateUtil.format(jgChangeRegistrationReform.getAuditPassDate(),DatePattern.NORM_DATE_PATTERN));
+        jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationReform.getRecUserId());
+        jgCertificateChangeRecord.setRecDate(new Date());
+        jgCertificateChangeRecord.setCreateDate(new Date());
+        jgCertificateChangeRecord.setCreateUserId(jgChangeRegistrationReform.getCreateUserId());
+        jgCertificateChangeRecord.setUseRegistrationCode(jgChangeRegistrationReform.getUseRegistrationCode());
+        jgCertificateChangeRecord.setCertificateNo(jgUseRegistrationManage.getCertificateNo());
+        jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeRegistrationReform.getUseUnitCreditCode());
+        jgCertificateChangeRecord.setUseUnitName(jgChangeRegistrationReform.getUseUnitName());
+        jgCertificateChangeRecord.setEquCategory("8300");
+        jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode());
+        jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
+        // 保存证流水信息
+        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
+        List<JgCertificateChangeRecordEq> changeRecordEqs = paramsPipelines.stream().map(p->{
+            JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
+            jgCertificateChangeRecordEq.setEquId(p.getRecord());
+            jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
+            return jgCertificateChangeRecordEq;
+        }).collect(toList());
+        // 生成设备流水信息
+        jgCertificateChangeRecordEqService.saveBatch(changeRecordEqs);
+    }
+
+    private List<IdxBizJgTechParamsPipeline> updatePieLineTechBatch(JgChangeRegistrationReform jgChangeRegistrationReform) {
+        JSONObject hisData = commonServiceImpl.queryHistoryData(jgChangeRegistrationReform.getApplyNo());
+        JSONArray piePines = hisData.getJSONArray("equipmentLists");
+        List<IdxBizJgTechParamsPipeline> paramsPipelines =  new ArrayList<>();
+        for(int i = 0; i < piePines.size(); i++){
+            JSONObject item = piePines.getJSONObject(i);
+            IdxBizJgTechParamsPipeline pipeline = new IdxBizJgTechParamsPipeline();
+            pipeline.setMedium(item.getString("medium"));
+            pipeline.setPressure(item.getString("pressure"));
+            pipeline.setNominalDiameter(item.getString("nominalDiameter"));
+            pipeline.setTemperature(item.getString("temperature"));
+            pipeline.setWallThickness(item.getString("wallThickness"));
+            pipeline.setWorkMedium(item.getString("workMedium"));
+            pipeline.setWorkPressure(item.getString("workPressure"));
+            pipeline.setWorkTemperature(item.getString("workTemperature"));
+            pipeline.setPipeLength(item.getString("pipeLength"));
+            LambdaUpdateWrapper<IdxBizJgTechParamsPipeline>  updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(IdxBizJgTechParamsPipeline::getRecord, item.getString("record"));
+            iIdxBizJgTechParamsPipelineService.update(pipeline, updateWrapper);
+            pipeline.setRecord(String.valueOf(item.getString("record")));
+            paramsPipelines.add(pipeline);
+        }
+        return paramsPipelines;
+    }
+
     public void saveRecord(String equipId, JgChangeRegistrationReform jgChangeRegistrationReform, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
-                .eq("equ_id", equipId)
+//                .eq("equ_id", equipId)
                 .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
                 .eq("registration_class", BUSINESS_TYPE));
 
@@ -771,29 +853,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Override
     public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(currentDocumentId);
-//        if (ObjectUtils.isEmpty(equipId)) {
-//            equipId = jgChangeRegistrationReformEqMapper.selectEquipId(currentDocumentId);
-//        }
         this.doCompensate(jgChangeRegistrationReform);
         Map<String, Object> detail = new HashMap<>();
-        Map<String, Object> originalData = new HashMap<>();
-        Map<String, Object> originalDataOther = new HashMap<>();
-
-//        if (!("已完成".equals(jgChangeRegistrationReform.getStatus()) || !"流程结束".equals(jgChangeRegistrationReform.getStatus()))) {
-        // 完成时显示历史数据
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
-//                .eq("equ_id", equipId)
                 .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
                 .eq("registration_class", BUSINESS_TYPE));
-        originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
+        Map<String, Object> originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
         detail.putAll(originalData);
-//        } else {
-//            // 完成显示最新数据
-//            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
-//            originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-//            detail.putAll(originalDataOther);
-//            detail.put("techInfo", originalData);
-//        }
         jgChangeRegistrationReform.setReceiveCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode() + "_" + jgChangeRegistrationReform.getReceiveOrgName());
         detail.putAll(JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class));
         if(jgChangeRegistrationReform.getCancelDate() != null){
@@ -1366,12 +1432,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             return;
         }
         String record = jgRegistrationHistory.getEquId();
-        String equList = getEquListCode(jgRegistrationHistory);
+        String equList = getEquListCode(jgRegistrationHistory, jgChangeRegistrationReform);
         String oldTechInfo = jgRegistrationHistory.getOldData();
         //将历史数据更新到技术参数表中
         EquipmentClassifityEnum anEnum = EquipmentClassifityEnum.getOne(equList);
         assert anEnum != null;
-        if (StringUtils.isEmpty(oldTechInfo) || anEnum == null) {
+        if (StringUtils.isEmpty(oldTechInfo)) {
             log.warn("技术参数为空，无法进行回滚技术参数，单据编号：{}", jgChangeRegistrationReform.getApplyNo());
             return;
         }
@@ -1433,14 +1499,19 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
             // 压力管道
             case YLGD:
-                IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsPipeline.class);
-                // 删除
-                iIdxBizJgTechParamsPipelineService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().eq(IdxBizJgTechParamsPipeline::getRecord, record));
-                // 插入
-                pipeline.setSequenceNbr(sequence.nextId() + "");
-                iIdxBizJgTechParamsPipelineService.save(pipeline);
+                JSONObject jsonObject = JSONObject.parseObject(oldTechInfo);
+                JSONArray piePines = jsonObject.getJSONArray("equipmentLists");
+                for(int i = 0; i < piePines.size(); i++){
+                    JSONObject item = piePines.getJSONObject(i);
+                    String rcd = item.getString("record");
+                    // 删除
+                    iIdxBizJgTechParamsPipelineService.remove(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().eq(IdxBizJgTechParamsPipeline::getRecord, rcd));
+                    // 插入
+                    IdxBizJgTechParamsPipeline pipeline = BeanUtil.copyProperties(item, IdxBizJgTechParamsPipeline.class);
+                    pipeline.setSequenceNbr(sequence.nextId() + "");
+                    iIdxBizJgTechParamsPipelineService.save(pipeline);
+                }
                 break;
-
             // 起重机械
             case QZJX:
                 IdxBizJgTechParamsLifting lifting = JSON.parseObject(oldTechInfo, IdxBizJgTechParamsLifting.class);
@@ -1455,6 +1526,14 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
+    private String getEquListCode(JgRegistrationHistory jgRegistrationHistory, JgChangeRegistrationReform jgChangeRegistrationReform) {
+        if(StringUtils.isNotEmpty(jgChangeRegistrationReform.getProjectContraptionId())){
+            return EquipmentClassifityEnum.YLGD.getCode();
+        } else {
+            return getEquListCode(jgRegistrationHistory);
+        }
+    }
+
 
     private String getEquListCode(JgRegistrationHistory jgRegistrationHistory) {
         String record = jgRegistrationHistory.getEquId();