From d36b5b44efce962ef2b9bbd130c3823a4106a75b Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Thu, 27 Feb 2025 09:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/AdmissionRequestController.java   | 9 +++++----
 .../com/bonus/project/mapper/AdmissionRequestMapper.java | 2 +-
 .../bonus/project/service/AdmissionRequestService.java   | 2 +-
 .../service/impl/AdmissionRequestServiceImpl.java        | 2 +-
 .../resources/mapper/system/AdmissionRequestMapper.xml   | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
index afc2fb6..0102e77 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java
@@ -297,10 +297,11 @@ public class AdmissionRequestController extends BaseController {
             "判断入场人员文件是否全部存在")
     public AjaxResult judgeIsFileComplete(@Validated @RequestBody SupervisoryUnit bean) {
         try{
-            int code = arService.judgeIsFileComplete(bean);
-            if (code > 0) {
-                return error("部分人员文件不存在，请先仔细核对，上传相关文件！");
-            }else{
+            List<String> code = arService.judgeIsFileComplete(bean);
+            if(code!=null && !code.isEmpty()){
+                String users=String.join(",",code);
+                return error(users+"等人员文件不存在,请上传相关文件！");
+            } else{
                 return success();
             }
         }catch (Exception e){
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java
index a7a3e8a..2e2e50a 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java
@@ -256,7 +256,7 @@ public interface AdmissionRequestMapper {
      * @param bean 实体类
      * @return 是否存在
      */
-    int judgeIsFileComplete(SupervisoryUnit bean);
+    List<String> judgeIsFileComplete(SupervisoryUnit bean);
 
     /**
      * 删除人员相关文件
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java
index 0886105..c1a77fb 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java
@@ -148,5 +148,5 @@ public interface AdmissionRequestService {
      * @param bean 实体类
      * @return 是否存在
      */
-    int judgeIsFileComplete(SupervisoryUnit bean);
+    List<String> judgeIsFileComplete(SupervisoryUnit bean);
 }
diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java
index b7f5531..e410a46 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java
@@ -856,7 +856,7 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
      * @return 是否存在
      */
     @Override
-    public int judgeIsFileComplete(SupervisoryUnit bean) {
+    public List<String> judgeIsFileComplete(SupervisoryUnit bean) {
         return arMapper.judgeIsFileComplete(bean);
     }
 
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
index 76dd290..c5d3776 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
@@ -553,17 +553,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getVersionByexamineId" resultType="string">
         select version from pt_flow_process where examine_id = #{examineId}
     </select>
-    <select id="judgeIsFileComplete" resultType="java.lang.Integer">
+    <select id="judgeIsFileComplete" resultType="java.lang.String">
         <if test="userType == '01'">
             select
-            count(1)
+            concat( psp.sup_name,'-',phone) user
             from lk_sup_person lsp
             left join pt_sup_person psp on lsp.sup_persion_id = psp.sup_user_id
             where pro_id = #{proId} and sup_uuid = #{supUuid} and is_exist_file = '0' and psp.is_active = '1'
         </if>
         <if test="userType == '02' or userType == '03'">
             select
-            count(1)
+            concat(pcp.cons_name,'-',phone) user
             from lk_cont_person lcp
             left join pt_cons_person pcp on lcp.cons_persion_id = pcp.cons_user_id
             where pro_id = #{proId} and cont_uuid = #{consUuid} and is_exist_file = '0' and pcp.is_active = '1'