From 12b08a38039342388db67feb36a497b96eef3f0e Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Fri, 25 Apr 2025 16:32:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=90=8E=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=B7=A5=E7=A8=8B=E6=9C=BA=E5=85=B7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RepairInputDetailsServiceImpl.java   |  17 +-
 .../material/basic/ComplexQueryMapper.xml     | 154 +++++-------------
 2 files changed, 50 insertions(+), 121 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
index 6d1fb701..2793d1e8 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
@@ -37,7 +37,7 @@ import javax.annotation.Resource;
 
 /**
  * 修试后入库Service业务层处理
- * 
+ *
  * @author xsheng
  * @date 2024-10-16
  */
@@ -57,7 +57,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 查询修试后入库
-     * 
+     *
      * @param repairInputDetails 修试后入库主键
      * @return 修试后入库
      */
@@ -97,7 +97,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 查询修试后入库列表
-     * 
+     *
      * @param repairInputDetails 修试后入库
      * @return 修试后入库
      */
@@ -149,7 +149,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 新增修试后入库
-     * 
+     *
      * @param repairInputDetails 修试后入库
      * @return 结果
      */
@@ -165,7 +165,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 修改修试后入库
-     * 
+     *
      * @param repairInputDetails 修试后入库
      * @return 结果
      */
@@ -181,7 +181,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 批量删除修试后入库
-     * 
+     *
      * @param ids 需要删除的修试后入库主键
      * @return 结果
      */
@@ -192,7 +192,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
 
     /**
      * 删除修试后入库信息
-     * 
+     *
      * @param id 修试后入库主键
      * @return 结果
      */
@@ -448,7 +448,8 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
             RepairInputInfo repairInputInfo = new RepairInputInfo();
             repairInputInfo.setTypeId(repairInputDetails.getTypeId());
             repairInputInfo.setInputNum(repairInputDetails.getInputNum());
-            repairInputDetailsMapper.updateNum(repairInputInfo);
+            //驳回不需求修改库存
+            // repairInputDetailsMapper.updateNum(repairInputInfo);
             Long newTaskId = insertTt(repairInputDetails.getTaskId());
             result += insertTta(newTaskId, repairInputDetails);
             result += insertWxTask(newTaskId, repairInputDetails);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index 2f0e7ddc..0a1f9043 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.material.basic.mapper.ComplexQueryMapper">
 
     <select id="getProjUsingRecordList" resultType="com.bonus.material.basic.domain.ProjUsingRecord">
+
         SELECT
         subquery1.agreementCode as agreementCode,
         subquery1.unitName as unitName,
@@ -14,58 +15,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         subquery1.typeName as typeName,
         subquery1.typeModelName as typeModelName,
         subquery1.unit as unit,
