fix(jg):bug处理

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

@@ -83,7 +83,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
     private static final String record = "record";
     private static final String sequenceNbr = "sequenceNbr";
-    private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
+    private final List<String> NOT_FLOWING_STATE = Collections.unmodifiableList(Arrays.asList("6610", "6614", "6615", "6617", "6616"));
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private final JgEquipTransferEqMapper jgEquipTransferEqMapper;

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

@@ -3271,6 +3271,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 && !"2".equals(jgUseRegistration.getRegType())) {
             fillLastEquipDetail(jsonObject, record);
         }
+        // 流程中历史无证时，数据去最新的设备信息
+        if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
+                || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
+                && "2".equals(jgUseRegistration.getRegType())) {
+            fillLastEquipBaseInfo(jsonObject, record);
+        }
     }
 
     public void fillLastEquipDetail(JSONObject jsonObject, String record) {