优化：移装变更记录新增成功后返回信息中添加设备信息

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java

@@ -127,4 +127,14 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
 
     @ApiModelProperty(value = "设备移装完整详细地址")
     private String fullAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String allAddress;
+
+    @ApiModelProperty(value = " 单位内部编号")
+    private String innerCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -21,9 +21,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

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

@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
 
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
         if (ValidationUtil.isEmpty(tableData)) {
@@ -366,7 +366,16 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
-        return  Collections.singletonList(oldTransfer);
+
+        JgChangeRegistrationTransferDto resultDto = new JgChangeRegistrationTransferDto();
+        Bean.copyExistPropertis(oldTransfer,resultDto);
+        //组装返回信息，添加设备信息的展示
+        resultDto.setEquCategory((String) tableData.get("equCategoryDesc"));
+        resultDto.setProductName((String) tableData.get("productName"));
+        resultDto.setAllAddress(oldTransfer.getFullAddress());
+        resultDto.setEquCode((String) tableData.get("equCode"));
+        resultDto.setInnerCode((String) tableData.get("useInnerCode"));
+        return  Collections.singletonList(resultDto);
     }
 
     /**
@@ -375,7 +384,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         return this.createTransfer(submitType, map, reginParams);
     }
 
@@ -1140,7 +1149,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), transfer.getSupervisoryCode(), transfer.getApplyNo());
+        return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), Optional.ofNullable(transfer.getSupervisoryCode()).orElse("无"), Optional.ofNullable(transfer.getApplyNo()).orElse("无"));
     }
 
     public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {