fix(jg):暂存功能问题处理

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

@@ -32,6 +32,7 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQUIP_CLASS_FORM_ID;
 
 /**
  * 设备注册
@@ -89,6 +90,22 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record, isCopy));
     }
 
+    /**
+     * 查询设备注册信息详情
+     *
+     * @param record
+     * @return 返回由页签的key包裹详情对象
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/selectTempEquip/{record}")
+    @ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
+    public ResponseModel<Object> selectTempEquip(@PathVariable String record, @RequestParam(required = false) String isCopy) {
+        Map<String, Map<String, Object>> equipInfo = idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record, isCopy);
+        Map<String, Object> equipClassMap = Optional.ofNullable(equipInfo.get("equipClass")).orElseGet(HashMap::new);
+        equipClassMap.put("isTempEquip", true);
+        equipInfo.put(EQUIP_CLASS_FORM_ID, equipClassMap);
+        return ResponseHelper.buildResponse(equipInfo);
+    }
 
     /**
      * 查询设备注册信息详情

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/InstallNoticeStrategyHandler.java

@@ -27,6 +27,7 @@ public class InstallNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         basic.put("receiveOrgCreditCode", installationInfo.get("receiveOrgCreditCode"));
         basic.put("code", installationInfo.get("equListCode"));
         basic.put("equCategory", installationInfo.get("equCategoryCode"));
+        basic.put("isTempEquip", true);
         installationInfo.put("equCategory", installationInfo.get("equCategoryCode"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", installationInfo);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/MaintainNoticeStrategyHandler.java

@@ -25,6 +25,7 @@ public class MaintainNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         basic.put("type", ApplicationFormTypeEnum.WXGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", maintainInfo.get("receiveOrgCreditCode"));
         basic.put("code", maintainInfo.get("EQU_LIST_CODE"));
+        basic.put("isTempEquip", true);
         basic.put("equCategory", maintainInfo.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", maintainInfo);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/ReformNoticeStrategyHandler.java

@@ -22,6 +22,7 @@ public class ReformNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
 
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.GZGZ.getBusinessCode());
+        basic.put("isTempEquip", true);
         basic.put("receiveOrgCreditCode", reformNotice.get("receiveOrgCode"));
         basic.put("code", reformNotice.get("EQU_LIST_CODE"));
         basic.put("equCategory", reformNotice.get("EQU_CATEGORY_CODE"));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationReformStrategyHandler.java

@@ -25,7 +25,9 @@ public class RegistrationReformStrategyHandler implements ToBeSubmitDetailStrate
         basic.put("receiveOrgCreditCode1", notice.get("receiveCompanyCode"));
         basic.put("businessScenarios", "0");
         basic.put("code", notice.get("EQU_LIST_CODE"));
-        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
+        notice.put("EQU_CATEGORY_CODE", notice.get("equCategory"));
+        basic.put("equCategory", notice.get("equCategory"));
+        basic.put("isTempEquip", true);
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", notice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationTransferStrategyHandler.java

@@ -44,10 +44,11 @@ public class RegistrationTransferStrategyHandler implements ToBeSubmitDetailStra
 
             IdxBizJgRegisterInfo jgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
             if (jgRegisterInfo != null) {
-                basic.put("code", jgRegisterInfo.getEquList());
-                basic.put("equCategory", jgRegisterInfo.getEquCategory());
+                changeTransfer.put("EQU_LIST_CODE", jgRegisterInfo.getEquList());
+                changeTransfer.put("EQU_CATEGORY_CODE", jgRegisterInfo.getEquCategory());
             }
         }
+        basic.put("isTempEquip", true);
         basic.put("receiveOrgCreditCode1", changeTransfer.get("receiveCompanyCode"));
 
         Map<String, Map<String, Object>> result = 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/handler/toBeSubmit/TransferNoticeStrategyHandler.java

@@ -26,6 +26,7 @@ public class TransferNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         basic.put("receiveOrgCreditCode", transferInfo.get("receiveOrgCode"));
         basic.put("code", transferInfo.get("EQU_LIST_CODE"));
         basic.put("equCategory", transferInfo.get("EQU_CATEGORY_CODE"));
+        basic.put("isTempEquip", true);
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", transferInfo);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/UseRegistrationStrategyHandler.java

@@ -27,6 +27,7 @@ public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy
         basic.put("receiveOrgCreditCode1", notice.get("receiveOrgCode"));
         basic.put("code", notice.get("EQU_LIST_CODE"));
         basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
+        basic.put("isTempEquip", true);
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", notice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

@@ -31,6 +31,7 @@ public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrat
         basic.put("businessScenarios", "1");
         basic.put("code", "2300");
         basic.put("equCategory", "23T0");
+        basic.put("isTempEquip", true);
         Map<String, Map<String, Object>> result = new HashMap<>();
         useRegFormUpload.put("useRegistrationFormUrl", vo.getUseRegistrationFormUrl());
         result.put("notice", Bean.BeantoMap(vo));

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

@@ -2052,7 +2052,6 @@ public class DataDockServiceImpl {
             useInfo.setProjectContraption(paramsDto.getProjectContraption());
             useInfo.setUseDate(paramsDto.getUseDate());
             useInfo.setProjectContraptionId(paramsDto.getProjectContraptionSeq());
-            BeanUtils.copyProperties(paramsDto, useInfo);
             useInfoList.add(useInfo);
 
             // 检验检测信息