Merge branch 'refs/heads/develop_tzs_bugfix' 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

@@ -160,5 +160,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
     @ApiModelProperty(value = " 转办后执行人的Id逗号分割")
     private String transferToUserIds;
 
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 
 }

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

@@ -261,4 +261,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
      */
     @TableField("transfer_type")
     private String transferType;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -123,7 +123,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      */
     Integer checkFactoryNumUnique(@Param("factoryNum") String factoryNum,
                                   @Param("sequenceNbr") String sequenceNbr,
-                                  @Param("useUnitCreditCode") String useUnitCreditCode);
+                                  @Param("produceUnitCreditCode") String produceUnitCreditCode);
 
     /**
      * 使用登记证编号全库唯一校验

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

@@ -23,9 +23,10 @@ public interface IJgChangeRegistrationUnitService {
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 安装告知
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo);
 
     /**
      * 更新安装告知

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -263,4 +263,10 @@ public class JgVehicleInformationVo implements Serializable {
     private String oRegDate;
 
     private CompanyBo companyInfo;
+
+    @ApiModelProperty(value = "主体类型")
+    private String companyType;
+
+    @ApiModelProperty(value = "是否有权限")
+    private Boolean havingPermission;
 }

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

@@ -797,13 +797,13 @@
         count(1)
         FROM
         "idx_biz_jg_factory_info" ibjfi
-        JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjri."RECORD" = ibjui."RECORD"
-        WHERE
-        ibjri."EQU_LIST" = '2000'
+        LEFT JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
+        LEFT JOIN idx_biz_jg_other_info joi ON joi."RECORD" = ibjfi."RECORD"
+        WHERE ibjri."EQU_LIST" = '2000'
         AND ibjri."EQU_CATEGORY" = '2300'
         AND ibjfi."FACTORY_NUM" = #{factoryNum}
-        AND ibjui."USE_UNIT_CREDIT_CODE" = #{useUnitCreditCode}
+        AND ibjfi."PRODUCE_UNIT_CREDIT_CODE" = #{produceUnitCreditCode}
+        AND joi.CLAIM_STATUS = '已认领'
     </select>
 
     <select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">

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

@@ -6,7 +6,8 @@
         where sequence_nbr = #{id}
     </update>
     <sql id="page-list">
-        select ur.sequence_nbr as sequenceNbr,
+        select
+            ur.sequence_nbr as sequenceNbr,
             ur.audit_status as auditStatus,
             date_format(ur.reg_date,'%Y-%m-%d') as regDate,
             ur.use_unit_name as useUnitName,
@@ -17,7 +18,6 @@
             ur.apply_no as applyNo,
             ur.next_execute_ids as nextExecuteIds,
             ur.promoter,
-        GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
             ur.use_registration_code  as useRegistrationCode,
             date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
             date_format(ur.create_date,'%Y-%m-%d')  as createDate,
@@ -28,6 +28,9 @@
             ur.rec_date as recDate,
             ur.manage_type as manageType,
             ur.reg_type as regType,
+            ur.use_address as fullAddress,
+            ur.cancel_reason as cancelReason,
+            GROUP_CONCAT(DISTINCT other.supervisory_code)  as supervisoryCode,
             GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
             GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
             GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
@@ -37,16 +40,12 @@
             GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
             GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
             GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_LIST)) AS equListName,
-        GROUP_CONCAT(DISTINCT use.USE_INNER_CODE) AS innerCode,
             GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
-        concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as fullAddress,
-        use."ADDRESS" as detailedAddress,
-        ibjsi.ORG_BRANCH_NAME as orgBranchName,
-        ur.cancel_reason as cancelReason
-        from tzs_jg_use_registration ur
+            GROUP_CONCAT(DISTINCT ibjsi.ORG_BRANCH_NAME) AS  orgBranchName
+        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
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
             LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
             LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
     </sql>

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

@@ -150,12 +150,21 @@ public class CommonController extends BaseController {
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
         if ("个人主体".equals(companyType)) {
             String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
-            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String useUnitCode = code.length > 1 ? code[1] : code[0];
+            map.put("useUnitCreditCode", useUnitCode);
             String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
             map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+            map.put("address", commonService.getEnterpriseInfo(useUnitCode).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
+            map.put("companyType", "person");
         } else {
             map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
             map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+            map.put("address", commonService.getEnterpriseInfo(selectedOrgInfo.getCompany().getCompanyCode()).get("address"));
+            // 冗余兼容其他业务
+            map.put("useUnitAddress", map.get("address"));
+            map.put("companyType", "company");
         }
         return ResponseHelper.buildResponse(map);
     }

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

@@ -117,7 +117,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
     public ResponseModel<Map<String,
             Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
 

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

@@ -162,7 +162,7 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	@GetMapping(value = "/details")
 	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	public ResponseModel<Map<String, Object>> getDetails(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
-		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr));
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr, getSelectedOrgInfo()));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -112,7 +112,10 @@ public class JgUseRegistrationController extends BaseController {
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
         Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds());
-        list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
+        list.getRecords().forEach(x -> {
+            x.put("companyType", info.getCompany().getCompanyType());
+            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+        });
         return ResponseHelper.buildResponse(list);
     }
 

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

@@ -144,7 +144,10 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds());
-        list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
+        list.getRecords().forEach(x -> {
+            x.put("companyType", info.getCompany().getCompanyType());
+            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+        });
         return ResponseHelper.buildResponse(list);
     }
 
@@ -171,7 +174,7 @@ public class JgVehicleInformationController extends BaseController {
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个车用气瓶控制类", notes = "根据sequenceNbr查询单个车用气瓶控制类")
     public ResponseModel<JgVehicleInformationVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
     }
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgMaintenanceRecordInfoService.java

@@ -12,5 +12,10 @@ public interface IIdxBizJgMaintenanceRecordInfoService {
 
     boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
 
+    /**
+     * 按照创建日期倒叙排列，查询最新的一条维保信息
+     * @param record 设备唯一标识
+     * @return 查询最新的一条维保信息
+     */
     IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String 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/IdxBizJgMaintenanceRecordInfoServiceImpl.java

