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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -22,9 +22,12 @@
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
-       ur.next_execute_ids as nextExecuteIds,
+        ur.next_execute_ids as nextExecuteIds,
         ur.promoter,
-        ur.supervisory_code  as supervisoryCode
+        ur.supervisory_code  as supervisoryCode,
+        ur.use_registration_code  as useRegistrationCode,
+        date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+        ur.receive_org_name as receiveOrgName
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD

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

@@ -11,10 +11,12 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
@@ -69,6 +71,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     RedisUtils redisUtils;
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
+    @Autowired
+    JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
@@ -79,10 +83,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
     }
 
-
-    @Transactional
-    public void save(JSONObject map) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+    public void updateEquipMessage(String currentDocumentId){
+        LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
+        lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
+        JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         UseInfo useInfo = new UseInfo();
         BeanUtil.copyProperties(map, useInfo);
         LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
@@ -96,22 +101,55 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新检验检测信息
         inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+    }
+
+    public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode){
+        JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
+        LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
+        lambda.eq(JgRegistrationHistory::getEquId, equipId);
+        lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
+        lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
+        Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
+        if (integer > 0){
+            jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
+            jgRegistrationHistoryService.update(jgRegistrationHistory, lambda);
+        }else {
+            jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
+            jgRegistrationHistory.setStatus("new");
+            jgRegistrationHistory.setRegistrationClass("使用登记");
+            jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
+            jgRegistrationHistory.setEquId(equipId);
+            jgRegistrationHistory.setCurrentDocumentId(currentDocumentId);
+            jgRegistrationHistoryService.save(jgRegistrationHistory);
+        }
+
+    }
+
+    @Transactional
+    public void save(JSONObject map) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
+        jgUseRegistration.setRegDate(new Date());
         LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
         otherLambda.eq(OtherInfo::getRecord, map.get("equipId"));
         OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
         String supervisoryCode = otherInfo.getSupervisoryCode();
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
-        jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
-        jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
-        if (map.containsKey("receiveCompanyCode")) {
-            jgUseRegistration.setReceiveCompanyCode(String.valueOf(map.getString("receiveCompanyCode")));
+        jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
+        jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
+        if (map.containsKey("receiveOrgCode")) {
+            //维保单位信息
+            String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
+            jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
+            jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
+
         } else {
             jgUseRegistration.setReceiveCompanyCode("610000");
         }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
         if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
             jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
         }
@@ -137,7 +175,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
-
+        // 暂存历史表
+        updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             String instanceId = "";
             if (map.containsKey("instanceId")) {
@@ -265,12 +304,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
 
         } else {
+            // 流程结束
             jgUseRegistration.setStatus(taskCode);
             if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
                 // 生成使用登记证编号
                 jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
-                jgUseRegistration.setRegDate(new Date());
+                jgUseRegistration.setAuditPassDate(new Date());
             }
+            // 更新设备信息
+            updateEquipMessage(String.valueOf(sequenceNbr));
         }
         this.getBaseMapper().updateById(jgUseRegistration);
 
@@ -375,20 +417,33 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public Map<String, Object> getDetail(String id, Long sequenceNbr) {
+        if (!ObjectUtils.isEmpty(sequenceNbr)){
+            JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
+            LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
+            lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
+            lambda.eq(JgRegistrationHistory::getEquId, id);
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
+            JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+            jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode()+"-"+jgUseRegistration.getReceiveOrgName());
+            return jsonObject;
+        }
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
-        detail.putAll(inspectDetail);
-        detail.putAll(useDetail);
+        if (!ObjectUtils.isEmpty(inspectDetail)){
+            detail.putAll(inspectDetail);
+        }
+        if (!ObjectUtils.isEmpty(useDetail)){
+            detail.putAll(useDetail);
+        }
+        if (!ObjectUtils.isEmpty(detail)){
+            detail.putAll(detail);
+        }
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
-        if (!ObjectUtils.isEmpty(sequenceNbr)){
-            JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-            detail.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode());
-        }
         return detail;
     }