Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -277,12 +277,12 @@ public class ControllerAop {
 				logger.info("获取用户信息====>{}s", stopWatch5.getTotalTimeSeconds());
 
 				List<String> appCodes = new ArrayList<>();
-				try {
-					List<ApplicationModel> applicationModelList = Privilege.agencyUserClient.listApps(userList.get(0).getUserId()).getResult();
-					appCodes = applicationModelList.stream().map(ApplicationModel::getAppCode).collect(Collectors.toList());
-				} catch (Exception e) {
-					throw new RuntimeException("获取listApps失败");
-				}
+//				try {
+//					List<ApplicationModel> applicationModelList = Privilege.agencyUserClient.listApps(userList.get(0).getUserId()).getResult();
+//					appCodes = applicationModelList.stream().map(ApplicationModel::getAppCode).collect(Collectors.toList());
+//				} catch (Exception e) {
+//					throw new RuntimeException("获取listApps失败");
+//				}
 				userList.get(0).setAppCodes(appCodes);
 				ReginParams regionParams = new ReginParams();
 				regionParams.setCompany(company);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -115,4 +115,7 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+    @ApiModelProperty(value = "设备代号")
+    private String equList;
+
 }

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

@@ -148,4 +148,7 @@ public class JgScrapCancel extends BaseEntity {
     @TableField("next_execute_user_ids")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equList;
+
 }

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

@@ -20,7 +20,7 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -154,7 +154,7 @@
             jri.PRODUCT_NAME as productName,
             jri.EQU_CODE as equCode,
             use.USE_INNER_CODE as innerCode,
-            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
             ifnull(ur.instance_id, '') as instanceId,
             re.equ_id as equipId,
             ur.apply_no as applyNo,

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

@@ -88,13 +88,13 @@
             tec1.name                       AS equList,
             tec.name                        AS equDefine,
 
-            isn.equ_register_code AS equRegisterCode,
+            if(isn.equ_register_code is null or isn.equ_register_code = 'null', '', isn.equ_register_code) AS equRegisterCode,
 
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -119,7 +119,8 @@
             ei.legal_phone AS safetyManagerPhone,
             ei.address AS address,
             ei.use_code AS useCode,
-            isn.install_unit_credit_code AS installUnitCreditCode
+            isn.install_unit_credit_code AS installUnitCreditCode,
+            idi.INSPECT_REPORT as inspectReport
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr

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

@@ -71,10 +71,17 @@
             </if>
             <if test="type == 'supervision'">
                 AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.instance_id  is not null
             </if>
             <if test="type == 'company'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
             </if>
+            <if test="type == 'testAdmin'">
+                ((AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.instance_id  is not null)
+                or
+                AND tjtn.install_unit_credit_code = #{orgCode})
+            </if>
         </where>
         ORDER BY
         tjtn.apply_no DESC
@@ -113,12 +120,12 @@
             oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
-            ri.equ_code AS equRegisterCode,
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.EQU_CODE AS equRegisterCode,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -145,7 +152,8 @@
             ui.CITY_NAME AS useUnitCityName,
             ui.COUNTY_NAME AS useUnitCountyName,
             ui.ADDRESS AS useUnitAddress,
-            eio.use_code AS useCode
+            eio.use_code AS useCode,
+            idi.INSPECT_REPORT as inspectReport
         FROM
             tzs_jg_transfer_notice tjtn
                 LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr

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

@@ -141,7 +141,7 @@ public class JgInstallationNoticeController extends BaseController {
     ) {
         Page<JgInstallationNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyType");
+        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryForJgInstallationNoticePage(page, model, type, reginParams));
     }
 

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