@@ -25,16 +25,19 @@ public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBiz
         return this.saveOrUpdate(maintenanceRecordInfo);
     }
 
-    //查询最新的记录
+    /**
+     * 查询最新的维保记录
+     */
+    @Override
     public IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record) {
-        IdxBizJgMaintenanceRecordInfo result = new IdxBizJgMaintenanceRecordInfo();
         QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd);
-        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = list(queryWrapper);
-        if(!ValidationUtil.isEmpty(maintenanceRecordInfoList)){
-            BeanUtils.copyProperties(maintenanceRecordInfoList.get(0),result);
+        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
+        IdxBizJgMaintenanceRecordInfo init = new IdxBizJgMaintenanceRecordInfo();
+        IdxBizJgMaintenanceRecordInfo last = getOne(queryWrapper);
+        if(last != null){
+            init = last;
         }
-        return result;
+        return init;
     }
 
 

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

@@ -325,6 +325,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //设备移装详细地址
             oldTransfer.setFullAddress(fullAddress);
             oldTransfer.setTransferType((String) tableData.get("transferType"));
+            if (!ObjectUtils.isEmpty(tableData.get("otherAccessories"))) {
+                oldTransfer.setOtherAccessories(JSONObject.toJSONString(tableData.get("otherAccessories")));
+            }
 
             //保存【移装变更登记】基本信息
             if (!ValidationUtil.isEmpty(oldTransfer)) {
@@ -649,6 +652,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
             resultDataMap.put("registrationList", newRegistrationList);
         }
