From 766929da413fff39da81994c56557b0b63e4e151 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 17 Mar 2026 16:00:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E9=94=81=E5=AE=9A=E8=AF=95=E9=AA=8C=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E5=88=A4=E6=96=AD=E4=BA=86=E5=AE=9E=E9=99=85=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=88=A4=E6=96=AD=E8=AF=95=E9=AA=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E6=BB=A1=E8=B6=B3=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hxhq/business/mapper/StudyMapper.java    |  2 +-
 .../com/hxhq/business/service/impl/StudyServiceImpl.java   |  6 +++---
 .../src/main/resources/mapper/business/StudyMapper.xml     | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMapper.java
index ba7ff5f..5439d48 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMapper.java
@@ -36,7 +36,7 @@ public interface StudyMapper extends BaseMapper<Study>
      * @param studyId
      * @return
      */
-    String queryNotFinishFormName(@Param("studyId") Long studyId);
+    List<String> queryNotFinishFormName(@Param("studyId") Long studyId);
 
     /**
      * 获取首页统计的表单数量
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
index 2ac85d8..28ddab8 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
@@ -347,9 +347,9 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
             throw new ServiceException("该试验已锁定");
         }
         checkPermit(study);
-        String name = baseMapper.queryNotFinishFormName(study.getId());
-        if(StringUtils.isNoneBlank(name)){
-            throw new ServiceException("该试验下"+name+"还未结束，请先完成该表单后再进行锁定试验");
+        List<String> nameList = baseMapper.queryNotFinishFormName(study.getId());
+        if(nameList!=null && nameList.size()>0){
+            throw new ServiceException("该试验下"+String.join("、",nameList)+"还未结束，请先完成该表单后再进行锁定试验");
         }
     }
 
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
index 6d8bb29..1cd599a 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
@@ -24,7 +24,19 @@
     </select>
 
     <select id="queryNotFinishFormName" resultType="java.lang.String">
-        SELECT GROUP_CONCAT(bdmc ORDER BY id SEPARATOR '、') FROM `t_study_form_fill` WHERE
+        SELECT bdmc FROM `t_study_form_fill` WHERE
+        del_flag='0' AND study_id=#{studyId}
+        AND bdzt NOT IN (5,7,11)
+
+        UNION ALL
+
+        SELECT bdmc FROM `t_study_form_apply` WHERE
+        del_flag='0' AND study_id=#{studyId}
+        AND bdzt NOT IN (5,7,11)
+
+        UNION ALL
+
+        SELECT bdmc FROM `t_study_form_plan` WHERE
         del_flag='0' AND study_id=#{studyId}
         AND bdzt NOT IN (5,7,11)
     </select>