From 88717f3e96fb853f3dbc3d6e6b3de0ba4ce1f3c5 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Fri, 06 Feb 2026 13:40:51 +0800
Subject: [PATCH] 修改，内审检查多选人员
---
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java | 2 +-
multi-system/src/main/resources/mapper/system/InternalAuditCarryMapper.xml | 5 +++--
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java | 2 +-
multi-system/src/main/resources/mapper/system/InternalAuditCheckMapper.xml | 5 +++--
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCarryServiceImpl.java | 3 ++-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
index c59c604..06b4933 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
@@ -52,7 +52,7 @@
@ApiModelProperty("审核员id")
@TableField("check_id")
- private Integer checkId;
+ private String checkId;
@TableField(exist = false)
private String checkName;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
index 40f936e..1073b1f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
@@ -50,7 +50,7 @@
@ApiModelProperty("审核人员")
@TableField("person_id")
- private Integer personId;
+ private String personId;
@TableField(exist = false)
private String personName;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCarryServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCarryServiceImpl.java
index 7b84615..ee96db9 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCarryServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCarryServiceImpl.java
@@ -13,6 +13,7 @@
import com.gkhy.exam.system.mapper.InternalAuditCheckCatalogueMapper;
import com.gkhy.exam.system.mapper.InternalAuditCheckContentMapper;
import com.gkhy.exam.system.mapper.SysClauseManagementMapper;
+import com.gkhy.exam.system.service.ExStudentService;
import com.gkhy.exam.system.service.InternalAuditCarryService;
import com.gkhy.exam.system.service.InternalAuditCheckService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +75,7 @@
.eq(InternalAuditCarry::getYear, carry.getYear())
.eq(InternalAuditCarry::getDelFlag,1));
if (internalAuditCarries.size()>0){
- throw new ApiException("当前企业已有相关数据");
+ return CommonResult.failed("当前企业已有相关数据");
}
carry.setCreateBy(SecurityUtils.getUsername());
carry.setCreateTime(LocalDateTime.now());
diff --git a/multi-system/src/main/resources/mapper/system/InternalAuditCarryMapper.xml b/multi-system/src/main/resources/mapper/system/InternalAuditCarryMapper.xml
index a886d50..f7205d0 100644
--- a/multi-system/src/main/resources/mapper/system/InternalAuditCarryMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/InternalAuditCarryMapper.xml
@@ -64,11 +64,12 @@
iacd.`start_time`,
iacd.`end_time`,
iacd.`check_id` ,
- su.`name` as check_name
+ IFNULL(GROUP_CONCAT(DISTINCT es.`name` SEPARATOR ','), '') AS check_name
FROM
internal_audit_carry_dept iacd
- LEFT JOIN sys_user su on iacd.check_id = su.id
left join sys_dept sd on iacd.dept_id = sd.dept_id
+ LEFT JOIN ex_student es ON FIND_IN_SET(es.`id`, iacd.`check_id`)
WHERE iacd.carry_id = #{carryId}
+ GROUP BY iacd.`id`;
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/InternalAuditCheckMapper.xml b/multi-system/src/main/resources/mapper/system/InternalAuditCheckMapper.xml
index ea86789..28c4c6f 100644
--- a/multi-system/src/main/resources/mapper/system/InternalAuditCheckMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/InternalAuditCheckMapper.xml
@@ -13,7 +13,7 @@
iac.`dept_id`,
sd.dept_name,
iac.`person_id`,
- es.`name` as person_name,
+ IFNULL(GROUP_CONCAT(DISTINCT es.`name` SEPARATOR ','), '') AS person_name,
iac.`check_time`,
iac.`start_time`,
iac.`end_time`,
@@ -26,12 +26,13 @@
FROM
`internal_audit_check` iac
LEFT JOIN sys_dept sd ON iac.dept_id = sd.dept_id
- LEFT JOIN ex_student es on iac.person_id = es.id
+ LEFT JOIN ex_student es ON FIND_IN_SET(es.`id`, iac.`person_id`)
WHERE
iac.del_flag = 0
<if test="companyId!=null">
and iac.company_id = #{companyId}
</if>
+ GROUP BY iac.`id`
ORDER BY
iac.create_time DESC
</select>
--
Gitblit v1.9.2