注销、报废生成申请单编号前缀修改

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

@@ -1210,7 +1210,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
             jsonObject.put("businessCode", type);
             return jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
-        } else if (type.contains(ApplicationFormTypeEnum.YZBF.getBusinessCode()) || type.contains(ApplicationFormTypeEnum.ZXBF.getBusinessCode())) {
+        } else if (type.contains(ApplicationFormTypeEnum.ZX.getBusinessCode()) || type.contains(ApplicationFormTypeEnum.BF.getBusinessCode())) {
             noticeObj.put("cancelType", type.equals("BF_ZX") ? "1" : "2");
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(SBZX_PAGE_ID, noticeObj);

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

@@ -189,11 +189,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         model.setReceiveOrgName(receiveOrg[1]);
         // 字段转换
         convertField(model);
-        // 获取告知单号  TODO 待修改 bug
+        // 获取告知单号 调整之前YZBF为ZX，
         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();
+            throw new BadRequest("获取告知单号失败");
         }
 
         String instanceId = "";

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -30,8 +30,8 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG", "DJ_DW"),//单位变更登记
     JY("JY", ""),
     JG("JG", ""),// 检验结果
-    YZBF("YZBF", "BF_YZ"),//电梯（设备）移装注销
-    ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销
+    ZX("ZX", "BF_YZ"),//电梯（设备）移装注销
+    BF("BF", "BF_ZX"),//电梯（设备）报废注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     SBQY("SBQY", "SB_QY"),//设备启用
     SBTY("SBTY", "SB_TY");//设备启用