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/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -441,4 +441,10 @@ public class JgInstallationNotice extends BaseEntity {
      */
     @TableField(value = "org_branch_name")
     private String orgBranchName;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -345,4 +345,10 @@ public class JgMaintainNotice extends BaseEntity {
      */
     @TableField(exist = false)
     private String fullAddress;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -345,4 +345,10 @@ public class JgReformNotice extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -326,4 +326,9 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
 
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

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

@@ -90,7 +90,7 @@
             isn.install_leader_name AS installLeaderName,
             isn.install_leader_phone AS installLeaderPhone,
             isn.use_unit_name AS useUnitName,
-
+            isn.inform_number AS informNumber,
             tec2.name                       AS equCategory,
             tec1.name                       AS equList,
             tec.name                        AS equDefine,

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

@@ -80,6 +80,7 @@
                isn.plan_date                  AS installStartDate,
                isn.construction_manager       AS installLeaderName,
                isn.construction_manager_phone AS installLeaderPhone,
+               isn.inform_number              AS informNumber,
                ri.equ_list                    AS equList,
                ri.equ_category                AS equCategory,
                ri.EQU_DEFINE                  AS equDefine,

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

@@ -97,6 +97,7 @@
                isn.plan_date                  AS installStartDate,
                isn.construction_manager       AS installLeaderName,
                isn.construction_manager_phone AS installLeaderPhone,
+               isn.inform_number              AS informNumber,
                ri.equ_code                    AS equRegisterCode,
                fi.FACTORY_NUM                  AS produceCode,
                ri.product_name                AS productName,

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

@@ -128,6 +128,7 @@
             oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
+            tjtn.inform_number AS informNumber,
             ri.EQU_CODE AS equRegisterCode,
             ri.PRODUCT_NAME AS productName,
             ri.BRAND_NAME AS brandName,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -17,7 +17,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -264,7 +263,7 @@ public class CommonController extends BaseController {
 
 	private List<LinkedHashMap> getInfoByCounty(String county, List<LinkedHashMap> children) {
 		for (LinkedHashMap item : children) {
-			if (item.get("level").toString().equals("county") && item.get("companyCode").toString().equals(county)) {
+			if (item.get("companyCode").toString().equals(county)) {
 				return (List<LinkedHashMap>) item.get("children");
 			} else {
 				if (!ObjectUtils.isEmpty(item.get("children"))) {

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

@@ -454,7 +454,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -478,7 +478,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);
 
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
 //        String url = WordTemplateUtils.templateToPdf("installation-notification-report.ftl", placeholders);
@@ -830,8 +830,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord,jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getReceiveOrgCreditCode()).append(ym);
                 String equCode = stringBuffer.toString();
+
                 ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
                 String deviceRegistrationCode = responseModel.getResult();
                 Map<String, Object> map = new HashMap<>();
@@ -854,8 +855,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
                 }
                 tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
-                jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                //tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
+                //jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                jgInstallationNotice.setInformNumber(deviceRegistrationCode);
+
                 jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
                 Map<String,Map<String,Object>> objMap = new HashMap<>();
                 map1.put("EQU_CODE",tzsJgRegistrationInfo.getEquCode() );

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

@@ -372,7 +372,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -395,7 +395,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") +
                 getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
         placeholders.put("installLicenseNoList", installLicenseNoList);//许可证编号
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);//许可证有效期
@@ -768,13 +768,17 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getReceiveCompanyCode()).append(ym);
+                String equCode = stringBuffer.toString();
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+                jgMaintainNotice.setInformNumber(deviceRegistrationCode);
+
                 jgMaintainNotice.setAcceptDate(new Date());
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
                 jgMaintainNotice.setPromoter("");
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
+
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -786,6 +790,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 commonService.updateTaskModel(taskMap);
+
+                jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+                jgMaintainNoticeMapper.updateById(jgMaintainNotice);
+                this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
             } else {
                 jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {
@@ -816,6 +825,10 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+
+                jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+                jgMaintainNoticeMapper.updateById(jgMaintainNotice);
             }
         } else {
             jgMaintainNotice.setPromoter("");
@@ -842,12 +855,14 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             taskModelDto.setPageType("edit");
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
-        }
+
             jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
             jgMaintainNoticeMapper.updateById(jgMaintainNotice);
         }
 
+    }
+
     private TaskResultDTO assembleData(JgMaintainNotice jgMaintainNotice, String op, String opinion) {
         TaskResultDTO taskResultDTO = new TaskResultDTO();
         taskResultDTO.setResultCode("approvalStatus");

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

@@ -353,7 +353,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -377,7 +377,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
 
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
@@ -753,13 +753,19 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgReformNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgReformNotice.getReceiveCompanyCode()).append(ym);
+                String equCode = stringBuffer.toString();
+
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+                jgReformNotice.setInformNumber(deviceRegistrationCode);
 
                 jgReformNotice.setAcceptDate(new Date());
                 jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
                 jgReformNotice.setPromoter("");
                 this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
+                this.updateById(jgReformNotice);
+                this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
             } else {
                 jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {
@@ -774,6 +780,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
                 // 创建新的代办
                 this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
+                jgReformNoticeMapper.updateById(jgReformNotice);
             }
         } else {
             jgReformNotice.setPromoter("");
@@ -787,9 +794,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 上个代办改为驳回
             taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED);
             this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.REJECTED);
-        }
             jgReformNoticeMapper.updateById(jgReformNotice);
         }
+    }
 
     /**
      * 上个代办改为已办

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

@@ -226,7 +226,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -246,7 +246,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
         placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
@@ -711,11 +711,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgTransferNoticeEq.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getReceiveCompanyCode()).append(ym);
+                String equCode = stringBuffer.toString();
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+
+                jgTransferNotice.setInformNumber(deviceRegistrationCode);
+
                 jgTransferNotice.setPromoter("");
                 jgTransferNotice.setHandleDate(new Date());
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
+
 
                 Map<String,Object> map1 =new HashMap<>();
                 Map<String,Map<String,Object>> objMap = new HashMap<>();
@@ -751,6 +757,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
+
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNoticeMapper.updateById(jgTransferNotice);
+                this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -782,6 +793,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
                 taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNoticeMapper.updateById(jgTransferNotice);
             }
         } else {
             jgTransferNotice.setPromoter("");
@@ -808,11 +822,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
-        }
             jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
             jgTransferNoticeMapper.updateById(jgTransferNotice);
-
+        }
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -308,7 +308,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${applyNo}</w:t>
+                            <w:t>${informNumber}</w:t>
                         </w:r>
                     </w:p>
                     <w:tbl>