From b1a41509684c3823d41ec1c184f6a5f7ba49dfb7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 07 四月 2024 18:01:10 +0800
Subject: [PATCH] 考核规则
---
ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
index b24f9a0..a940b37 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
@@ -7,11 +7,10 @@
<resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
<result property="id" column="id" />
<result property="ruleName" column="rule_name" />
- <result property="ruleDetail" column="rule_detail" />
+ <result property="ruleIndex" column="rule_index" />
<result property="ruleCategory" column="rule_category" />
<result property="examineCategory" column="examine_category" />
<result property="ruleDescription" column="rule_description" />
- <result property="auditState" column="audit_state" />
<result property="state" column="state" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
@@ -19,24 +18,28 @@
</resultMap>
<sql id="selectCheckRuleVo">
- select id, rule_name, rule_detail, rule_category, examine_category, rule_description, audit_state, state, create_time, update_time, deleted from t_check_rule
+ select id, rule_name, rule_index, rule_category, examine_category, rule_description, state, create_time, update_time, deleted from t_check_rule
</sql>
- <select id="selectCheckRuleList" resultMap="CheckRuleResult">
- <include refid="selectCheckRuleVo"/>
- <where>
- <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
- <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
- <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
- <if test="ruleDescription != null and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
- <if test="auditState != null "> and audit_state = #{auditState}</if>
- <if test="state != null "> and state = #{state}</if>
+ <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
+ <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>
</where>
</select>
- <select id="selectCheckRuleById" resultMap="CheckRuleResult">
- <include refid="selectCheckRuleVo"/>
- where id = #{id}
+ <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>
<insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
@@ -47,7 +50,6 @@
<if test="ruleCategory != null">rule_category,</if>
<if test="examineCategory != null">examine_category,</if>
<if test="ruleDescription != null">rule_description,</if>
- <if test="auditState != null">audit_state,</if>
<if test="state != null">state,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
@@ -55,11 +57,10 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">#{ruleName},</if>
- <if test="ruleDetail != null">#{ruleDetail},</if>
+ <if test="ruleIndex != null">#{ruleIndex},</if>
<if test="ruleCategory != null">#{ruleCategory},</if>
<if test="examineCategory != null">#{examineCategory},</if>
<if test="ruleDescription != null">#{ruleDescription},</if>
- <if test="auditState != null">#{auditState},</if>
<if test="state != null">#{state},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -71,11 +72,10 @@
update t_check_rule
<trim prefix="SET" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
- <if test="ruleDetail != null">rule_detail = #{ruleDetail},</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="ruleDescription != null">rule_description = #{ruleDescription},</if>
- <if test="auditState != null">audit_state = #{auditState},</if>
<if test="state != null">state = #{state},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
--
Gitblit v1.8.0