From c927b5f28ed677ec9d8cff696d8429d4d7eeaf6a Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 5 Mar 2026 08:43:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IStudyFormApplyJcgjService.java | 6 +- .../service/IStudyFormApplyQmxxService.java | 4 +- .../service/IStudyFormFillJcgjService.java | 4 +- .../service/IStudyFormFillQmxxService.java | 4 +- .../service/IStudyFormPlanJcgjService.java | 6 +- .../service/IStudyFormPlanQmxxService.java | 4 +- .../business/service/IStudyFormPreJcgjService.java | 6 +- .../business/service/IStudyFormPreQmxxService.java | 4 +- .../impl/StudyFormApplyJcgjServiceImpl.java | 12 ++- .../impl/StudyFormApplyQmxxServiceImpl.java | 4 +- .../service/impl/StudyFormApplyServiceImpl.java | 71 ++++++++++-------- .../service/impl/StudyFormFillJcgjServiceImpl.java | 12 ++- .../service/impl/StudyFormFillQmxxServiceImpl.java | 4 +- .../service/impl/StudyFormFillServiceImpl.java | 85 +++++++++++++--------- .../service/impl/StudyFormPlanJcgjServiceImpl.java | 10 ++- .../service/impl/StudyFormPlanQmxxServiceImpl.java | 4 +- .../service/impl/StudyFormPlanServiceImpl.java | 42 ++++++----- .../service/impl/StudyFormPreJcgjServiceImpl.java | 10 ++- .../service/impl/StudyFormPreQmxxServiceImpl.java | 4 +- .../service/impl/StudyFormPreServiceImpl.java | 52 +++++++------ 20 files changed, 222 insertions(+), 126 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java index 01005bf..a9a75bf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java @@ -51,6 +51,7 @@ public interface IStudyFormApplyJcgjService extends IService /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormApply 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -60,10 +61,11 @@ public interface IStudyFormApplyJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply,Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply,Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormApply 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -74,6 +76,6 @@ public interface IStudyFormApplyJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); + public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java index 097af80..ab9b46b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java @@ -1,5 +1,6 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; import com.hxhq.business.domain.StudyFormApplyQmxx; import com.baomidou.mybatisplus.extension.service.IService; @@ -25,10 +26,11 @@ public interface IStudyFormApplyQmxxService extends IService /** * 新增签名信息 + * @param time * @param formId * @param qmyy * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); + public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java index 6f0fa34..4989887 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java @@ -57,7 +57,7 @@ public interface IStudyFormFillJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); /** * 新增稽查轨迹 @@ -71,6 +71,6 @@ public interface IStudyFormFillJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); + public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java index 10e2f12..bb6407b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java @@ -1,5 +1,6 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; import com.hxhq.business.domain.StudyFormFillQmxx; import com.baomidou.mybatisplus.extension.service.IService; @@ -25,10 +26,11 @@ public interface IStudyFormFillQmxxService extends IService /** * 新增签名信息 + * @param time * @param formId * @param qmyy * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); + public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java index fed0cd5..898a45c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java @@ -48,6 +48,7 @@ public interface IStudyFormPlanJcgjService extends IService /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormPlan 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -57,10 +58,11 @@ public interface IStudyFormPlanJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormPlan 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -71,7 +73,7 @@ public interface IStudyFormPlanJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); + public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java index b6c05bd..8e8f057 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java @@ -1,5 +1,6 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; import com.hxhq.business.domain.StudyFormFillQmxx; @@ -26,10 +27,11 @@ public interface IStudyFormPlanQmxxService extends IService /** * 新增签名信息 + * @param time * @param formId * @param qmyy * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); + public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java index e1e0456..987d4e3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java @@ -47,6 +47,7 @@ public interface IStudyFormPreJcgjService extends IService /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormPre 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -56,10 +57,11 @@ public interface IStudyFormPreJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); /** * 新增稽查轨迹 + * @param time 时间 * @param studyFormPre 表单 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 @@ -70,7 +72,7 @@ public interface IStudyFormPreJcgjService extends IService * @param remark 备注 * @return */ - public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); + public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java index d622766..fc49655 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java @@ -1,5 +1,6 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; import com.hxhq.business.domain.StudyFormPreQmxx; import com.baomidou.mybatisplus.extension.service.IService; @@ -23,11 +24,12 @@ public interface IStudyFormPreQmxxService extends IService /** * 新增签名信息 + * @param time * @param formId * @param qmyy * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); + public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java index 88cc56d..0024e6e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java @@ -114,6 +114,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark){ + public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); formJcgj.setFormId(studyFormApply.getId()); formJcgj.setFormBh(studyFormApply.getBdbh()); @@ -140,12 +141,16 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl studyFormApplyJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApply, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark())); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApply, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark())); } studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs); } @@ -309,11 +314,11 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); result = studyFormApply; } //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark()); return baseMapper.queryInfo(result.getId()); } @@ -363,6 +368,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark()); } @@ -390,6 +396,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark()); //发送通知 Study study = studyService.getById(studyFormApplyOld.getStudyId()); String url = getUrlQz(study, "sqbd"); @@ -426,6 +433,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark()); //发送通知 Study study = studyService.getById(studyFormApplyOld.getStudyId()); String url = getUrlQz(study, "sqbd"); @@ -461,6 +469,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), now); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark()); //发送通知 Study study = studyService.getById(studyFormApplyOld.getStudyId()); String url = getUrlQz(study, "sqbd"); @@ -497,6 +506,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), now); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark()); //发送通知 Study study = studyService.getById(studyFormApplyOld.getStudyId()); String url = getUrlQz(study, "sqbd"); @@ -576,6 +587,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark){ + public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); formJcgj.setFormId(studyFormFill.getId()); formJcgj.setFormBh(studyFormFill.getBdbh()); @@ -148,12 +149,16 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", qmr, form.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止通过", qmr, form.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -324,9 +327,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -362,6 +365,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); @@ -432,11 +437,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); } return baseMapper.queryInfo(result.getId()); } @@ -448,6 +453,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl0){ studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjList); @@ -600,6 +607,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl studyFormFillJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark())); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark())); } studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs); } //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); @@ -649,10 +657,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); } //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark()); } @@ -700,6 +708,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("生长情况", form.getQmyy()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark()); } @@ -730,6 +739,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -767,6 +777,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -805,6 +816,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -842,6 +854,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark()); //发送通知 Study study = studyService.getById(studyFormFillOld.getStudyId()); String url = getUrlQz(study, "tbbd"); @@ -886,6 +899,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark){ + public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); formJcgj.setFormId(studyFormPlan.getId()); formJcgj.setFormBh(studyFormPlan.getBdbh()); @@ -140,6 +140,9 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl studyFormPlanJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark())); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark())); } studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs); } @@ -181,11 +183,11 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); result = studyFormPlan; } //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark()); return baseMapper.queryInfo(result.getId()); } @@ -234,6 +236,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark()); } @@ -268,6 +271,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark()); //发送通知 Study study = studyService.getById(studyFormPlanOld.getStudyId()); String url = getUrlQz(study, "syxx"); @@ -304,6 +308,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark()); //发送通知 Study study = studyService.getById(studyFormPlanOld.getStudyId()); String url = getUrlQz(study, "syxx"); @@ -340,6 +345,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark){ + public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); formJcgj.setFormId(studyFormPre.getId()); formJcgj.setFormBh(studyFormPre.getBdbh()); @@ -141,6 +141,9 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl studyFormPreJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark())); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark())); } studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs); } @@ -160,11 +161,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, now); result = studyFormPre; } //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark()); return baseMapper.queryInfo(result.getId()); } @@ -209,6 +210,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark()); //发送通知 Study study = studyService.getById(studyFormPre.getStudyId()); String url = getUrlQz(study, "ytbd"); @@ -269,6 +271,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", qmr, form.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核通过", qmr, form.getRemark()); } /** @@ -328,6 +331,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark()); //发送通知 Study study = studyService.getById(studyFormPreOld.getStudyId()); String url = getUrlQz(study, "ytbd"); @@ -360,6 +364,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark()); + studyFormFillQmxxService.saveQmxx(now,studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark()); //发送通知 Study study = studyService.getById(studyFormPreOld.getStudyId()); String url = getUrlQz(study, "ytbd"); @@ -439,6 +445,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark()); //发送通知 Study study = studyService.getById(studyFormPreOld.getStudyId()); String url = getUrlQz(study, "ytbd"); @@ -474,6 +481,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, now); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark()); + studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark()); //发送通知 Study study = studyService.getById(studyFormPreOld.getStudyId()); String url = getUrlQz(study, "ytbd"); @@ -520,6 +528,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl