From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug

---
 java110-db/src/main/resources/mapper/report/ReportCustomComponentV1ServiceDaoImplMapper.xml |  207 +++++++++++++++++++++++++--------------------------
 1 files changed, 101 insertions(+), 106 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportCustomComponentV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCustomComponentV1ServiceDaoImplMapper.xml
index e4afeea..f39eb5f 100644
--- a/java110-db/src/main/resources/mapper/report/ReportCustomComponentV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCustomComponentV1ServiceDaoImplMapper.xml
@@ -5,129 +5,124 @@
 <mapper namespace="reportCustomComponentV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鎶ヨ〃缁勪欢淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveReportCustomComponentInfo" parameterType="Map">
         insert into report_custom_component(
-component_type,component_id,java_script,name,component_group,remark,query_model,sql
-) values (
-#{componentType},#{componentId},#{javaScript},#{name},#{componentGroup},#{remark},#{queryModel},#{sql}
-)
+        component_type,component_id,java_script,name,component_group,remark,query_model,component_sql
+        ) values (
+        #{componentType},#{componentId},#{javaScript},#{name},#{componentGroup},#{remark},#{queryModel},#{componentSql}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鎶ヨ〃缁勪欢淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getReportCustomComponentInfo" parameterType="Map" resultType="Map">
-        select  t.component_type,t.component_type componentType,t.component_id,t.component_id componentId,t.java_script,t.java_script javaScript,t.name,t.component_group,t.component_group componentGroup,t.remark,t.status_cd,t.status_cd statusCd,t.query_model,t.query_model queryModel,t.sql 
-from report_custom_component t 
-where 1 =1 
-<if test="componentType !=null and componentType != ''">
-   and t.component_type= #{componentType}
-</if> 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="javaScript !=null and javaScript != ''">
-   and t.java_script= #{javaScript}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="componentGroup !=null and componentGroup != ''">
-   and t.component_group= #{componentGroup}
-</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="queryModel !=null and queryModel != ''">
-   and t.query_model= #{queryModel}
-</if> 
-<if test="sql !=null and sql != ''">
-   and t.sql= #{sql}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.component_type,t.component_type componentType,t.component_id,t.component_id
+        componentId,t.java_script,t.java_script javaScript,t.name,t.component_group,t.component_group
+        componentGroup,t.remark,t.status_cd,t.status_cd statusCd,t.query_model,t.query_model queryModel,t.component_sql componentSql
+        from report_custom_component t
+        where 1 =1
+        <if test="componentType !=null and componentType != ''">
+            and t.component_type= #{componentType}
+        </if>
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="javaScript !=null and javaScript != ''">
+            and t.java_script= #{javaScript}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="componentGroup !=null and componentGroup != ''">
+            and t.component_group= #{componentGroup}
+        </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="queryModel !=null and queryModel != ''">
+            and t.query_model= #{queryModel}
+        </if>
+        <if test="componentSql !=null and componentSql != ''">
+            and t.component_sql= #{componentSql}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鎶ヨ〃缁勪欢淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateReportCustomComponentInfo" parameterType="Map">
-        update  report_custom_component t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="componentType !=null and componentType != ''">
-, t.component_type= #{componentType}
-</if> 
-<if test="javaScript !=null and javaScript != ''">
-, t.java_script= #{javaScript}
-</if> 
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if> 
-<if test="componentGroup !=null and componentGroup != ''">
-, t.component_group= #{componentGroup}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="queryModel !=null and queryModel != ''">
-, t.query_model= #{queryModel}
-</if> 
-<if test="sql !=null and sql != ''">
-, t.sql= #{sql}
-</if> 
- where 1=1 <if test="componentId !=null and componentId != ''">
-and t.component_id= #{componentId}
-</if> 
+        update report_custom_component t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="componentType !=null and componentType != ''">
+            , t.component_type= #{componentType}
+        </if>
+        <if test="javaScript !=null and javaScript != ''">
+            , t.java_script= #{javaScript}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="componentGroup !=null and componentGroup != ''">
+            , t.component_group= #{componentGroup}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="queryModel !=null and queryModel != ''">
+            , t.query_model= #{queryModel}
+        </if>
+        <if test="componentSql !=null and componentSql != ''">
+            , t.component_sql= #{componentSql}
+        </if>
+        where 1=1
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鎶ヨ〃缁勪欢鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryReportCustomComponentsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from report_custom_component t 
-where 1 =1 
-<if test="componentType !=null and componentType != ''">
-   and t.component_type= #{componentType}
-</if> 
-<if test="componentId !=null and componentId != ''">
-   and t.component_id= #{componentId}
-</if> 
-<if test="javaScript !=null and javaScript != ''">
-   and t.java_script= #{javaScript}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="componentGroup !=null and componentGroup != ''">
-   and t.component_group= #{componentGroup}
-</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="queryModel !=null and queryModel != ''">
-   and t.query_model= #{queryModel}
-</if> 
-<if test="sql !=null and sql != ''">
-   and t.sql= #{sql}
-</if> 
-
-
-     </select>
+    <select id="queryReportCustomComponentsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from report_custom_component t
+        where 1 =1
+        <if test="componentType !=null and componentType != ''">
+            and t.component_type= #{componentType}
+        </if>
+        <if test="componentId !=null and componentId != ''">
+            and t.component_id= #{componentId}
+        </if>
+        <if test="javaScript !=null and javaScript != ''">
+            and t.java_script= #{javaScript}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="componentGroup !=null and componentGroup != ''">
+            and t.component_group= #{componentGroup}
+        </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="queryModel !=null and queryModel != ''">
+            and t.query_model= #{queryModel}
+        </if>
+        <if test="componentSql !=null and componentSql != ''">
+            and t.component_sql= #{componentSql}
+        </if>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0