@@ -78,7 +78,7 @@ public class JgScrapCancelController extends BaseController {
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 
-        jgScrapCancelService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
+        jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(), Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
@@ -49,6 +50,9 @@ public class JgTransferNoticeController extends BaseController {
     @Autowired
     private CommonServiceImpl commonServiceImpl;
 
+    @Autowired
+    private IJgInstallationNoticeService iJgInstallationNoticeService;
+
     /**
      * 新增移装造告知
      *
@@ -152,11 +156,7 @@ public class JgTransferNoticeController extends BaseController {
     ) {
         Page<JgTransferNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
-            type = BaseController.COMPANY_TYPE_COMPANY;
-        }else {
-            type = BaseController.COMPANY_TYPE_SUPERVISION;
-        }
+        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
         return ResponseHelper.buildResponse(jgTransferNoticeService.queryForJgTransferNoticePage(page, model, type, reginParams));
     }
 

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

@@ -1075,6 +1075,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 //查询设备是否正在使用
                 //设备的使用标识是，安装告知和使用登记中有使用记录。
                 String equId = (String) dto2.get("SEQUENCE_NBR");
+                dto2.put("record",equId);
                 List<JgInstallationNoticeEq> installationNoticeEqList = jgInstallationNoticeEqServiceImpl.getListByEquId(equId);
                 List<JgUseRegistrationEq> useRegistrationEqList = jgUseRegistrationEqServiceImpl.getListByEquId(equId);
                 if(!ValidationUtil.isEmpty(installationNoticeEqList) || !ValidationUtil.isEmpty(useRegistrationEqList)){

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

@@ -488,15 +488,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String newUseRegistrationCertificateNumber, String applyNo) {
 
-        IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
                 .eq("current_document_id", applyNo)
                 .eq("registration_class", bussinessType));
 
-        if (!ObjectUtils.isEmpty(idxBizJgTechParamsElevator) && !ObjectUtils.isEmpty(jgRegistrationHistory)) {
-            //历史数据
-            String historyData = JSONObject.toJSONString(idxBizJgTechParamsElevator);
+        if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
             //当前数据
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
@@ -628,7 +625,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
             //将历史数据回填到历史记录表中
             jgRegistrationHistory.setChangeData(newData);
-            jgRegistrationHistory.setOldData(historyData);
             jgRegistrationHistory.setStatus("history");
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
             makeEquipmentsInvalid(equipId, currentDocumentId);

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

@@ -764,7 +764,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         TaskResultDTO task = new TaskResultDTO();
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
-        task.setComment("");
+        task.setComment(StringUtils.isEmpty(dto.getProcessAdvice())?"":dto.getProcessAdvice());
         task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,jgChangeRegistrationUnit));
 
         HashMap<String, Object> map = 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/JgEnableDisableServiceImpl.java

@@ -90,6 +90,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         JgEnableDisable jgEnableDisable = new JgEnableDisable();
         if (!"null".equals(String.valueOf(map.get("sequenceNbr")))) {
             jgEnableDisable = this.baseMapper.selectById(String.valueOf(map.get("sequenceNbr")));
+            jgEnableDisable.setRemark(map.get("remark").toString());
         } else {
             // 获取申请编号
             ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);

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

@@ -471,12 +471,29 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
         if (Objects.isNull(equipTransfer))
             return null;
-        return Stream.concat(createEquipTransferInfo(equipTransfer).entrySet().stream(),
-                        baseMapper.queryEquipInformation(sequenceNbr).get(0).entrySet().stream())
+
+        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
+                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
+                "proxyStatementAttachment", "installContractAttachment"};
+
+        List<Map<String, Object>> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
+        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+
+        handleJsonArrayFields(equipTransferInfo, fields);
+        handleJsonArrayFields(equipmentInfos.get(0), fields);
+
+        return Stream.concat(equipTransferInfo.entrySet().stream(),
+                        equipmentInfos.get(0).entrySet().stream())
                 .filter(entry -> entry.getValue() != null)
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
     }
 
+    private void handleJsonArrayFields(Map<String, Object> map, String[] fields) {
+        for (String field : fields) {
+            map.computeIfPresent(field, (key, value) -> JSON.parseArray(value.toString()));
+        }
+    }
+
     /**
      * 插入代办
      */

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

@@ -19,8 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
@@ -38,17 +36,15 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 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.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
-import fr.opensagres.xdocreport.core.io.IOUtils;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +55,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -71,8 +65,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
@@ -194,31 +186,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment"};
-
         // 设备信息
-//        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
-
+        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s:fields) {
             if(installationInfo.containsKey(s)) {
                 installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(installationInfo.get(s).toString()));
             }
         }
-        QueryWrapper<JgInstallationNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgInstallationNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgInstallationNoticeEq jgInstallationNoticeEq = jgInstallationNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgInstallationNoticeEq.getEquId());
-        if (!ObjectUtils.isEmpty(inspectDetail)) {
-            detail.putAll(inspectDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDetail)) {
-            detail.putAll(useDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
-        }
+        Map<String, Object> detail = equipmentInfos.get(0);
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
@@ -226,8 +201,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
         detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
-
-        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum");
+        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("installationInfo", detail);
         }};
