From 02d115e902ef2091fa5f0202ec3909f1c2e66923 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 16 四月 2025 14:01:57 +0800
Subject: [PATCH] 设备未知状态修改，工单照片清理定时任务，工单逻辑删除照片，以及保存最新的5张，数据导出离线数统计，在线率统计的合计修改
---
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index 215d217..91e239e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -17,6 +17,9 @@
from t_contract a
left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
where a.deleted = 0
+ <if test="query.unitId != null">
+ and a.unit_id = #{query.unitId}
+ </if>
<if test="query.name != null and query.name != ''">
and a.name like concat('%', #{query.name}, '%')
</if>
@@ -39,7 +42,7 @@
<select id="getCalculateRule" resultType="com.ycl.platform.domain.vo.CalculateRuleVO">
select tc.unit_id ,tcr.*
from t_contract tc
- left join t_calculate_rule tcr on tc.id = tcr.contract_id
+ left join t_calculate_rule tcr on tc.id = tcr.contract_id and tcr.deleted =0
<where>
tc.deleted =0 and #{date} between tc.start_time and tc.end_time
</where>
--
Gitblit v1.8.0