fix:[表单管理]优化

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

@@ -68,8 +68,8 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
     public void saveBatchWithLog( List<StudyFormApplyJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (StudyFormApplyJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
-                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+            systemLogService.saveInfoWithData(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(),jcgj.getCreateTime());
         }
     }
 
@@ -107,8 +107,8 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
-        systemLogService.saveInfo(studyFormApply.getBdbh(), studyFormApply.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
-                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
+        systemLogService.saveInfoWithData(studyFormApply.getBdbh(), studyFormApply.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark(),time);
     }
 
 
@@ -136,7 +136,8 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
             formJcgj.setJcnr(JctUtil.formatStr(jcnr));
             formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr));
         }
-        if(qmr!=null) {
+        String excludeStr="填写";
+        if(qmr!=null&&!jcmc.equals(excludeStr)) {
             formJcgj.setQmrId(qmr.getUserId());
             formJcgj.setQmrMc(qmr.getNickName());
             formJcgj.setQmrMcEn(qmr.getUserName());

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

@@ -587,7 +587,6 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
      */
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         JSONObject bdnr = JSONObject.parseObject(form.getBdnr());
         if(StringUtils.isNoneBlank(form.getZdxgjl())) {
@@ -615,7 +614,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
                     formDataEn.put("原值", jsonObject.getString("oldValue"));
                     formDataEn.put("新值", jsonObject.getString("value"));
                     formDataEn.put("原因", jsonObject.getString("reason"));
-                    studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+                    studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"),studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 } else {
                     //zh
                     formData.put("字段名", jsonObject.getString("fieldCn"));
@@ -625,7 +624,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
                     formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                     formDataEn.put("填入值", jsonObject.getString("value"));
                     formDataEn.put("填写人", qmr.getNickName());
-                    studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                    studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"),studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 }
             }
             studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
@@ -637,7 +636,6 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
      */
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新复核意见
         baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@@ -653,7 +651,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("复核意见", jsonObject.getString("content"));
-            studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"),studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         } else if (StringUtils.isNoneBlank(form.getReply())){
             JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
             //zh
@@ -662,7 +660,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("意见回复", jsonObject.getString("reply"));
-            studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"),studyFormApplyOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         }
         studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
     }

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

@@ -74,8 +74,8 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
     public void saveBatchWithLog( List<StudyFormFillJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (StudyFormFillJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
-                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+            systemLogService.saveInfoWithData(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(),jcgj.getCreateTime());
         }
     }
 
@@ -104,7 +104,8 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
             formJcgj.setJcnr(JctUtil.formatStr(jcnr));
             formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr));
         }
-        if(qmr!=null){
+        String excludeStr="填写";
+        if(qmr!=null&&!jcmc.equals(excludeStr)) {
             formJcgj.setQmrId(qmr.getUserId());
             formJcgj.setQmrMc(qmr.getNickName());
             formJcgj.setQmrMcEn(qmr.getUserName());
@@ -115,8 +116,8 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
         formJcgj.setRemark(remark);
         this.save(formJcgj);
 
-        systemLogService.saveInfo(studyFormFill.getBdbh(), studyFormFill.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
-                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
+        systemLogService.saveInfoWithData(studyFormFill.getBdbh(), studyFormFill.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark(),time);
     }
 
 

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

@@ -899,7 +899,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         if(StringUtils.isNoneBlank(form.getZdxgjl())){
             baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
@@ -926,7 +925,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                     formDataEn.put("原值", jsonObject.getString("oldValue"));
                     formDataEn.put("新值", jsonObject.getString("value"));
                     formDataEn.put("原因", jsonObject.getString("reason"));
-                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 } else {
                     //zh
                     formData.put("字段名", jsonObject.getString("fieldCn"));
@@ -936,7 +935,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                     formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                     formDataEn.put("填入值", jsonObject.getString("value"));
                     formDataEn.put("填写人", qmr.getNickName());
-                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 }
 
             }
@@ -949,7 +948,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新复核意见
         baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@@ -965,7 +963,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("复核意见", jsonObject.getString("content"));
-            studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         } else if (StringUtils.isNoneBlank(form.getReply())) {
             JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
             //zh
@@ -974,7 +972,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("意见回复", jsonObject.getString("reply"));
-            studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         }
         studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
     }

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