+        if (!ObjectUtils.isEmpty(resultDataMap.get("otherAccessories"))) {
+            resultDataMap.put("otherAccessories", JSONObject.parse(resultDataMap.get("otherAccessories").toString()));
+        }
         String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
         if (StringUtil.isNotEmpty(transferSafetyManager)) {
             String[] transferSafetyManagerList = transferSafetyManager.split("_");

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

@@ -163,10 +163,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
      *
      * @param sequenceNbr 主键
+     * @param selectedOrgInfo
      * @return 单位变更
      */
     @Override
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         // 单位变更信息
         JgChangeRegistrationUnit notice = JgChangeRegistrationUnitMapper.selectById(sequenceNbr);
         if (Objects.isNull(notice)) {
@@ -174,7 +175,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         this.doCompensate(notice);
         Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false, true);
-
+        //回填新单位地址，台套办理的使用登记证打印时 需要，用来校验必输
+        if (!ObjectUtils.isEmpty(notice.getNewUseUnitCreditCode())) {
+            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseUnitCode, notice.getNewUseUnitCreditCode()));
+            if (useCodeResult != null) {
+                changeInfo.put("address",useCodeResult.getAddress());
+            }
+        }
         //组装下拉数据
         if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
             changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
@@ -194,6 +201,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
                         .eq(JgRegistrationHistory::getIsDelete, false));
         changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
+        changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            changeInfo.put("companyType", "person");
+        } else {
+            changeInfo.put("companyType", "company");
+        }
         return new HashMap<String, Map<String, Object>>() {{
 //            this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
             this.put("changeRegisInfo", changeInfo);
@@ -314,6 +328,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
                 notice.setNextExecuteUserIds(nextUserIds);
+                setNewUnitInfo(reginParams, notice);
                 JgChangeRegistrationUnitMapper.updateById(notice);
                 commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
                 createTaskModel(notice, taskname, "1", nextUserIds);
@@ -361,12 +376,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                 executeOneStep(bean, taskName1, nextUserIds, op);
                 bean.setNextExecuteUserIds(nextUserIds);
+                setNewUnitInfo(reginParams, bean);
                 JgChangeRegistrationUnitMapper.updateById(bean);
                 commonServiceImpl.saveExecuteFlowData2Redis(bean.getInstanceId(), buildInstanceRuntimeData(bean));
             }
         } else {
             JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
             BeanUtils.copyProperties(noticeDto, bean);
+            setNewUnitInfo(reginParams, bean);
             JgChangeRegistrationUnitMapper.updateById(bean);
         }
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
@@ -409,6 +426,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         return noticeDto;
     }
 
+    private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) {
+        notice.setNewUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyName().split("_")[1] : reginParams.getCompany().getCompanyName());
+        notice.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
+    }
+
 
     /**
      * 分页查询
@@ -613,10 +638,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             model.setPromoter(reginParams.getUserModel().getUserId());
             model.setStatus(taskName[0]);
         }
-        model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
-        model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
-                reginParams.getCompany().getCompanyCode().split("_")[1] :
-                reginParams.getCompany().getCompanyCode());
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -636,6 +657,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         model.setEquList(registrationList.get(0).get("equList").toString());
         JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
         BeanUtils.copyProperties(model, registrationUnit);
+        setNewUnitInfo(reginParams, registrationUnit);
         JgChangeRegistrationUnitMapper.insert(registrationUnit);
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
@@ -765,15 +787,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
         }
 
-        String newUseUnitId = model.getNewUseUnitCreditCode();
-        if (!ObjectUtils.isEmpty(newUseUnitId)) {
-            String[] newUseUnitList = newUseUnitId.split("_");
-            if (newUseUnitList.length > 1) {
-                model.setNewUseUnitCreditCode(newUseUnitList[0]);
-                model.setNewUseUnitName(newUseUnitList[1]);
-            }
-        }
-
         String receiveOrgCode = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgCode)) {
             String[] receiveOrgCodeList = receiveOrgCode.split("_");

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

@@ -6,6 +6,7 @@ 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;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -27,9 +28,11 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 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.IdxBizJgOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -89,8 +92,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
     @Autowired
-    private JgVehicleInformationServiceImpl jgVehicleInformationService;
-    @Autowired
     private JgChangeVehicleRegistrationUnitEqServiceImpl jgChangeVehicleRegistrationUnitEqService;
     @Autowired
     private RedissonClient redissonClient;
@@ -103,6 +104,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @Autowired
     private IdxBizJgOtherInfoMapper otherInfoMapper;
 
+    @Autowired
+    private IdxBizJgUseInfoMapper jgUseInfoMapper;
+
     private volatile Map<String, Object> fillingMediumMap;
 
 
@@ -443,6 +447,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             HashMap<String, Object> param = new HashMap<>();
             param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
             param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+            // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
+            param.put("USE_INNER_CODE", jgChangeVehicleRegistrationUnit.getNewCarNumber());
             if (!ObjectUtils.isEmpty(useRegistCode)) {
                 param.put("USE_ORG_CODE", useRegistCode);
                 LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
@@ -523,6 +529,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
         }
+        // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
+        updateCarNumIntoUseInnerCode(jgChangeVehicleRegistrationUnit, collect);
         // 修改证管理信息
         manage.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         manage.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
@@ -551,6 +559,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
 
     }
 
+    private void updateCarNumIntoUseInnerCode(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, List<String> collect) {
+        LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.in(IdxBizJgUseInfo::getRecord, collect);
+        updateWrapper.set(IdxBizJgUseInfo::getUseInnerCode, jgChangeVehicleRegistrationUnit.getNewCarNumber());
+        jgUseInfoMapper.update(null, updateWrapper);
+    }
+
     /**
      * 生成监管码
      */
