fix:[填报表单]优化

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

@@ -411,6 +411,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             if (fieldChanges.size() > 0) {
                 //稽查轨迹
                 List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
+                List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
                 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
                     studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark()));
                 }
@@ -479,7 +480,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("生长情况", form.getQmyy());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
 
@@ -512,7 +513,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         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);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
         //发送通知
@@ -621,7 +622,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(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
         //发送通知