fix(JG)：设备移交详情Bug修改

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

@@ -336,4 +336,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
+
+    /**
+     * 地址
+     */
+    @TableField(exist = false)
+    private String fullAddress;
 }

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

@@ -96,14 +96,15 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
             JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
             transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            transfer.setEquList(String.valueOf(obj.get("EQU_LIST")));
-            transfer.setEquDefine(String.valueOf(obj.get("EQU_DEFINE")));
-            transfer.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            transfer.setProductName(String.valueOf(obj.get("PRODUCT_NAME")));
-            transfer.setUseRegistCode(String.valueOf(obj.get("USE_ORG_CODE")));
-            transfer.setUseInnerCode(String.valueOf(obj.get("USE_INNER_CODE")));
-            transfer.setEquAddress(String.valueOf(obj.get("ADDRESS")));
-            transfer.setEquCode(String.valueOf(obj.get("EQU_CODE")));
+            transfer.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"),""));
+            transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
+            transfer.setUseInnerCode(Objects.toString(obj.get("USE_INNER_CODE"),""));
+            transfer.setEquAddress(Objects.toString(obj.get("ADDRESS"),""));
+            transfer.setEquCode(Objects.toString(obj.get("EQU_CODE"),""));
             transferList.add(transfer);
             equipTransferEqList.add(jgEquipTransferEq);
         });

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

@@ -420,10 +420,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            dto.setEquListCode(String.valueOf(obj.get("EQU_DEFINE")));
-            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            dto.setEquListCode(Objects.toString(obj.get("EQU_DEFINE"),""));
+            dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"),""));
+            dto.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            dto.setFullAddress(Objects.toString(obj.get("ADDRESS"),""));
 
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 WorkflowResultDto workflowResult = workflowResultList.get(i);