From ae804d36437e39d1017cf00cd7deaea84d882f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Mon, 17 Nov 2025 18:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/bmw/controller/PmWorkerController.java   | 14 ++++++++++++--
 .../service/impl/AppRecognitionServiceImpl.java    |  8 +++++++-
 .../resources/mapper/bmw/HomePageSubMapper.xml     | 12 ++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java
index d2cdf7b..f21edac 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java
@@ -206,7 +206,12 @@ public class PmWorkerController extends BaseController {
                 file.transferTo(tempFile);
                 ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
                 // 调用原方法，传入临时文件的路径
-                String faceFeatures = arcFaceHelper.getIsFaceImage(tempFile.getAbsolutePath());
+                String faceFeatures;
+                try {
+                    faceFeatures = arcFaceHelper.getIsFaceImage(tempFile.getAbsolutePath());
+                } catch (Exception e) {
+                    return AjaxResult.error("人脸照片识别有问题");
+                }
                 String[] split = faceFeatures.split(",");
                 if ("200".equals(split[0])){
                     return  AjaxResult.success(split[1]);
@@ -256,7 +261,12 @@ public class PmWorkerController extends BaseController {
 
             ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
             // 调用原方法，传入临时文件的路径
-            String faceFeatures = arcFaceHelper.getIsFaceImage(tempFile.getAbsolutePath());
+            String faceFeatures = null;
+            try {
+                faceFeatures = arcFaceHelper.getIsFaceImage(tempFile.getAbsolutePath());
+            } catch (Exception e) {
+                return AjaxResult.error("人脸照片识别有问题");
+            }
             String[] split = faceFeatures.split(",");
             if ("200".equals(split[0])){
                 return AjaxResult.success(split[1]);
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppRecognitionServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppRecognitionServiceImpl.java
index f065874..3d0c404 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppRecognitionServiceImpl.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/AppRecognitionServiceImpl.java
@@ -32,6 +32,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.net.URLEncoder;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author 马三炮
  * @date 2025/8/14
@@ -257,7 +260,10 @@ public class AppRecognitionServiceImpl implements AppRecognitionService {
             System.err.println("resultFront:"+resultFront);
             System.err.println("resultBack:"+resultBack);
 //            BaiduRecognitionUtils.updateBankName(bank_name);
-            return null;
+            Map<String, String> map = new HashMap<>();
+            map.put("resultFront", resultFront);
+            map.put("resultBack", resultBack);
+            return AjaxResult.success("识别成功", map);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml
index 46a70f2..582348a 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml
@@ -173,10 +173,10 @@
         AND locate(#{subComName},aa.sub_company_name)
       </if>
       <if test="proId != null">
-        AND locate(#{proId},aa.pro_id)
+        AND aa.pro_id = #{proId}
       </if>
       <if test="subComId != null">
-        AND locate(#{subComId},aa.sub_company_id)
+        AND aa.sub_company_id = #{subComId}
       </if>
     </where>
   </select>
@@ -187,9 +187,9 @@
     pst.team_name,
     ps.id AS sub_id,
     ps.sub_name,
-    pp.id AS pro_id,
+    group_concat(distinct pp.id) AS pro_id,
+    group_concat(distinct pp.pro_name) AS pro_name,
     psc.id AS sub_company_id,
-    pp.pro_name,
     psc.sub_company_name,
     count(DISTINCT bwem.worker_id) AS einNum,
     count(DISTINCT bap.worker_id) AS attNum,
@@ -207,7 +207,7 @@
     INNER JOIN pm_project pp ON pp.id = bsc.pro_id and pp.id = pstc.pro_id
     AND pp.is_active = 1
     LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id
-    LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
+    LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id AND bwem.team_id = pst.id
     AND bwem.is_active = 1
     LEFT JOIN bm_att_person bap ON pp.id = bap.pro_id
     AND bap.is_active = 1
@@ -338,7 +338,7 @@
     <where>
        bwem.ein_status = 2 and bwem.is_upload_file = 0
       <if test="subComId != null">
-        AND pp.sub_com_id
+        AND pp.sub_com_id = #{subComId}
       </if>
       <if test="workerName != null">
         AND locate(#{workerName},pw.name)