fix:[表单]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java

@@ -309,7 +309,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormApply.getRemark());
-            studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
+            studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormApply;
         }
         //签名信息
@@ -373,7 +373,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         studyFormApply.setTjsj(new Date());
         this.saveOrUpdate(studyFormApply);
         //稽查轨迹
-        studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", studyFormApply.getRemark());
+        studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark());
     }
@@ -402,7 +404,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.yfh.getValue());
         this.updateById(studyFormApplyOld);
         //稽查轨迹
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", studyFormApply.getRemark());
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark());
         //发送通知

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -306,7 +306,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //签名信息
             studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
             //稽查轨迹
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", studyFormFill.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -318,7 +320,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //签名信息
             studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
             //稽查轨迹
-            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", studyFormFill.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         }
         return baseMapper.queryInfo(result.getId());
     }
@@ -413,7 +417,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
             }
             //稽查轨迹
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", studyFormFill.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -425,7 +431,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //生成物资
             genResource(studyFormFill, studyFormFill.getRemark());
             //稽查轨迹
-            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", studyFormFill.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         }
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
@@ -502,7 +510,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         studyFormFillOld.setBdnr(studyFormFill.getBdnr());
         this.updateById(studyFormFillOld);
         //稽查轨迹
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
         //发送通知
@@ -539,7 +549,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
 
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java

@@ -181,7 +181,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormPlan.getRemark());
-            studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
+            studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormPlan;
         }
         //签名信息
@@ -253,7 +253,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
     }
@@ -282,7 +282,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         studyFormPlanOld.setBdzt(StudyFormPlanBdztEnum.ywcfh.getValue());
         this.updateById(studyFormPlanOld);
         //稽查轨迹
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", studyFormPlan.getRemark());
+        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
         //发送通知

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

@@ -158,7 +158,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             studyFormPre.setBdzt(StudyFormPreBdztEnum.tbz.getValue());
             this.save(studyFormPre);
             //稽查轨迹
-            studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(), null);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", studyFormPre.getRemark());
+            studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormPre;
         }
         //签名信息
@@ -233,7 +235,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPre.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(), null);
+        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
         //发送通知
@@ -296,7 +298,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         studyFormPreOld.setSjshryMcEn(qmr.getUserName());
         this.updateById(studyFormPreOld);
         //稽查轨迹
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(), null);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
     }