From a816d9448d3f787dddb08d7308b154ef9cc4c2a5 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Mon, 28 Jul 2025 15:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8B=86=E5=88=86=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LossAssessmentServiceImpl.java        |  2 +-
 .../material/repair/domain/RepairTaskDetails.java      |  2 ++
 .../repair/service/impl/RepairServiceImpl.java         |  3 ++-
 .../mapper/material/back/BackApplyInfoMapper.xml       |  6 ++++++
 .../resources/mapper/material/common/SelectMapper.xml  | 10 +++++-----
 .../resources/mapper/material/repair/RepairMapper.xml  |  6 ++++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java
index 475c0cd0..35594d97 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java
@@ -265,7 +265,7 @@ public class LossAssessmentServiceImpl implements LossAssessmentService {
                 int status = mapper.selectTaskStatus(taskId);
                 final TmTask tmTask = mapper.selectTmTaskByTaskId(taskId);
                 if (status<=0){
-                    //驳回操作不可跨月操作
+                    //驳回操作不可跨月（退料的创建时间）操作
                     if (!StringHelper.isNullOrEmptyString(String.valueOf(tmTask.getCreateTime()))) {
                         // 将 createTime 转换为 LocalDate
                         LocalDate taskCreationDate = tmTask.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
index ab8110d1..164bb598 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
@@ -171,6 +171,8 @@ public class RepairTaskDetails extends BaseEntity {
 
     private String userName;
 
+    private int isDs ;
+
     private List<PartType> partTypeList;
 
     @ApiModelProperty(value = "登录用户id")
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
index 8c645099..dafd668b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
@@ -858,7 +858,7 @@ public class RepairServiceImpl implements RepairService {
                         partDetails.setPartId(null != partDetails.getPartId() ? partDetails.getPartId() : partDetails.getId());
                         // 有维修配件时,如果价格为空，设置为0
                         if (null == partDetails.getPartCost()) {partDetails.setPartCost(BigDecimal.ZERO);}
-                        
+
                         partDetails.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setCompanyId(null);
                         partDetails.setCreateBy(String.valueOf(loginUser.getUserid()));
 
@@ -1119,6 +1119,7 @@ public class RepairServiceImpl implements RepairService {
                             repairTaskDetail.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
                             repairTaskDetail.setStatus("0");
                             repairTaskDetail.setNewTaskId(newTaskId);
+                            repairTaskDetail.setIsDs(1);
                             repairMapper.insertRepaired(repairTaskDetail);
                         }
                     } else {
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 76f0980d..fc4f1ba9 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
@@ -441,6 +441,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           <if test="agreementId != null">
               AND ba.project_id = #{proId}
           </if>
+          <if test="unitId != null">
+              AND ba.unit_id = #{unitId}
+          </if>
+          <if test="proId != null">
+              AND ba.project_id = #{proId}
+          </if>
     </select>
 
     <select id="getDetailsById" resultType="com.bonus.material.back.domain.BackApplyDetails">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 84d486cb..2a6e9a64 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -385,18 +385,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt.unit_name as unitName,
             mt.unit_value as unitValue,
             mt.manage_type as manageType,
-            SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
+            SUM( sai.num ) AS num,
             mt.LEVEL as level
         FROM
             ma_type mt
                 LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
-        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
+                LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
         WHERE
-            EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId}
-                                                             AND sai2.STATUS = '0' and IFNULL(sai.lease_type,0) = 0 and sai2.num > 0)
-            and mt.manage_type = '1'
+            sai.agreement_id = #{agreementId}  AND sai.STATUS = '0'
+          and mt.manage_type = '1'
         GROUP BY
             mt.type_id
+        HAVING num> 0
     </select>
 
     <select id="getMaType" resultType="com.bonus.material.common.domain.vo.SelectVo">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
index b2496fa6..a49dc254 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
@@ -72,6 +72,9 @@
         <if test="parentId != null">
             parent_id,
         </if>
+        <if test="isDs != null">
+            is_ds,
+        </if>
         create_time
         )
         values (
@@ -111,6 +114,9 @@
         <if test="parentId != null">
             #{parentId},
         </if>
+        <if test="isDs != null">
+            #{isDs},
+        </if>
         NOW()
         )
     </insert>