@@ -628,14 +602,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setEquList((String.valueOf(obj.get("EQU_CATEGORY"))));
+            dto.setEquList((String.valueOf(obj.get("EQU_LIST"))));
             dto.setEntrustingUnitName(dto.getUseUnitName());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
             dto.setEquRegisterCode(String.valueOf(obj.get("EQU_CODE")));
             dto.setFactoryNum(String.valueOf(obj.get("FACTORY_NUM")));
-            StringBuffer buffer = new StringBuffer();
-            buffer.append(dto.getProvinceName()).append(dto.getCityName()).append(dto.getCountyName()).append(dto.getAddress());
-            dto.setEquAddress(buffer.toString());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(workflowResultList)) {
@@ -760,6 +731,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 model.setInstallLeaderName(leaderList[1]);
             }
         }
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(model.getProvinceName()).append(model.getCityName()).append(model.getCountyName()).append(model.getStreetName()).append(model.getAddress());
+        model.setEquAddress(buffer.toString());
     }
 
 
@@ -997,7 +971,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             return result;
         }
         CompanyModel currentCompany = companyModels.get(0);
-        result.put("creditCode", currentCompany.getCompanyCode());
+        result.put("creditCode", currentCompany.getCompanyCode().contains("_") ? currentCompany.getCompanyCode().split("_")[1] : currentCompany.getCompanyCode());
         String companyLevel = CompanyTypeEnum.decideCompanyLevel(currentCompany.getCompanyType());
         String companyType = CompanyTypeEnum.decideCompanyCode(currentCompany.getCompanyType());
         String companyTypeName = CompanyTypeEnum.decideCompanyType(currentCompany.getCompanyType());

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

@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -65,7 +66,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PAGE_KEY = "jgScrapCancelAdd";
-    private static final String template = "来自电梯【%s】【%s】的业务办理，【申请单号：%s】";
+    private static final String template = "来自%s【%s】【%s】的业务办理，【申请单号：%s】";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -163,8 +164,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 字段转换
         convertField(model);
         // 获取告知单号
-        ResponseModel<List<String>> listResponseModel =
-                tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(noticeParams.get("businessCode"))), 1);
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(noticeParams.get("businessCode"))), 1);
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error(" 获取告知单号失败");
             throw new RuntimeException();
@@ -253,8 +253,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
-                    scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskDesc("");
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName());
@@ -278,8 +277,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
-                    scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getSupervisoryCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
@@ -303,10 +301,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
      *
      * @return 摘要
      */
-    private String buildTaskContent(String supervisoryCode, String cancelType, String applyNo) {
+    private String buildTaskContent(String equList, String supervisoryCode, String cancelType, String applyNo) {
         //    来自电梯【X3100-123456】【移装注销】的业务办理【申请单号：ABCD0000001】
         String type = "1".equals(cancelType) ? "报废注销" : "移装注销";
-        return String.format(template, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type, applyNo);
+        String equListName = EquipmentClassifityEnum.getNameByCode(equList);
+        return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type, applyNo);
     }
 
     public void deleteBatch(List<Long> ids) {
@@ -427,7 +426,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
         taskV2Model.setTaskDesc("");
-        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
+        taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
         taskV2Model.setTaskName(taskName);
         taskV2Model.setTaskDesc("");
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
@@ -463,10 +462,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         // 驳回
         if ("1".equals(operate)) {
             // 且驳回到的节点为使用单位提交 则可编辑
-            if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) ||
-                    WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) ||
-                    WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
-            ) {
+            if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) || WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) || WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)) {
                 return "edit";
             }
             return "look";
@@ -527,7 +523,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             IdxBizJgRegisterInfo one = idxBizJgRegisterInfoMapper.selectOne(queryWrapper);
             installationInfo.put("equCode", one.getEquCode());
             Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
+            String equList = String.valueOf(detailFieldCamelCaseByRecord.getOrDefault("equList", ""));
             BeanUtil.copyProperties(installationInfo, detailFieldCamelCaseByRecord);
+            detailFieldCamelCaseByRecord.put("equList", equList);
+            detailFieldCamelCaseByRecord.put("EQU_LIST_CODE", equList);
             return new HashMap<String, Object>() {{
                 this.put(PAGE_KEY, detailFieldCamelCaseByRecord);
             }};
