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/CheckRuleMapper.xml | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
index a940b37..4245c27 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
@@ -3,67 +3,69 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckRuleMapper">
-
+
<resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
<result property="id" column="id" />
<result property="ruleName" column="rule_name" />
<result property="ruleIndex" column="rule_index" />
<result property="ruleCategory" column="rule_category" />
- <result property="examineCategory" column="examine_category" />
+ <result property="ruleCondition" column="rule_condition" />
<result property="ruleDescription" column="rule_description" />
- <result property="state" column="state" />
- <result property="createTime" column="create_time" />
+ <result property="icon" column="icon" />
<result property="updateTime" column="update_time" />
+ <result property="state" column="state" />
<result property="deleted" column="deleted" />
+ <result property="apiUrl" column="api_url" />
</resultMap>
<sql id="selectCheckRuleVo">
- select id, rule_name, rule_index, rule_category, examine_category, rule_description, state, create_time, update_time, deleted from t_check_rule
+ select id, rule_name, rule_index, rule_category, rule_condition, rule_description, rule_object,icon,
+ update_time, state, deleted
+ from t_check_rule
</sql>
- <select id="selectCheckRuleList" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
- select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description,
- tctr.weight, tctr.audit_state,tctr.check_template_id as templateId,tct.template_name
- from t_check_template_rule tctr inner join t_check_rule tcr on tcr.id = tctr.check_rule_id
- inner join t_check_template tct on tctr.check_template_id = tct.id
+ <select id="selectCheckRuleList" resultMap="CheckRuleResult">
+ select cr.id, cr.rule_name, cr.rule_index, cr.rule_category, cr.rule_condition, cr.rule_description,
+ cr.update_time, cr.state, cr.deleted,cr.icon, cr.api_url
+ from t_check_rule cr
<where>
- state = 0
- <if test="ruleName != null and ruleName != ''"> and tcr.rule_name like concat(#{ruleName}, '%')</if>
- <if test="ruleCategory != null "> and tcr.rule_category = #{ruleCategory}</if>
- <if test="examineCategory != null "> and tcr.examine_category = #{examineCategory}</if>
- <if test="auditState != null "> and tctr.audit_state = #{auditState}</if>
- <if test="templateId != null "> and tctr.check_template_id = #{templateId}</if>
+ <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
+ <if test="ruleIndex != null and ruleIndex != ''"> and rule_index = #{ruleIndex}</if>
+ <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
+ <if test="ruleCondition != null and ruleCondition != ''"> and rule_condition = #{ruleCondition}</if>
+ <if test="ruleDescription != null and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
+ <if test="state != null "> and state = #{state}</if>
+ <if test="deleted != null and deleted != ''"> and deleted = #{deleted}</if>
</where>
+ ORDER BY
+ order_num
</select>
-
- <select id="selectCheckRuleById" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
- select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description, tctr.weight, tctr.audit_state,tctr.check_template_id as templateId
- from t_check_rule tcr inner join t_check_template_rule tctr on tcr.id = tctr.check_rule_id
- where tcr.id = #{id} and tcr.state = 0
+
+ <select id="selectCheckRuleById" resultMap="CheckRuleResult">
+ <include refid="selectCheckRuleVo"/>
+ where id = #{id}
</select>
-
+
<insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
insert into t_check_rule
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">rule_name,</if>
- <if test="ruleDetail != null">rule_detail,</if>
+ <if test="ruleIndex != null">rule_index,</if>
<if test="ruleCategory != null">rule_category,</if>
- <if test="examineCategory != null">examine_category,</if>
+ <if test="ruleCondition != null">rule_condition,</if>
<if test="ruleDescription != null">rule_description,</if>
- <if test="state != null">state,</if>
- <if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="state != null">state,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">#{ruleName},</if>
<if test="ruleIndex != null">#{ruleIndex},</if>
<if test="ruleCategory != null">#{ruleCategory},</if>
- <if test="examineCategory != null">#{examineCategory},</if>
+ <if test="ruleCondition != null">#{ruleCondition},</if>
<if test="ruleDescription != null">#{ruleDescription},</if>
- <if test="state != null">#{state},</if>
- <if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="state != null">#{state},</if>
<if test="deleted != null">#{deleted},</if>
</trim>
</insert>
@@ -74,11 +76,10 @@
<if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
<if test="ruleIndex != null">rule_index = #{ruleIndex},</if>
<if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
- <if test="examineCategory != null">examine_category = #{examineCategory},</if>
+ <if test="ruleCondition != null">rule_condition = #{ruleCondition},</if>
<if test="ruleDescription != null">rule_description = #{ruleDescription},</if>
- <if test="state != null">state = #{state},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="state != null">state = #{state},</if>
<if test="deleted != null">deleted = #{deleted},</if>
</trim>
where id = #{id}
@@ -89,9 +90,9 @@
</delete>
<delete id="deleteCheckRuleByIds" >
- delete from t_check_rule where id in
+ delete from t_check_rule where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0