Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -82,4 +83,7 @@ public class JgEnableDisableDto extends BaseDto {
 
     @ApiModelProperty(value = "工作流下一节点任务id")
     private String nextTaskId;
+
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
 }

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

@@ -161,4 +161,10 @@ public class JgEnableDisable extends BaseEntity {
 
     @TableField(exist = false)
     private String address;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

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

@@ -112,7 +112,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
 
         WorkflowResultDto workflowResultDto = new WorkflowResultDto();
         List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
-
+        jgEnableDisable.setOtherAccessories(JSONObject.toJSONString(Optional.ofNullable(map.get("otherAccessories")).orElse(Collections.emptyMap())));
         jgEnableDisable.setEquList("null".equals(record) ? "null" : String.valueOf(map.get("equListDesc")));
         jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : String.valueOf(map.get("supervisoryCode")));
 
@@ -682,6 +682,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             resultMap.putAll(beanMap);
         }
         resultMap.put("receiveOrgCode", enableDisable.getReceiveCompanyCode() + '_' + enableDisable.getReceiveOrgName());
+        commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
         return resultMap;
     }