-        IFNULL(subquery1.leaseNum, 0) as leaseNum,
-        IFNULL(subquery2.backNum, 0) as backNum,
-        CASE
-        WHEN IFNULL(subquery1.leaseNum, 0) - IFNULL(subquery2.backNum, 0) > 0
-        THEN IFNULL(subquery1.leaseNum, 0) - IFNULL(subquery2.backNum, 0)
-        ELSE 0.000
-        END as usNum,
-        CASE
-        WHEN IFNULL(subquery1.leaseNum, 0) - IFNULL(subquery2.backNum, 0) > 0 THEN
-        ROUND(IFNULL(subquery1.buy_price, 0) *
-        (IFNULL(subquery1.leaseNum, 0) - IFNULL(subquery2.backNum, 0)), 2)
-        ELSE
-        0.00
-        END as usPrice,
-        ROUND(IFNULL(subquery1.leaseNum, 0) * IFNULL(subquery1.buy_price, 0), 2) as totalPrice,
-        subquery1.isSlt as isSlt,
-        subquery1.isSltName as isSltName
-        FROM (SELECT bai.agreement_id,
-        mt.type_id,
-        mt.buy_price,
+        IFNULL(SUM(subquery1.leaseNum), 0) as leaseNum,
+        IFNULL(SUM(subquery1.backNum), 0) as backNum,
+        IFNULL(SUM(subquery1.usNum), 0) as usNum,
+        IFNULL(SUM(subquery1.usPrice), 0) as usPrice,
+        IFNULL(SUM(subquery1.totalPrice), 0) as totalPrice,
+        subquery1.isSltName
+        FROM
+        (
+
+        SELECT
+        bai.agreement_id,
         bai.agreement_code AS agreementCode,
         bui.unit_name AS unitName,
         bpl.pro_name AS proName,
-        bpl.contract_part as contractPart,
-        sd.dept_name as impUnitName,
+        bpl.contract_part AS contractPart,
+        bpl.imp_unit AS impUnitName,
         mt2.type_name AS typeName,
+        mt.type_id,
         mt.type_name AS typeModelName,
         mt.unit_name AS unit,
-        SUM(IFNULL(lod.out_num, 0)) AS leaseNum,
-        sai.is_slt as isSlt,
-        CASE
-        sai.is_slt
-        WHEN '0' then '未结算'
-        WHEN '1' then '已结算'
-        ELSE ''
-        END as isSltName
-        FROM lease_out_details lod
-        LEFT JOIN lease_apply_info lai ON lai.id = lod.parent_id
-        LEFT JOIN tm_task_agreement tta ON tta.task_id = lai.task_id
-        LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
-        LEFT JOIN (
-        SELECT agreement_id, is_slt
-        FROM slt_agreement_info
-        GROUP BY agreement_id
-        ) sai ON bai.agreement_id = sai.agreement_id
+        ROUND( sai.NUM, 3 ) AS leaseNum,
+        IF
+        ( sai.`STATUS` = 1, ROUND( sai.NUM, 3 ), 0.00 ) AS backNum,
+        IF
+        ( sai.`STATUS` = 0, ROUND( sai.NUM, 3 ), 0.00 ) AS usNum,
+        IF
+        ( sai.`STATUS` = 0, ROUND( sai.NUM, 3 ), 0.00 )* mt.buy_price AS usPrice,
+        ROUND( sai.NUM, 3 )* mt.buy_price  AS totalPrice,
+        sai.is_slt AS isSlt,
+        IF
+        ( sai.is_slt = 0, '未结算', '已结算' ) AS isSltName
+        FROM
+        slt_agreement_info sai
+        LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id
         LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
-        LEFT JOIN sys_dept sd on sd.dept_id = bpl.imp_unit
         LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
-        LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
+        LEFT JOIN ma_type mt ON mt.type_id = sai.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
-        LEFT JOIN ma_machine mm ON mm.ma_id = lod.ma_id
-        where 1=1
+       where 1=1
         <if test="keyWord != null and keyWord != ''">
             and (bai.agreement_code like concat('%',#{keyWord},'%') or
             bui.unit_name like concat('%',#{keyWord},'%') or
@@ -74,7 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt.type_name like concat('%',#{keyWord},'%') or
             mt.unit_name like concat('%',#{keyWord},'%') or
             bpl.contract_part like concat('%', #{keyWord}, '%') or
-            sd.dept_name like concat('%', #{keyWord}, '%')
             )
         </if>
         <if test="unitId != null">
@@ -95,75 +82,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="isSlt != null and isSlt != ''">
             and sai.is_slt = #{isSlt}
         </if>
-        GROUP BY bai.agreement_id,
-        mt.type_id ORDER BY bai.agreement_code) AS subquery1
-        LEFT JOIN (SELECT bai.agreement_id,
-        mt.type_id,
-        mt.rent_price,
-        bai.agreement_code AS agreementCode,
-        bui.unit_name AS unitName,
-        bpl.pro_name AS proName,
-        mt2.type_name AS typeName,
-        mt.type_name AS typeModelName,
-        mt.unit_name AS unit,
-        bpl.contract_part as contractPart,
-        sd.dept_name as impUnitName,
-        SUM(IFNULL(bcd.back_num, 0)) backNum,
-        sai.is_slt as isSlt,
-        CASE
-        sai.is_slt
-        WHEN '0' then '未结算'
-        WHEN '1' then '已结算'
-        ELSE ''
-        END as isSltName
-        FROM back_check_details bcd
-        LEFT JOIN back_apply_info baif ON baif.id = bcd.parent_id
-        LEFT JOIN tm_task_agreement tta ON tta.task_id = baif.task_id
-        LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
-        LEFT JOIN (
-        SELECT agreement_id, is_slt
-        FROM slt_agreement_info
-        GROUP BY agreement_id
-        ) sai ON bai.agreement_id = sai.agreement_id
-        LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
-        LEFT JOIN sys_dept sd on sd.dept_id = bpl.imp_unit
-        LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
-        LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
-        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
-        LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
-        where 1=1 and bcd.is_finished = '1'
-        <if test="keyWord != null and keyWord != ''">
-            and (bai.agreement_code like concat('%',#{keyWord},'%') or
-            bui.unit_name like concat('%',#{keyWord},'%') or
-            bpl.pro_name like concat('%',#{keyWord},'%') or
-            mt2.type_name like concat('%',#{keyWord},'%') or
-            mt.type_name like concat('%',#{keyWord},'%') or
-            mt.unit_name like concat('%',#{keyWord},'%') or
-            bpl.contract_part like concat('%', #{keyWord}, '%') or
-            sd.dept_name like concat('%', #{keyWord}, '%')
-            )
-        </if>
-        <if test="unitId != null">
-            and bui.unit_id = #{unitId}
-        </if>
-        <if test="proId != null">
-            and bpl.pro_id = #{proId}
-        </if>
-        <if test="typeName != null and typeName != ''">
-            and mt2.type_name like concat('%',#{typeName},'%')
-        </if>
-        <if test="typeModelName != null and typeModelName != ''">
-            and mt.type_name like concat('%',#{typeModelName},'%')
-        </if>
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND bai.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
-        </if>
-        <if test="isSlt != null and isSlt != ''">
-            and sai.is_slt = #{isSlt}
-        </if>
-        GROUP BY bai.agreement_id,
-        mt.type_id ORDER BY bai.agreement_code) AS subquery2 ON subquery1.type_id = subquery2.type_id
-        AND subquery1.agreement_id = subquery2.agreement_id
+
+
+        GROUP BY
+        sai.id
+        ) subquery1
+        GROUP BY subquery1.agreement_id,subquery1.type_id
+
+
+
+
     </select>
 
     <select id="getMachineHistoryRecordList" resultType="com.bonus.material.basic.domain.MachineHistoryRecordBean">

From 92c7c0c9ae1fdb6650cf0d14cc7189d75c249bd4 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Mon, 8 Sep 2025 17:05:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/remind/InformMonthly.java   |  2 +-
 .../service/impl/SltAgreementInfoServiceImpl.java  | 14 +++++++++++---
 .../mapper/material/push/IwsCostPushMapper.xml     |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java
index 0324bd94..bc31b649 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java
@@ -30,7 +30,7 @@ public class InformMonthly {
      * - 星期（?）：表示星期，由于每月第一天的星期不固定，因此使用?表示。
      * - 年份（空）：不指定年份，表示每年都执行。
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    //@Scheduled(cron = "0 0 1 * * ?")
     public void taskCycle() {
         System.out.println("使用SpringMVC框架配置定时任务");
         try {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
index f3dab667..4fd882e3 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
@@ -1303,14 +1303,22 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
                     // 计算租赁天数
                     long leaseDays = calculateDaysBetween(calcStartTime, calcEndTime);
 
+
                     // 计算租赁费用
                     BigDecimal leaseCost = BigDecimal.ZERO;
                     if (result.getComsumable() != null && result.getComsumable() == 1) {
+                        Date startTime =result.getStartTime();
+                        long startDays = calculateDaysBetween(startTime, calcEndTime);
+
                         if (result.getNum() == null) {
                             result.setNum(BigDecimal.ZERO);
                         }
-                        // 消耗性物资直接计算购置价
-                        result.setConsumeCost(result.getNum().multiply(Optional.ofNullable(result.getBuyPrice()).orElse(BigDecimal.ZERO)));
+
+                        if(startDays >0) {
+                            // 消耗性物资直接计算购置价
+                            result.setConsumeCost(result.getNum().multiply(Optional.ofNullable(result.getBuyPrice()).orElse(BigDecimal.ZERO)));
+                        }
+
                     }
                     if (result.getNum() != null && result.getLeasePrice() != null && leaseDays >= 1) {
                         // 非消耗性物资按照租赁单价计算租赁费用
@@ -1456,7 +1464,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
 
         Calendar endCal = Calendar.getInstance();
         endCal.setTime(endDate);
-        // 将结束时间设为当天00:00:00.000  
+        // 将结束时间设为当天00:00:00.000
         endCal.set(Calendar.HOUR_OF_DAY, 0);
         endCal.set(Calendar.MINUTE, 0);
         endCal.set(Calendar.SECOND, 0);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
index 5e88152f..e644c6b4 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
@@ -434,8 +434,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.leasePrice},
             #{item.leaseCost},
             #{item.taskId},
-            null,
-            0.00,
+            #{item.buyPrice},
+            #{item.consumeCost},
             #{item.equipmentType}
             )
         </foreach>