From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml |  189 +++++++++++++++++++++++-----------------------
 1 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml
index e3f2019..3acb1f5 100644
--- a/java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCustomComponentConditionV1ServiceDaoImplMapper.xml
@@ -5,120 +5,119 @@
 <mapper namespace="reportCustomComponentConditionV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鎶ヨ〃缁勪欢鏉′欢淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveReportCustomComponentConditionInfo" parameterType="Map">
         insert into report_custom_component_condition(
-component_id,condition_id,param,name,remark,holdpace,type
-) values (
-#{componentId},#{conditionId},#{param},#{name},#{remark},#{holdpace},#{type}
-)
+        component_id,condition_id,param,name,remark,holdpace,type,seq
+        ) values (
+        #{componentId},#{conditionId},#{param},#{name},#{remark},#{holdpace},#{type},#{seq}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鎶ヨ〃缁勪欢鏉′欢淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getReportCustomComponentConditionInfo" parameterType="Map" resultType="Map">
-        select  t.component_id,t.component_id componentId,t.condition_id,t.condition_id conditionId,t.param,t.name,t.remark,t.status_cd,t.status_cd statusCd,t.holdpace,t.type 
-from report_custom_component_condition t 
-where 1 =1 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="conditionId !=null and conditionId != ''">
-   and t.condition_id= #{conditionId}
-</if> 
-<if test="param !=null and param != ''">
-   and t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-   and t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.component_id,t.component_id componentId,t.condition_id,t.condition_id
+        conditionId,t.param,t.name,t.remark,t.status_cd,t.status_cd statusCd,t.holdpace,t.type,t.seq
+        from report_custom_component_condition t
+        where 1 =1
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
+        <if test="param !=null and param != ''">
+            and t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            and t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
+        order by t.seq
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鎶ヨ〃缁勪欢鏉′欢淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateReportCustomComponentConditionInfo" parameterType="Map">
-        update  report_custom_component_condition t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="componentId !=null and componentId != ''">
-, t.component_id= #{componentId}
-</if> 
-<if test="param !=null and param != ''">
-, t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-, t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-, t.type= #{type}
-</if> 
- where 1=1 <if test="conditionId !=null and conditionId != ''">
-and t.condition_id= #{conditionId}
-</if> 
+        update report_custom_component_condition t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="componentId !=null and componentId != ''">
+            , t.component_id= #{componentId}
+        </if>
+        <if test="param !=null and param != ''">
+            , t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            , t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            , t.type= #{type}
+        </if>
+        <if test="seq !=null and seq != ''">
+            , t.seq= #{seq}
+        </if>
+        where 1=1
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鎶ヨ〃缁勪欢鏉′欢鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryReportCustomComponentConditionsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from report_custom_component_condition t 
-where 1 =1 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="conditionId !=null and conditionId != ''">
-   and t.condition_id= #{conditionId}
-</if> 
-<if test="param !=null and param != ''">
-   and t.param= #{param}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="holdpace !=null and holdpace != ''">
-   and t.holdpace= #{holdpace}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
+    <select id="queryReportCustomComponentConditionsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from report_custom_component_condition t
+        where 1 =1
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="conditionId !=null and conditionId != ''">
+            and t.condition_id= #{conditionId}
+        </if>
+        <if test="param !=null and param != ''">
+            and t.param= #{param}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="holdpace !=null and holdpace != ''">
+            and t.holdpace= #{holdpace}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0