From 90276a76b56cc1e744f7fa68ce921a28a8a9c92f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 11:52:10 +0800
Subject: [PATCH] 运行监控报表导出时间少一天问题

---
 ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index 4d9f21e..34fa3d2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.platform.mapper.DefaultRuleMapper">
+<mapper namespace="com.ycl.platform.mapper.CalculateRuleMapper">
 
     <resultMap type="com.ycl.platform.domain.entity.CalculateRule" id="DefaultRuleResult">
         <result property="id"    column="id"    />
@@ -35,6 +35,22 @@
         where id = #{id}
     </select>
 
+    <select id="getRuleListByUnitId" resultType="com.ycl.platform.domain.vo.CalculateRuleCascaderVO">
+        <![CDATA[
+        select id as value,
+               rule_name,
+               deduct_category,
+               calc_fraction,
+               calc_unit,
+               contract_id,
+               rule_condition as label
+        from t_calculate_rule
+        where deleted = 0
+          and contract_id
+            in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <= #{now} and end_time >= #{now})
+        ]]>
+    </select>
+
     <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">
         insert into t_calculate_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">

--
Gitblit v1.8.0