From 524b4c016677dfd1cd18968273861d4cb7d4de2a Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 2 Feb 2026 18:28:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hxhq/business/mapper/SnGenMapper.java  |  2 ++
 .../hxhq/business/service/ISystemLogService.java    |  1 +
 .../service/impl/StudySubjectServiceImpl.java       | 12 +++++-------
 .../service/impl/StudySubjectUserServiceImpl.java   | 21 +++++++++------------
 .../java/com/hxhq/system/mapper/SysUserMapper.java  |  1 +
 .../com/hxhq/system/service/ISysUserService.java    |  1 +
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SnGenMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SnGenMapper.java
index e89858d..6ee4757 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SnGenMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SnGenMapper.java
@@ -14,7 +14,9 @@ public interface SnGenMapper extends BaseMapper<SnGen>
 {
     /**
      * 递增id
+     * @param pre
      * @param date
+     * @param type
      */
     void addSn(@Param("pre") String pre,@Param("date") String date,@Param("type") Integer type);
 }
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 1665090..7b6827f 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
@@ -46,6 +46,7 @@ public interface ISystemLogService extends IService<SystemLog>
      * @param jcnrEn
      * @param qmrid
      * @param qmrMc
+     * @param qmrMcEn
      * @param remark
      */
     void saveInfo(String jcmc, String jcmcEn, String jcnr, String jcnrEn,Long qmrid, String qmrMc, String qmrMcEn, String remark);
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
index 4124c44..2ea9959 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
@@ -112,8 +112,9 @@ public class StudySubjectServiceImpl extends ServiceImpl<StudySubjectMapper, Stu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveInfo(StudySubjectSaveForm form) {
+        String notExists = "试验不存在";
         Study study = studyService.getById(form.getStudyId());
-        if(study==null){ String notExists = "试验不存在";  throw new ServiceException(notExists); }
+        if(study==null){ throw new ServiceException(notExists); }
         //传入的学科信息
         List<StudySubject> itemList = form.getSubjectList();
         //已经设置的学科信息
@@ -132,15 +133,12 @@ public class StudySubjectServiceImpl extends ServiceImpl<StudySubjectMapper, Stu
             if(exists.size()==0){
                 item.setStudyId(form.getStudyId());
                 addList.add(item);
-                addNameList.add(item.getLeaderName());
-                addNameEnList.add(item.getLeaderNameEn());
+                addNameList.add(item.getLeaderName()); addNameEnList.add(item.getLeaderNameEn());
             }else{
                 modifyList.add(item);
                 if(!exists.get(0).getLeaderName().equals(item.getLeaderName())){
-                    addNameList.add(item.getLeaderName());
-                    addNameEnList.add(item.getLeaderNameEn());
-                    deleteNameList.add(exists.get(0).getLeaderName());
-                    deleteNameEnList.add(exists.get(0).getLeaderNameEn());
+                    addNameList.add(item.getLeaderName()); addNameEnList.add(item.getLeaderNameEn());
+                    deleteNameList.add(exists.get(0).getLeaderName()); deleteNameEnList.add(exists.get(0).getLeaderNameEn());
                 }
             }
         }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java
index ccfd684..26670d6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java
@@ -57,10 +57,12 @@ public class StudySubjectUserServiceImpl extends ServiceImpl<StudySubjectUserMap
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveInfo(StudySubjectUserSaveForm form) {
+        String subjectNotExists = "试验学科不存在";
+        String studyNotExists = "试验不存在";
         StudySubject studySubject = studySubjectService.getById(form.getStudySubjectId());
-        if(studySubject==null){ String subjectNotExists = "试验学科不存在"; throw new ServiceException(subjectNotExists); }
+        if(studySubject==null){  throw new ServiceException(subjectNotExists); }
         Study study = studyService.getById(studySubject.getStudyId());
-        if(studySubject==null){ String studyNotExists = "试验不存在"; throw new ServiceException(studyNotExists); }
+        if(studySubject==null){  throw new ServiceException(studyNotExists); }
         //传入的成员信息
         List<StudySubjectUser> itemList = form.getSubjectUserList();
         //已经设置的学科信息
@@ -69,10 +71,8 @@ public class StudySubjectUserServiceImpl extends ServiceImpl<StudySubjectUserMap
         List<StudySubjectUser> addList = new ArrayList<>();
         List<StudySubjectUser> modifyList = new ArrayList<>();
 
-        List<String> addNameList = new ArrayList<>();
-        List<String> addNameEnList = new ArrayList<>();
-        List<String> deleteNameList = new ArrayList<>();
-        List<String> deleteNameEnList = new ArrayList<>();
+        List<String> addNameList = new ArrayList<>();List<String> addNameEnList = new ArrayList<>();
+        List<String> deleteNameList = new ArrayList<>();List<String> deleteNameEnList = new ArrayList<>();
 
         for(StudySubjectUser item : itemList){
             List<StudySubjectUser> existsList = oldList.stream().filter(o->o.getUserId().equals(item.getUserId())).collect(Collectors.toList());
@@ -81,17 +81,14 @@ public class StudySubjectUserServiceImpl extends ServiceImpl<StudySubjectUserMap
                 item.setStudyId(studySubject.getStudyId());
                 addList.add(item);
 
-                addNameList.add(item.getUserName());
-                addNameEnList.add(item.getUserNameEn());
+                addNameList.add(item.getUserName());addNameEnList.add(item.getUserNameEn());
             }else{
                 item.setId(existsList.get(0).getId());
                 modifyList.add(item);
 
                 if(!existsList.get(0).getUserName().equals(item.getUserName())){
-                    addNameList.add(item.getUserName());
-                    addNameEnList.add(item.getUserNameEn());
-                    deleteNameList.add(existsList.get(0).getUserName());
-                    deleteNameEnList.add(existsList.get(0).getUserNameEn());
+                    addNameList.add(item.getUserName());addNameEnList.add(item.getUserNameEn());
+                    deleteNameList.add(existsList.get(0).getUserName());deleteNameEnList.add(existsList.get(0).getUserNameEn());
                 }
             }
         }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
index efa43c6..f55e420 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java
@@ -168,6 +168,7 @@ public interface SysUserMapper
      * 获取试验人员列表
      * @param studyId
      * @param studySubjectId
+     * @param deptId
      * @param permit
      * @return
      */
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
index c15894d..1607a14 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java
@@ -239,6 +239,7 @@ public interface ISysUserService
      * 试验人员列表(选审核人用)
      * @param studyId
      * @param studySubjectId
+     * @param deptId
      * @param permit
      * @return
      */