代码逻辑调整优化

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

@@ -10,10 +10,12 @@
     <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.audit_status as auditStatus,
-        ur.reg_date as regDate,
         ur.use_unit_name as useUnitName,
+        ur.use_registration_code as useRegistrationCode,
         ur.status,
         ur.receive_org_name as receiveOrgName,
+        DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+        DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
@@ -49,7 +51,7 @@
                 </foreach>
             </if>
             <if test="dto.dataType == 'jg' ">
-                and  ur.receive_company_code = #{dto.unitCode}
+                and  ur.receive_org_code = #{dto.unitCode}
             </if>
             <if test="dto.dataType == 'company' ">
                 and  ur.use_unit_credit_code = #{dto.unitCode}

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

@@ -40,10 +40,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 改造变更登记服务实现类
@@ -145,22 +142,30 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setInspectUnitName(reginParams.getCompany().getCompanyName());
         }
         if (map.containsKey("receiveCompanyCode")) {
-            jgChangeRegistrationReform.setReceiveCompanyCode(String.valueOf(map.getString("receiveCompanyCode")));
+            String  receiveCompanyCode = String.valueOf(map.getString("receiveCompanyCode"));
+            jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode);
+            jgChangeRegistrationReform.setReceiveOrgCode(receiveCompanyCode.split("_")[0]);
+            jgChangeRegistrationReform.setReceiveOrgName(receiveCompanyCode.split("_")[1]);
+
         } else {
             jgChangeRegistrationReform.setReceiveCompanyCode("610000");
         }
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         //使用登记编号
-        jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(map.get("record").toString()));
+        jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
         //登记类别
         jgRegistrationHistory.setRegistrationClass("改造登记");
         //设备id
         jgRegistrationHistory.setEquId(equipId);
         //修改数据
         jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
+        //保存历史数据
+        IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
+        jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgTechParamsElevator));
         //设备监管码
         jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
         //数据状态
+        jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
         jgRegistrationHistory.setStatus("new");
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
             jgChangeRegistrationReform.setUseUnitCreditCode(null);
@@ -177,6 +182,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
             jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+            jgChangeRegistrationReform.setRegDate(new Date());
             this.save(jgChangeRegistrationReform);
             jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
             jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
@@ -271,7 +277,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             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(), jgChangeRegistrationReform.getSupervisoryCode());
+            String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
+            jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
+            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(),newUseRegistrationCertificateNumber );
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
@@ -472,8 +480,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @param equipId
      * @param currentDocumentId
      */
-    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String supervisoryCode) {
-        String newUseRegistrationCertificateNumber = getCode(supervisoryCode);
+    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String newUseRegistrationCertificateNumber) {
+
         IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)