@@ -772,7 +787,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return Boolean.TRUE;
     }
 
-    public Map<String, Object> getDetails(String sequenceNbr) {
+    public Map<String, Object> getDetails(String sequenceNbr, ReginParams selectedOrgInfo) {
         JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         this.doCompensate(registrationUnit);
         JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery()
@@ -791,6 +806,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             } else {
                 object.put("newCarNumber", registrationUnit.getCarNumber());
             }
+            String companyType = selectedOrgInfo.getCompany().getCompanyType();
+            if ("个人主体".equals(companyType)) {
+                object.put("companyType", "person");
+            } else {
+                object.put("companyType", "company");
+            }
+            object.put("havingPermission", registrationUnit.getNextExecuteUserIds() != null && registrationUnit.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
             return object;
         } else {
             return new HashMap<>();

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

@@ -697,11 +697,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-        ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
+        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
-            IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(item.getEquId());
-            if (!ObjectUtils.isEmpty(info)) {
+            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+            info.setRecord(item.getEquId());
+            info.setRecDate(new Date());
+            info.setRecUserId(RequestContext.getExeUserId());
             info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
             info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
             info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
@@ -713,11 +715,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
             info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
             info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
-                data.add(info);
-            }
+            maintenanceRecordInfoList.add(info);
         });
-        idxBizJgMaintenanceRecordInfoService.updateBatchById(data);
-        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(data), 2, false);
+        idxBizJgMaintenanceRecordInfoService.saveBatch(maintenanceRecordInfoList);
+        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);
     }
 
 

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

@@ -600,13 +600,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return useFlagParamDto;
     }
 
-    public void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(record, null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));

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

@@ -1706,6 +1706,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(sequenceNbr)) {
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
             this.doCompensate(jgUseRegistration);
+
             LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
             lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
             lambda.eq(JgRegistrationHistory::getIsDelete, false);
@@ -1749,6 +1750,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     }
                 }
             }
+            jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode());
             // 转化 附件 字段
             commonServiceImpl.convertStringToJsonobject(jsonObject, jsonFields);
             return jsonObject;
@@ -2349,13 +2351,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return useFlagParamDto;
     }
 
-    public void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord(), null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
@@ -2535,10 +2537,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void clearMainInfo(String record) {
         maintenanceRecordInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq(IdxBizJgMaintenanceRecordInfo::getRecord, record));
