From 551b79dfce74e122bec027ff07bfcc7d74987df5 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 5 Mar 2026 09:47:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E5=8A=A0=E4=B8=8A=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/service/ISystemLogService.java    | 20 +++++++++++++++++++-
 .../business/service/impl/StudyJcgjServiceImpl.java |  5 ++++-
 .../business/service/impl/SystemLogServiceImpl.java | 21 ++++++++++++++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java
index 9dc14ad..a0c28e0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java
@@ -1,5 +1,6 @@
 package com.hxhq.business.service;
 
+import java.util.Date;
 import java.util.List;
 
 import com.hxhq.business.domain.Study;
@@ -31,8 +32,9 @@ public interface ISystemLogService extends IService<SystemLog>
      * @param jcnr
      * @param jcnrEn
      * @param signForm
+     * @param time
      */
-    void saveStudyInfo(Study study,String jcnr, String jcnrEn, SignForm signForm);
+    void saveStudyInfo(Study study,String jcnr, String jcnrEn, SignForm signForm,Date time);
 
     /**
      * 试验稽查轨迹-批量
@@ -42,6 +44,22 @@ public interface ISystemLogService extends IService<SystemLog>
     void saveStudyBatch(Study study,List<StudyJcgj> jcgjList);
 
     /**
+     * 普通日志-加上时间
+     * @param name
+     * @param nameEn
+     * @param jcmc
+     * @param jcmcEn
+     * @param jcnr
+     * @param jcnrEn
+     * @param qmrid
+     * @param qmrMc
+     * @param qmrMcEn
+     * @param remark
+     * @param time
+     */
+    void saveInfoWithData(String name, String nameEn, String jcmc, String jcmcEn, String jcnr, String jcnrEn, Long qmrid, String qmrMc, String qmrMcEn, String remark, Date time);
+
+    /**
      * 普通日志
      * @param name
      * @param nameEn
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java
index 049fd45..4534a1c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hxhq.business.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -58,6 +59,7 @@ public class StudyJcgjServiceImpl extends ServiceImpl<StudyJcgjMapper, StudyJcgj
 
     @Override
     public void saveInfo(Study study, JcgjlxEnum jcgjlx, JcmcysEnum jcmcys, String jcnr, String jcnrEn, SignForm signForm) {
+        Date now = new Date();
         StudyJcgj info = new StudyJcgj();
         info.setStudyId(study.getId());
         info.setJcgjlx(jcgjlx.getValue());
@@ -72,8 +74,9 @@ public class StudyJcgjServiceImpl extends ServiceImpl<StudyJcgjMapper, StudyJcgj
         info.setQmrMc(signForm.getQmrMc());
         info.setQmrMcEn(signForm.getQmrMcEn());
         info.setRemark(signForm.getRemark());
+        info.setCreateTime(now);
         save(info);
 
-        systemLogService.saveStudyInfo(study,jcnr,jcnrEn,signForm);
+        systemLogService.saveStudyInfo(study,jcnr,jcnrEn,signForm,now);
     }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java
index 3083d8f..77b535e 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.hxhq.business.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -58,7 +59,7 @@ public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog
     }
 
     @Override
-    public void saveStudyInfo(Study study, String jcnr, String jcnrEn, SignForm signForm) {
+    public void saveStudyInfo(Study study, String jcnr, String jcnrEn, SignForm signForm,Date time) {
         SystemLog info = new SystemLog();
         info.setName(study.getName()+"("+study.getSn()+")");
         info.setNameEn(study.getName()+"("+study.getSn()+")");
@@ -70,6 +71,7 @@ public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog
         info.setQmrMc(signForm.getQmrMc()==null? SecurityUtils.getNickName() : signForm.getQmrMc());
         info.setQmrMcEn(signForm.getQmrMcEn()==null? SecurityUtils.getUsername() : signForm.getQmrMcEn());
         info.setRemark(signForm.getRemark());
+        info.setCreateTime(time);
         save(info);
     }
 
@@ -113,6 +115,23 @@ public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog
     }
 
     @Override
+    public void saveInfoWithData(String name, String nameEn, String jcmc, String jcmcEn, String jcnr, String jcnrEn, Long qmrid, String qmrMc, String qmrMcEn, String remark, Date time) {
+        SystemLog info = new SystemLog();
+        info.setName(name);
+        info.setNameEn(StringUtils.isBlank(nameEn)?name:nameEn);
+        info.setJcnr(jcnr);
+        info.setJcnrEn(jcnrEn);
+        info.setJcmc(jcmc);
+        info.setJcmcEn(jcmcEn);
+        info.setQmrId(qmrid);
+        info.setQmrMc(qmrMc);
+        info.setQmrMcEn(qmrMcEn);
+        info.setRemark(remark);
+        info.setCreateTime(time);
+        save(info);
+    }
+
+    @Override
     public void saveSimpleInfo(String name, String nameEn, String jcmc, String jcmcEn) {
         SystemLog info = new SystemLog();
         info.setName(name);