@@ -575,10 +574,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     private String getPageTypeByCurrentNode(String auditStatus) {
-        if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus)
-                || WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus)
-                || WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
-        ) {
+        if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) || WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) || WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)) {
             return "edit";
         } else {
             return "look";
@@ -586,7 +582,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     @Transactional
-    public void flowExecute(Long id, String instanceId, String operate, String comment) {
+    public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
         //组装信息
@@ -605,17 +601,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         //执行流程
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
-        updateExecuteIds(instanceId, id, operate, processTaskDTO);
+        updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
     }
 
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
+    public void updateExecuteIds(String equList, String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName = "";
         String nextTaskId = "";
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr);
+        jgScrapCancel.setEquList(equList);
         if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();
@@ -705,9 +702,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             code = jgScrapCancel.getReceiveOrgCode();
         } else {
             //驳回
-            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) ||
-                    WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
-                    WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
                 code = jgScrapCancel.getUseUnitCode();
             }
         }

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

@@ -127,29 +127,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
         // 设备信息
-        QueryWrapper<JgTransferNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgTransferNoticeEq jgTransferNoticeEq = jgTransferNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgTransferNoticeEq.getEquId());
-        if (!ObjectUtils.isEmpty(inspectDetail)) {
-            detail.putAll(inspectDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDetail)) {
-            detail.putAll(useDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
-        }
-        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
-        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
-        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
-        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
-        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
-        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
-        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
+
         for (String s : fields) {
             if (transferNotice.containsKey(s)) {
                 if ("powerOfAttorney".equalsIgnoreCase(s)) {
@@ -161,10 +140,19 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
             }
         }
+        Map<String, Object> detail = equipmentInfos.get(0);
+        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
         BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("transferNoticeInfo", detail);
         }};
+
     }
 
     @Override

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

@@ -105,12 +105,33 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public void updateEquipMessage(String currentDocumentId, String useOrgCode) {
+        // 市
+        List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
+        // 区
+        List<LinkedHashMap> region = (List<LinkedHashMap>) redisUtils.get("REGION");
         LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
         JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+        map.remove("status");
         UseInfo useInfo = new UseInfo();
         BeanUtil.copyProperties(map, useInfo);
+        if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
+            city.forEach(item -> {
+                if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("city")))) {
+                    useInfo.setCityName(String.valueOf(item.get("regionName")));
+                }
+            });
+        }
+        if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
+            region.forEach(item -> {
+                if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
+                    useInfo.setCountyName(String.valueOf(item.get("regionName")));
+                }
+            });
+        }
+        useInfo.setProvince("610000");
+        useInfo.setProvinceName("陕西省");
         LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
         lambda.eq(UseInfo::getRecord, map.get("equipId"));
         // 更新使用信息
@@ -125,7 +146,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
         // 更新es
-        createCode(String.valueOf(map.get("equipId")), map);
+        createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName());
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
@@ -181,7 +202,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
         }
         // 是否西咸
-        if (!ObjectUtils.isEmpty(map.get("isXixian"))){
+        if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
             jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
         }
 
@@ -464,7 +485,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
-        jsonObject.put("flowStatus",  commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
+        jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
         jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
         if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
             jsonObject.put("pageType", "look");
@@ -657,7 +678,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      *
      * @param record
      */
-    public void createCode(String record, JSONObject dataMap) {
+    public void createCode(String record, JSONObject dataMap, String usePlace) {
         // 其他信息
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
@@ -693,8 +714,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         param.put("CODE96333", otherInfo.getCode96333());
         param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
         param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
-        param.put("CITY", dataMap.get("city"));
-        param.put("COUNTY", dataMap.get("county"));
+        param.put("ADDRESS", dataMap.getOrDefault("address", ""));
+        param.put("USE_PLACE", usePlace);
+        param.put("STATUS", "已认领");
         objMap.put(record, param);
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }

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

@@ -485,6 +485,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     objectHashMap.put(stringObjectEntry.getKey(), stringObjectEntry.getValue());
                     String s = stringObjectEntry.getKey().toLowerCase();
                     objectHashMap.put(CharSequenceUtil.toCamelCase(s), stringObjectEntry.getValue());
+                    if (stringObjectEntry.getKey().equals("SEQUENCE_NBR")){
+                        objectHashMap.put("record",stringObjectEntry.getValue());
+                    }
                 }
                 arrayList.add(objectHashMap);
             });

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

@@ -399,6 +399,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             unitCode = jyjcOpeningApplicationModel.getUnitCode();
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
+            jyjcOpeningApplicationModel.setResultType("input");
             unitCode = reginParams.getCompany().getCompanyCode();
         }
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();

pom.xml

@@ -214,7 +214,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-privilege</artifactId>
-			<version>1.8.7</version>
+			<version>${amos.version}</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>