Merge branch 'develop_tzs_register' of…

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

@@ -717,7 +717,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 .eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
         // 删除单子对应历史表数据
         jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                .eq(JgRegistrationHistory::getCurrentDocumentId, jgEnableDisable.getApplyNo()));
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgEnableDisable.getSequenceNbr()));
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {

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

@@ -759,7 +759,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                     .eq(JgEquipTransferEq::getEquipTransferId, notice.getSequenceNbr()));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
         }
         return Boolean.TRUE;
     }

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

@@ -464,7 +464,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     .eq(JgInstallationNoticeEq::getEquipTransferId, sequenceNbr));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgInstallationNotice.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgInstallationNotice.getSequenceNbr()));
         }
         return Boolean.TRUE;
     }

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 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;
@@ -30,12 +29,10 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -119,7 +116,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private RedissonClient redissonClient;
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
-
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
     /**
      * 根据sequenceNbr查询
      *
@@ -141,7 +139,15 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("constructionManagerId", ObjectUtils.isEmpty(notice.getConstructionManagerId()) ? null : notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
         maintainInfo.put("county", ObjectUtils.isEmpty(notice.getCounty()) ? null : notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
-        maintainInfo.put("useUnitCreditCode", ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null : notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        //maintainInfo.put("useUnitCreditCode", ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null : notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
+        if (!ObjectUtils.isEmpty(notice.getUseUnitCreditCode())) {
+            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", notice.getUseUnitCreditCode()));
+            if (useCodeResult != null) {
+                String result = notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName() + ("个人主体".equals(useCodeResult.getUnitType())
+                        ? "_" + notice.getUseUnitCreditCode().substring(notice.getUseUnitCreditCode().length() - 4) : "");
+                maintainInfo.put("useUnitCreditCode", result);
+            }
+        }
         maintainInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         if (!ValidationUtil.isEmpty(notice.getInspectionUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getInspectionUnitName())) {
             maintainInfo.put("inspectUnitId", notice.getInspectionUnitCreditCode() + "_" + notice.getInspectionUnitName());
@@ -381,7 +387,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     .eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintainNotice.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintainNotice.getSequenceNbr()));
         }
         return true;
     }

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

@@ -257,7 +257,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     .eq(JgMaintenanceContractEq::getEquipTransferId, seq));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintenanceContract.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintenanceContract.getSequenceNbr()));
         });
         return true;
     }

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

@@ -318,7 +318,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
         });
         return Boolean.TRUE;
     }

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

@@ -349,7 +349,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                         .eq(JgScrapCancelEq::getEquipTransferId,jgScrapCancel.getSequenceNbr()));
                 // 删除单子对应历史表数据
                 jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getApplyNo()));
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getSequenceNbr()));
             }
         }
     }

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

@@ -207,7 +207,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     .eq(JgTransferNoticeEq::getEquipTransferId, sequenceNbr));
             // 删除单子对应历史表数据
             jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgTransferNotice.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgTransferNotice.getSequenceNbr()));
         }
         return Boolean.TRUE;
     }

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

@@ -1305,7 +1305,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     .eq(JgUseRegistrationEq::getEquipTransferId, id));
             // 删除单子对应历史表数据
             jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr()));
         });
     }
 

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

@@ -853,7 +853,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     .eq(JgVehicleInformationEq::getVehicleId, id));
             // 删除单子对应历史表数据
             jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, vehicleInformation.getApplyNo()));
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, vehicleInformation.getSequenceNbr()));
         });
     }