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/dto/JgChangeRegistrationTransferDto.java

@@ -127,4 +127,14 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
 
     @ApiModelProperty(value = "设备移装完整详细地址")
     private String fullAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String allAddress;
+
+    @ApiModelProperty(value = " 单位内部编号")
+    private String innerCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -21,9 +21,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -12,9 +11,8 @@ 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.entity.JgInstallationNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
@@ -142,8 +140,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqServiceImpl;
     @Autowired
     private JgUseRegistrationEqServiceImpl jgUseRegistrationEqServiceImpl;
-
-
+    @Autowired
+    private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
 
     /**
      * 设备注册信息
@@ -1160,11 +1158,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get("SEQUENCE_NBR")) ? OPERATESAVE : OPERATEEDIT;
         record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get("RECORD").toString();
 
+        // 单位类型
+        Map<String, Object> companyType = jgInstallationNoticeService.getCompanyType();
+        String companyTypeStr = companyType.get("companyType").toString();
+
         //使用信息
         IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
+
+        if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
+            useInfo.setUseUnitCreditCode(companyType.get("creditCode").toString());
+            useInfo.setUseUnitName(companyType.get("companyTypeName").toString());
+        }
+
         idxBizJgUseInfoService.saveOrUpdateData(useInfo);
 
         //设计制造
@@ -1189,8 +1197,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
         constructionInfo.setRecord(record);
         constructionInfo.setRecDate(date);
-        constructionInfo.setUscUnitCreditCode(companyCode);
-        constructionInfo.setUscUnitName(companyName);
+
+        if(companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
+            constructionInfo.setUscUnitCreditCode(companyCode);
+            constructionInfo.setUscUnitName(companyName);
+        }
+
         constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 

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

@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
 
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
         if (ValidationUtil.isEmpty(tableData)) {
@@ -366,7 +366,16 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
-        return  Collections.singletonList(oldTransfer);
+
+        JgChangeRegistrationTransferDto resultDto = new JgChangeRegistrationTransferDto();
+        Bean.copyExistPropertis(oldTransfer,resultDto);
+        //组装返回信息，添加设备信息的展示
+        resultDto.setEquCategory((String) tableData.get("equCategoryDesc"));
+        resultDto.setProductName((String) tableData.get("productName"));
+        resultDto.setAllAddress(oldTransfer.getFullAddress());
+        resultDto.setEquCode((String) tableData.get("equCode"));
+        resultDto.setInnerCode((String) tableData.get("useInnerCode"));
+        return  Collections.singletonList(resultDto);
     }
 
     /**
@@ -375,7 +384,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         return this.createTransfer(submitType, map, reginParams);
     }
 
@@ -1140,7 +1149,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), transfer.getSupervisoryCode(), transfer.getApplyNo());
+        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"), Optional.ofNullable(transfer.getApplyNo()).orElse("无"));
     }
 
     public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {

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

@@ -586,6 +586,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 supervisoryCode = map.get("SUPERVISORY_CODE").toString();
             }
         }
+        supervisoryCode = StringUtils.isEmpty(supervisoryCode) ? "无" : supervisoryCode;
         String format = String.format("来自%s【%s】等的业务办理，【申请单号：%s】等", equList, supervisoryCode, dto.getApplyNo());
         return format;
     }