From 81562661d0667222b3d4697950b31f99337a6ce7 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 14 Jan 2026 21:46:56 +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]=E8=90=BD?=
 =?UTF-8?q?=E7=AC=94=E7=95=99=E7=97=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudyFormFillServiceImpl.java         | 18 ++++++++++++++----
 .../business/service/impl/StudyFormPreServiceImpl.java | 13 ++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

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 c83b5af..2254d20 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
@@ -549,10 +549,14 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     @Override
     public void updateBdnr(StudyFormFillUpdateForm form) {
         //更新表单内容
-        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
+        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
+        studyFormFillOld.setBdnr(form.getBdnr());
+        studyFormFillOld.setZdxgjl(form.getZdxgjl());
+        this.updateById(studyFormFillOld);
+//        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
         // {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]}
         //稽查轨迹
-        JSONObject jsonObject=JSONObject.parseObject(form.getZdxgjl());
+        JSONObject jsonObject=JSONObject.parseObject(form.getFiledValue());
         Map<String, String> formData = new LinkedHashMap<>();
         if(StringUtils.isNoneBlank(jsonObject.getString("oldValue"))){
             formData.put("字段名", jsonObject.getString("field"));
@@ -576,7 +580,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         // {"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"}]}
         //更新复核意见
-        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+//        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
+        studyFormFillOld.setFhyjjl(form.getFhyjjl());
+        this.updateById(studyFormFillOld);
         Map<String, String> formData = new LinkedHashMap<>();
         if(StringUtils.isNoneBlank(form.getContent())){
             JSONObject jsonObject=JSONObject.parseObject(form.getContent());
@@ -597,7 +604,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     @Override
     public void updateZdgxjl(StudyFormFillUpdateForm form) {
         //更新勾选记录
-        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
+        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
+        studyFormFillOld.setZdgxjl(form.getZdgxjl());
+        this.updateById(studyFormFillOld);
+//        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
 }
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 48813e0..d4dc560 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
@@ -264,8 +264,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
      */
     @Override
     public StudyFormFill tb(StudyFormPre studyFormPre) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getQmrmm());
+        checkPassword(qmr, studyFormPre.getQmrmm());
         StudyFormPre studyFormPreOld = this.getById(studyFormPre.getId());
         if (studyFormPreOld == null) {
             throw new ServiceException("信息不存在或已删除");
@@ -273,6 +274,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         if (!studyFormPreOld.getBdzt().equals(StudyFormPreBdztEnum.ytg.getValue())) {
             throw new ServiceException("不是已通过状态，不能填报");
         }
+        Date time=new Date();
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPre.getRemark());
@@ -289,16 +291,13 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         studyFormFill.setBdmc(studyFormPreOld.getBdmc());
         studyFormFill.setBdsm(studyFormPreOld.getBdsm());
         studyFormFill.setBdnr(studyFormPreOld.getBdnr());
-        studyFormFill.setStartDate(new Date());
+        studyFormFill.setStartDate(time);
         studyFormFill.setTemplateId(studyFormPreOld.getTemplateId());
         studyFormFillService.bc(studyFormFill);
-
         //稽查轨迹
-        Map<String, String> formData1 = new LinkedHashMap<>();
-        formData1.put("备注", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData1), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),time);
         //签名信息
-        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
+        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
         return studyFormFill;
     }