@@ -69,8 +69,8 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
     public void saveBatchWithLog( List<StudyFormPlanJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (StudyFormPlanJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
-                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+            systemLogService.saveInfoWithData(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), jcgj.getCreateTime());
         }
     }
 
@@ -108,8 +108,8 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
-        systemLogService.saveInfo(studyFormPlan.getBdbh(), studyFormPlan.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
-                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
+        systemLogService.saveInfoWithData(studyFormPlan.getBdbh(), studyFormPlan.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark(),time);
     }
 
 
@@ -135,7 +135,8 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
             formJcgj.setJcnr(JctUtil.formatStr(jcnr));
             formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr));
         }
-        if(qmr!=null) {
+        String excludeStr="填写";
+        if(qmr!=null&&!jcmc.equals(excludeStr)) {
             formJcgj.setQmrId(qmr.getUserId());
             formJcgj.setQmrMc(qmr.getNickName());
             formJcgj.setQmrMcEn(qmr.getUserName());

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

@@ -389,7 +389,6 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
      */
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
         if(StringUtils.isNoneBlank(form.getZdxgjl())){
@@ -417,7 +416,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
                     formDataEn.put("原值", jsonObject.getString("oldValue"));
                     formDataEn.put("新值", jsonObject.getString("value"));
                     formDataEn.put("原因", jsonObject.getString("reason"));
-                    studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+                    studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 } else {
                     //zh
                     formData.put("字段名", jsonObject.getString("fieldCn"));
@@ -427,7 +426,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
                     formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                     formDataEn.put("填入值", jsonObject.getString("value"));
                     formDataEn.put("填写人", qmr.getNickName());
-                    studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                    studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 }
             }
             studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
@@ -440,7 +439,6 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
      */
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新复核意见
         baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@@ -456,7 +454,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("复核意见", jsonObject.getString("content"));
-            studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         } else if (StringUtils.isNoneBlank(form.getReply())){
             JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
             //zh
@@ -465,7 +463,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("意见回复", jsonObject.getString("reply"));
-            studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         }
         studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
     }

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

@@ -69,8 +69,8 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
     public void saveBatchWithLog( List<StudyFormPreJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (StudyFormPreJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
-                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+            systemLogService.saveInfoWithData(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(),jcgj.getCreateTime());
         }
     }
 
@@ -108,8 +108,8 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
-        systemLogService.saveInfo(studyFormPre.getBdbh(), studyFormPre.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
-                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
+        systemLogService.saveInfoWithData(studyFormPre.getBdbh(), studyFormPre.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark(),time);
     }
 
 
@@ -170,7 +170,8 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
         formJcgj.setJcmcys(jcmcys);
         formJcgj.setJcnr(jcnr);
         formJcgj.setJcnrEn(jcnrEn);
-        if(qmr!=null) {
+        String excludeStr="填写";
+        if(qmr!=null&&!jcmc.equals(excludeStr)) {
             formJcgj.setQmrId(qmr.getUserId());
             formJcgj.setQmrMc(qmr.getNickName());
             formJcgj.setQmrMcEn(qmr.getUserName());

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

@@ -528,7 +528,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl
      */
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
         if(StringUtils.isNoneBlank(form.getZdxgjl())){
@@ -557,7 +556,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
                     formDataEn.put("原值", jsonObject.getString("oldValue"));
                     formDataEn.put("新值", jsonObject.getString("value"));
                     formDataEn.put("原因", jsonObject.getString("reason"));
-                    studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+                    studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 } else {
                     //zh
                     formData.put("字段名", jsonObject.getString("fieldCn"));
@@ -567,7 +566,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
                     formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                     formDataEn.put("填入值", jsonObject.getString("value"));
                     formDataEn.put("填写人", qmr.getNickName());
-                    studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                    studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                 }
             }
             studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
@@ -580,7 +579,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl
      */
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
-        Date now =new Date();
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新复核意见
         baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@@ -596,7 +594,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("复核意见", jsonObject.getString("content"));
-            studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         } else if (StringUtils.isNoneBlank(form.getReply())) {
             JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
             //zh
@@ -605,7 +603,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             //en
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("意见回复", jsonObject.getString("reply"));
-            studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
+            studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
         }
         studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
     }