From d0fe62166411f4772a2a8a47c0b32bc6bda3cfa5 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 18:13:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StudyFormApplyServiceImpl.java | 2 +- .../service/impl/StudyFormFillServiceImpl.java | 58 +++++++++++++++++----- .../service/impl/StudyFormPlanServiceImpl.java | 2 +- .../service/impl/StudyFormPreServiceImpl.java | 2 +- 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java index 8ddbdde..1d65a43 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java @@ -264,7 +264,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormApplyOld, studyFormApply); + List fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormApplyOld, studyFormApply); if (fieldChanges.size() == 0) { //稽查轨迹 List studyFormApplyJcgjs = new ArrayList<>(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index a667dca..7816a9c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -2,6 +2,7 @@ package com.hxhq.business.service.impl; import java.util.*; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -21,6 +22,7 @@ import com.hxhq.business.form.study.StudyFormFillSearchForm; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -110,7 +112,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill); + List fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormFillOld, studyFormFill); if (fieldChanges.size() > 0) { //稽查轨迹 List studyFormFillJcgjs = new ArrayList<>(); @@ -326,7 +329,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill); + List fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormFillOld, studyFormFill); if (fieldChanges.size() > 0) { //稽查轨迹 List studyFormFillJcgjs = new ArrayList<>(); @@ -548,6 +551,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormFillJcgjs = new ArrayList<>(); if(StringUtils.isNoneBlank(jsonObject.getString("oldValue"))){ - formData.put("字段名", jsonObject.getString("field")); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("原值", jsonObject.getString("oldValue")); formData.put("新值", jsonObject.getString("value")); - formData.put("原因", "todo"); - studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "修改记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null,jsonObject.getDate("time")); + formData.put("原因", jsonObject.getString("reason")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("原值", jsonObject.getString("oldValue")); + formDataEn.put("新值", jsonObject.getString("value")); + formDataEn.put("原因", jsonObject.getString("reason")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); }else{ - formData.put("字段名", jsonObject.getString("field")); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", qmr.getNickName()); + //en + formData.put("字段名", jsonObject.getString("fieldEn")); formData.put("填入值", jsonObject.getString("value")); - formData.put("填写人", SecurityUtils.getNickName()); - studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), formData, null ,null,jsonObject.getDate("time")); + formData.put("填写人", qmr.getNickName()); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); } + studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } /** @@ -577,6 +595,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormFillJcgjs = new ArrayList<>(); if(StringUtils.isNoneBlank(form.getContent())){ JSONObject jsonObject=JSONObject.parseObject(form.getContent()); - formData.put("字段名", jsonObject.getString("field")); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("意见回复", jsonObject.getString("content")); - studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,jsonObject.getDate("time")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("意见回复", jsonObject.getString("content")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); }else{ JSONObject jsonObject=JSONObject.parseObject(form.getReplay()); - formData.put("字段名", jsonObject.getString("field")); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("复核意见", jsonObject.getString("content")); - studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,jsonObject.getDate("time")); + //en + formData.put("字段名", jsonObject.getString("fieldEn")); + formData.put("复核意见", jsonObject.getString("content")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); } + studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } /** @@ -610,4 +640,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormPlanOld, studyFormPlan); + List fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormPlanOld, studyFormPlan); if (fieldChanges.size() == 0) { //稽查轨迹 List studyFormPlanJcgjs = new ArrayList<>(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java index 87344c4..a04d8fb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java @@ -124,7 +124,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormPreOld, studyFormPre); + List fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormPreOld, studyFormPre); if (fieldChanges.size() == 0) { //稽查轨迹 List studyFormPreJcgjs = new ArrayList<>();