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

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -89,10 +89,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     JgFeignClient jgFeignClient;
 
 
-    public JyjcInspectionApplicationModel save(@RequestBody JyjcInspectionApplicationModel model) {
+    public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
 
         //开启报检流程工作流
 
+        JyjcInspectionApplicationModel model = JSONObject.parseObject(JSON.toJSONString(obj), JyjcInspectionApplicationModel.class);
         if (CharSequenceUtil.isNotEmpty(model.getProcessInstanceId()) && model.getOperationType().equals("0")){
             model.setOperationType("2");
         }
@@ -152,15 +153,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
 
-            Map<String, Object> map = BeanUtil.beanToMap(model);
+    //        Map<String, Object> map = BeanUtil.beanToMap(model);
             // 附件保存
             List<String> enumNameList = DocumentEnum.getEnumNameList();
             List<JyjcInspectionApplicationAttachmentModel> attachmentModels = new ArrayList<>();
             for (String code : enumNameList) {
-                if (map.containsKey(code)) {
+                if (obj.containsKey(code)) {
                     JyjcInspectionApplicationAttachment attachments = new JyjcInspectionApplicationAttachment();
                     attachments.setAttachmentType(code);
-                    attachments.setAttachmentUrl(JSONObject.toJSONString(map.get(code)));
+                    attachments.setAttachmentUrl(JSONObject.toJSONString(obj.get(code)));
                     attachments.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }
@@ -190,17 +191,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
 
-            Map<String, Object> map = BeanUtil.beanToMap(model);
+        //    Map<String, Object> map = BeanUtil.beanToMap(model);
             // 附件更新
             List<String> enumNameList = DocumentEnum.getEnumNameList();
             List<JyjcInspectionApplicationAttachmentModel> attachmentModels = new ArrayList<>();
 
             jyjcInspectionApplicationAttachmentService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             for (String code : enumNameList) {
-                if (map.containsKey(code)) {
+                if (obj.containsKey(code)) {
                     JyjcInspectionApplicationAttachment attachments = new JyjcInspectionApplicationAttachment();
                     attachments.setAttachmentType(code);
-                    attachments.setAttachmentUrl(JSONObject.toJSONString(map.get(code)));
+                    attachments.setAttachmentUrl(JSONObject.toJSONString(obj.get(code)));
                     attachments.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }