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,6 @@ 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 +56,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, JSObject> model, ReginParams reginParams);
+    void saveNotice(String submitType, Map<String, Object> 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/JgReformNoticeController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 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.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;
@@ -46,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, JSObject> model) {
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, JSONObject> 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/JgReformNoticeServiceImpl.java

@@ -348,9 +348,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Override
     @SuppressWarnings ({"Duplicates", "rawtypes"})
     @Transactional (rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, JSObject> JgReformNoticeDtoMap, ReginParams reginParams) {
+    public void saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
         String[] taskName = new String[]{"流程结束"};
-
         JgReformNoticeDto model = JSON.parseObject(JgReformNoticeDtoMap.get(TABLE_PAGE_ID).toString(), JgReformNoticeDto.class);
 
         // 字段转换