fix(jg):设备移交,改造告知保存接口参数修改

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
-
+import jdk.nashorn.api.scripting.JSObject;
 import java.util.Map;
 
 /**
@@ -57,7 +57,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, JgReformNoticeDto> model, ReginParams reginParams);
+    void saveNotice(String submitType, Map<String, JSObject> model, ReginParams reginParams);
 
     /**
      * 打印告知单

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jg.api.common.BaseException;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -45,8 +46,8 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
-    public ResponseModel<Object> save(@RequestParam("submitType") String submitType, @RequestBody JgEquipTransferDto model) {
-        jgEquipTransferServiceImpl.saveOrUpdateModel(submitType, model, getSelectedOrgInfo());
+    public ResponseModel<String> save(@RequestParam("submitType") String submitType, @RequestBody JSONObject model) {
+        jgEquipTransferServiceImpl.saveTransfer(submitType, model, getSelectedOrgInfo());
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -3,27 +3,22 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import io.swagger.annotations.ApiParam;
+import jdk.nashorn.api.scripting.JSObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -51,7 +46,7 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/save")
     @ApiOperation (httpMethod = "POST", value = "新增改造告知", notes = "新增改造告知")
-    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, JgReformNoticeDto> model) {
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, JSObject> model) {
         ReginParams reginParams = getSelectedOrgInfo();
 
         jgReformNoticeService.saveNotice(submitType, model, reginParams);

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

@@ -71,8 +71,10 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     TzsServiceFeignClient tzsServiceFeignClient;
 
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
-    public void saveOrUpdateModel(String submitType, JgEquipTransferDto model, ReginParams reginParams) {
+    public void saveTransfer(String submitType, JSONObject jsonObjectMap, ReginParams reginParams) {
         String[] taskName = new String[]{"流程结束"};
+        JgEquipTransferDto model = BeanUtil.toBeanIgnoreError(jsonObjectMap.get("model"), JgEquipTransferDto.class);
+
         // 字段转换
         convertField(model);
         // 获取告知设备列表

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

@@ -4,13 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
@@ -26,32 +23,25 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import jdk.nashorn.api.scripting.JSObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
@@ -358,10 +348,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Override
     @SuppressWarnings ({"Duplicates", "rawtypes"})
     @Transactional (rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, JgReformNoticeDto> JgReformNoticeDtoMap, ReginParams reginParams) {
+    public void saveNotice(String submitType, Map<String, JSObject> JgReformNoticeDtoMap, ReginParams reginParams) {
         String[] taskName = new String[]{"流程结束"};
 
-        JgReformNoticeDto model = JgReformNoticeDtoMap.get(TABLE_PAGE_ID);
+        JgReformNoticeDto model = JSON.parseObject(JgReformNoticeDtoMap.get(TABLE_PAGE_ID).toString(), JgReformNoticeDto.class);
+
         // 字段转换
         convertField(model);