-        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = new IdxBizJgMaintenanceRecordInfo();
-        maintenanceRecordInfo.setRecord(record);
-        maintenanceRecordInfo.setRecDate(new Date());
-        maintenanceRecordInfoMapper.insert(maintenanceRecordInfo);
     }
 
     private void clearConstructionInfo(String record) {
@@ -2827,6 +2825,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (used){
                 throw new BadRequest("使用登记证编号已存在！");
             }
+            //使用登记证编号判断是否使用未来系统生成编号
+            idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode, "set");
 
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();
@@ -3097,9 +3097,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
         SimpleDateFormat format = new SimpleDateFormat();
-        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
+        IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+        info.setRecord(String.valueOf(map.get("equipId")));
         String meUnitName = String.valueOf(map.get("meUnitName"));
+        info.setRecDate(new Date());
+        info.setRecUserId(RequestContext.getExeUserId());
         info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
         info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
         info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
@@ -3116,8 +3118,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             log.info("date转化失败");
         }
         info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
-            idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
-        }
+        idxBizJgMaintenanceRecordInfoService.save(info);
     }
 
     /**

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

@@ -573,9 +573,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      * 查看详情
      *
      * @param sequenceNbr sequenceNbr
+     * @param selectedOrgInfo
      * @return JgVehicleInformationModel
      */
-    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr) {
+    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationVo vo = new JgVehicleInformationVo();
         JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);
@@ -680,6 +681,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
             vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
         }
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            vo.setCompanyType("person");
+        } else {
+            vo.setCompanyType("company");
+        }
+        vo.setHavingPermission(dto.getNextExecuteUserIds() != null && dto.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
         return vo;
     }
 
@@ -1597,9 +1605,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo) {
-        // 使用单位信息
-        Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgVehicleInformation.getUseUnitCreditCode());
-        //
         Map<String, String> equType = new HashMap<>();
         equType.put("equList", this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
         equType.put("equListCode", registerInfo.getEquList());
@@ -1629,7 +1634,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
         jgUseRegistrationManage.setEquUseAddress("");
         jgUseRegistrationManage.setManageType("unit");
-        jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
+        jgUseRegistrationManage.setUseUnitAddress(jgVehicleInformation.getUseUnitAddress());
         jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
         jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
@@ -1745,6 +1750,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if (used){
             throw new BadRequest("使用登记证编号已存在！");
         }
+        //使用登记证编号判断是否使用未来系统生成编号
+        idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode1,"vehicle");
 
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BasePersonRegisterDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,11 +27,9 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "有效期开始")
-    private Date expirationDateStart;
+    private String expirationDateStart;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "有效期结束")
     private String expirationDateEnd;
 
@@ -41,7 +37,6 @@ public class BasePersonRegisterDto extends BaseDto {
     private String expirationDateType;
 
 
-
     @ApiModelProperty(value = "单位名称")
     private String name;
 
@@ -85,8 +80,6 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "管理员身份证号")
     private String adminIdNumber;
 
-//    @ApiModelProperty(value = "个人基本信息")
-//    private TzsBaseIndividualityDto baseIndividualityDto;
 
     @ApiModelProperty(value = "平台公司id,平台创建公司后更新")
     private String amosCompanySeq;
@@ -94,4 +87,7 @@ public class BasePersonRegisterDto extends BaseDto {
     @ApiModelProperty(value = "平台用户id,平台创建用户后更新")
     private String adminUserId;
 
+    @ApiModelProperty(value = "住所")
+    private String address;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsBaseIndividualityServiceImpl.java

@@ -75,6 +75,7 @@ public class TzsBaseIndividualityServiceImpl extends BaseService<TzsBaseIndividu
         companyInfo.setCompanyName(dto.getCredentialsNum() + "_" + dto.getRealName());
         companyInfo.setCompanyCode(dto.getUnitCode());
         companyInfo.setCompanyType(unitType);
+        companyInfo.setAddress(dto.getAddress());
         try {
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
             if (companyResult == null || companyResult.getResult() == null) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -399,6 +399,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
         if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
             baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
+            baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
         } else {
             baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
             baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());