From 24417dad13f370cca36f6f52208daa0404de4dd6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 四月 2024 14:26:02 +0800
Subject: [PATCH] 新核算

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

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index a742e0d..ae065f9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -11,10 +11,11 @@
         <result property="parentId"    column="parent_id"    />
         <result property="unitId"    column="unit_id"    />
         <result property="value"    column="value"    />
+        <result property="description"    column="description"    />
     </resultMap>
 
     <sql id="selectCalculateRuleVo">
-        select id, name, template_id, parent_id, unit_id, value from t_calculate_rule
+        select id, name, template_id, parent_id, unit_id, value, description from t_calculate_rule
     </sql>
 
     <select id="selectCalculateRuleList" resultMap="CalculateRuleResult">
@@ -22,16 +23,19 @@
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="templateId != null "> and template_id = #{templateId}</if>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="unitId != null "> and unit_id = #{unitId}</if>
+            <if test="value != null "> and value = #{value}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
         </where>
     </select>
     
-    <select id="selectCalculateRuleById"  resultMap="CalculateRuleResult">
+    <select id="selectCalculateRuleById" resultMap="CalculateRuleResult">
         <include refid="selectCalculateRuleVo"/>
         where id = #{id}
     </select>
         
-    <insert id="insertCalculateRule"  useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCalculateRule" useGeneratedKeys="true" keyProperty="id">
         insert into t_calculate_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
@@ -39,6 +43,7 @@
             <if test="parentId != null">parent_id,</if>
             <if test="unitId != null">unit_id,</if>
             <if test="value != null">value,</if>
+            <if test="description != null">description,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -46,6 +51,7 @@
             <if test="parentId != null">#{parentId},</if>
             <if test="unitId != null">#{unitId},</if>
             <if test="value != null">#{value},</if>
+            <if test="description != null">#{description},</if>
          </trim>
     </insert>
 
@@ -57,15 +63,16 @@
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="unitId != null">unit_id = #{unitId},</if>
             <if test="value != null">value = #{value},</if>
+            <if test="description != null">description = #{description},</if>
         </trim>
         where id = #{id}
     </update>
 
-    <delete id="deleteCalculateRuleById">
+    <delete id="deleteCalculateRuleById" parameterType="Long">
         delete from t_calculate_rule where id = #{id}
     </delete>
 
-    <delete id="deleteCalculateRuleByIds" >
+    <delete id="deleteCalculateRuleByIds" parameterType="String">
         delete from t_calculate_rule where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

--
Gitblit v1.8.0