reafact(jg): 业务作废

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

@@ -1994,7 +1994,7 @@
     </select>
     <select id="selectListForInstallNoticeDiscard" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq">
         SELECT
-            eq.sequence_nbr,
+            eq.equ_id,
             u.apply_no as recUserName
         FROM "tzs_jg_use_registration_eq" eq, tzs_jg_use_registration u
         where

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/discardOrder/strategy/InstallNoticeDiscardOrderCheck.java

 package com.yeejoin.amos.boot.module.jg.biz.discardOrder.strategy;
 
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.discardOrder.factory.support.SupportableDiscardOrderCheck;
@@ -26,7 +25,7 @@ public class InstallNoticeDiscardOrderCheck implements SupportableDiscardOrderCh
     public Boolean check(List<String> records) {
         List<JgUseRegistrationEq> useRegistrationEqs = useRegistrationMapper.selectListForInstallNoticeDiscard(records);
         if (!useRegistrationEqs.isEmpty()) {
-            String msg = String.format("存在设备正在办理或已办理业务：%s，不能进行作废！", String.join(",", useRegistrationEqs.stream().map(u->GenericDiscardOrderCheck.buildErrorMsg(u.getRecUserName())).collect(Collectors.toSet())));
+            String msg = String.format("存在设备正在办理或已办理业务：%s，不能进行作废！", String.join(",", useRegistrationEqs.stream().map(u -> GenericDiscardOrderCheck.buildErrorMsg(u.getRecUserName())).collect(Collectors.toSet())));
             throw new RuntimeException(msg);
         }
         return true;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/discardOrder/strategy/UseRegisterDiscardOrderCheck.java

 package com.yeejoin.amos.boot.module.jg.biz.discardOrder.strategy;
 
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.discardOrder.factory.support.SupportableDiscardOrderCheck;
@@ -26,7 +25,7 @@ public class UseRegisterDiscardOrderCheck implements SupportableDiscardOrderChec
     public Boolean check(List<String> records) {
         List<JgUseRegistrationEq> useRegistrationEqs = useRegistrationMapper.selectListForSelfDiscard(records);
         if (!useRegistrationEqs.isEmpty()) {
-            String msg = String.format("存在设备正在办理或已办理后续业务：%s，不能进行作废！", String.join(",", useRegistrationEqs.stream().map(u->GenericDiscardOrderCheck.buildErrorMsg(u.getRecUserName())).collect(Collectors.toSet())));
+            String msg = String.format("存在设备正在办理或已办理后续业务：%s，不能进行作废！", String.join(",", useRegistrationEqs.stream().map(u -> GenericDiscardOrderCheck.buildErrorMsg(u.getRecUserName())).collect(Collectors.toSet())));
             throw new RuntimeException(msg);
         }
         return true;