fix：[试验管理][填报表单]

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

@@ -264,7 +264,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             studyFormApplyOld.setBdnr(studyFormApply.getBdnr());
             studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             this.updateById(studyFormApplyOld);
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormApplyOld, studyFormApply);
+            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormApplyOld, studyFormApply);
             if (fieldChanges.size() == 0) {
                 //稽查轨迹
                 List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();

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
         if (id == null || id.longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
-        return baseMapper.queryInfo(id);
+        StudyFormFill studyFormFill=baseMapper.queryInfo(id);
+        return studyFormFill;
     }
 
     /**
@@ -273,7 +276,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             this.updateById(studyFormFillOld);
             result = studyFormFillOld;
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill);
+            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormFillOld, studyFormFill);
             if (fieldChanges.size() > 0) {
                 //稽查轨迹
                 List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
@@ -326,7 +329,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             }
             studyFormFillOld.setSftb(NormalEnum.yes.getValue());
             this.updateById(studyFormFillOld);
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill);
+            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormFillOld, studyFormFill);
             if (fieldChanges.size() > 0) {
                 //稽查轨迹
                 List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
@@ -548,6 +551,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     @Override
     public void updateBdnr(StudyFormFillUpdateForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
         StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
         studyFormFillOld.setBdnr(form.getBdnr());
@@ -558,18 +562,32 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹 todo
         JSONObject jsonObject=JSONObject.parseObject(form.getFiledValue());
         Map<String, String> formData = new LinkedHashMap<>();
+        Map<String, String> formDataEn = new LinkedHashMap<>();
+        List<StudyFormFillJcgj> 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
      */
     @Override
     public void updateFhyjjl(StudyFormFillUpdateForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
         // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
         //更新复核意见 todo
@@ -585,17 +604,28 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         studyFormFillOld.setFhyjjl(form.getFhyjjl());
         this.updateById(studyFormFillOld);
         Map<String, String> formData = new LinkedHashMap<>();
+        Map<String, String> formDataEn = new LinkedHashMap<>();
+        List<StudyFormFillJcgj> 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
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
+
+
 }

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

@@ -146,7 +146,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
             studyFormPlanOld.setBdzt(StudyFormPlanBdztEnum.tbz.getValue());
             this.updateById(studyFormPlanOld);
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormPlanOld, studyFormPlan);
+            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormPlanOld, studyFormPlan);
             if (fieldChanges.size() == 0) {
                 //稽查轨迹
                 List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();

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

@@ -124,7 +124,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             studyFormPreOld.setTemplateId(studyFormPre.getTemplateId());
             studyFormPreOld.setBdnr(studyFormPre.getBdnr());
             this.updateById(studyFormPreOld);
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormPreOld, studyFormPre);
+            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormPreOld, studyFormPre);
             if (fieldChanges.size() == 0) {
                 //稽查轨迹
                 List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();