From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 6852b2a..d331788 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -53,6 +53,8 @@
tc.name as contractName,
tcr.which_year,
tcr.which_month,
+ tcr.which_day,
+ MAX(tcr.which_day) AS latest_day,
SUM(tcr.deduct_money) AS deductMoney,
MAX(tcr.which_month) AS latest_month,
(
@@ -73,7 +75,7 @@
AND tcr.status = #{query.status}
</if>
</where>
- group by contract_id,which_year
+ group by contract_id, which_year,which_month
</select>
<resultMap id="DetailResultMap" type="com.ycl.platform.domain.vo.CalculateReportDetailVO">
<result column="id" property="id"/>
@@ -83,10 +85,11 @@
<result column="name" property="contractName"/>
<result column="contract_id" property="contractId"/>
<result column="which_year" property="whichYear"/>
+ <result column="which_month" property="whichMonth"/>
<result column="status" property="status"/>
<collection property="ruleList" column="contract_id" ofType="com.ycl.platform.domain.vo.CalculateMoneyRuleVO"
select="selectRuleByContractId"/>
- <collection property="recordList" column="{contractId=contract_id, whichYear=which_year,status=status}" ofType="com.ycl.platform.domain.vo.CalculateRecordVO"
+ <collection property="recordList" column="{contractId=contract_id, whichYear=which_year,status=status,whichMonth=which_month}" ofType="com.ycl.platform.domain.vo.CalculateRecordVO"
select="selectRecordByContractId"/>
</resultMap>
@@ -107,6 +110,7 @@
tcr.deduct_money as deductMoney,
tcr.which_year as whichYear,
tcr.which_month as whichMonth,
+ tcr.which_day as whichDay,
tcr.status
FROM
t_calculate_record tcr
@@ -117,7 +121,7 @@
AND MONTH(tcs.create_time) = tcr.which_month
AND tcs.auditing_status = 'PASS'
<where>
- tcr.contract_id = #{contractId} AND tcr.which_year = #{whichYear} AND tcr.deleted = 0
+ tcr.contract_id = #{contractId} AND tcr.which_year = #{whichYear} AND tcr.deleted = 0 AND tcr.which_month=#{whichMonth}
<if test="status!=null">
AND tcr.status=#{status}
</if>
@@ -136,12 +140,13 @@
tcr.create_time,
tcr.update_time,
tcr.which_year,
+ tcr.which_month,
#{query.status} as status
FROM t_calculate_record tcr
INNER JOIN t_contract tc ON tcr.contract_id = tc.id
INNER JOIN t_yw_unit tyu ON tyu.id = tc.unit_id
<where>
- tcr.contract_id = #{query.contractId} AND tcr.which_year = #{query.whichYear}
+ tcr.contract_id = #{query.contractId} AND tcr.which_year = #{query.whichYear} AND tcr.which_month = #{query.whichMonth}
</where>
limit 1
</select>
@@ -166,6 +171,9 @@
<if test="whichYear!=null">
and tcr.which_year = #{whichYear}
</if>
+ <if test="whichDay!=null">
+ and tcr.which_day = #{whichDay}
+ </if>
</where>
GROUP BY a.id
</select>
--
Gitblit v1.8.0