From f840f0841cfbc4f342b8c50ffb32acae5c747df0 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 29 Aug 2025 18:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=92=8C=E4=BF=AE=E8=AF=95bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warning/ScheduledCheckWarning.java        |  7 +--
 .../material/back/BackApplyInfoMapper.xml     | 56 +++++++++----------
 .../repair/RepairInputDetailsMapper.xml       |  2 +-
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warning/ScheduledCheckWarning.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warning/ScheduledCheckWarning.java
index 1d88cfbc..4de4f4db 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warning/ScheduledCheckWarning.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warning/ScheduledCheckWarning.java
@@ -43,9 +43,7 @@ public class ScheduledCheckWarning {
     /**
      * 定时任务执行频率，每周三/五天上午9点执行一次
      */
-//    private String cronExpression = "0 0 9 ? * WED,FRI";
-
-    private String cronExpression = "0 0 17 ? * WED,FRI";
+    private String cronExpression = "0 0 9 ? * WED,FRI";
 
 
     /**
@@ -73,8 +71,7 @@ public class ScheduledCheckWarning {
     private String getCronFromDatabase() {
         // 这里假设从数据库中获取 cron 表达式
         //return "0 */1 * * * ?";
-        return "0 0 17 ? * WED,FRI";
-//        return "0 0 9 ? * WED,FRI";
+        return "0 0 9 ? * WED,FRI";
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index e790268d..c3c97aea 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -197,39 +197,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBackApplyDetailsListByTaskId" resultType="com.bonus.material.back.domain.BackApplyDetails">
         SELECT
-            ba.id AS id,
-            ba.CODE AS CODE,
-            ba.parent_id AS parentId,
-            ba.type_id AS typeId,
-            mt2.type_name AS materialType,
-            mt.type_name AS typeModel,
-            mt1.type_name AS typeName,
-            mt.unit_name AS unitName,
-            mt.unit_value AS unitValue,
-            mt.manage_type AS manageType,
-            ba.pre_num AS preNum,
-            ba.use_num AS num,
-            ba.STATUS AS STATUS,
-            ba.create_by AS createBy,
-            ba.create_time AS createTime,
-            ba.update_by AS updateBy,
-            ba.update_time AS updateTime,
-            ba.remark AS remark,
-            ba.ap_detection AS apDetection,
-            ba.bad_num AS badNum,
-            ba.good_num AS goodNum,
-            mt.manage_type AS manageType,
-            mt3.type_id AS firstId
+        bai.CODE AS CODE,
+        bcd.parent_id AS parentId,
+        bcd.type_id AS typeId,
+        mt2.type_name AS materialType,
+        mt.type_name AS typeModel,
+        mt1.type_name AS typeName,
+        mt.unit_name AS unitName,
+        mt.unit_value AS unitValue,
+        mt.manage_type AS manageType,
+        sum(bcd.bad_num)as badNum,
+        sum(bcd.good_num)as goodNum,
+        sum(bcd.back_num)as preNum,
+        bcd.create_by AS createBy,
+        bcd.create_time AS createTime,
+        bcd.remark AS remark,
+        mt.manage_type AS manageType,
+        mt3.type_id AS firstId
         FROM
-            back_apply_details ba
-                LEFT JOIN ma_type mt ON mt.type_id = ba.type_id and mt.del_flag = 0
-                LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0
-                LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = 0
+        back_check_details bcd
+        LEFT JOIN back_apply_info bai  ON bcd.parent_id = bai.id
+        LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id and mt.del_flag = 0
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0
+        LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = 0
         <if test="userId != null">
-            JOIN ma_type_repair mtr ON mtr.type_id = ba.type_id AND mtr.user_id = #{userId}
+            JOIN ma_type_repair mtr ON mtr.type_id = bcd.type_id AND mtr.user_id = #{userId}
         </if>
-        WHERE ba.parent_id = #{id}
+        WHERE bcd.parent_id = #{id}
         <if test="keyWord != null  and keyWord != ''">
             and (
             mt1.type_name like concat('%', #{keyWord}, '%') or
@@ -237,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt2.type_name like concat('%', #{keyWord}, '%')
             )
         </if>
+        group by bcd.type_id
     </select>
 
     <select id="selectByCode" resultType="com.bonus.material.back.domain.vo.MaCodeVo">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
index 2cb5204e..52c577d6 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt on rd.type_id = mt.type_id
         LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         LEFT JOIN tm_task tt on rd.task_id = tt.task_id
-        LEFT JOIN repair_apply_details rad ON rad.id = rd.repair_id
+        LEFT JOIN repair_apply_details rad ON rad.task_id = rd.repair_id
         LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id
         LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id
         LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id