From 4f3b666cd625381e4acb07d8ae4d68ae9554b1b8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 06 十一月 2023 18:12:49 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/common/MeterMachineFactoryV1ServiceDaoImplMapper.xml |  142 +++++++++++++++++++++--------------------------
 1 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/MeterMachineFactoryV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MeterMachineFactoryV1ServiceDaoImplMapper.xml
index 1bd37a7..b142701 100644
--- a/java110-db/src/main/resources/mapper/common/MeterMachineFactoryV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MeterMachineFactoryV1ServiceDaoImplMapper.xml
@@ -1,97 +1,81 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="meterMachineFactoryV1ServiceDaoImpl">
 
-
-
-
-
     <!-- 淇濆瓨鐢佃〃鍘傚淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveMeterMachineFactoryInfo" parameterType="Map">
-        insert into meter_machine_factory(
-factory_id,factory_name,remark,bean_impl
-) values (
-#{factoryId},#{factoryName},#{remark},#{beanImpl}
-)
+        insert into meter_machine_factory(factory_id, factory_name, remark, bean_impl)
+        values (#{factoryId}, #{factoryName}, #{remark}, #{beanImpl})
     </insert>
-
-
 
     <!-- 鏌ヨ鐢佃〃鍘傚淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getMeterMachineFactoryInfo" parameterType="Map" resultType="Map">
-        select  t.factory_id,t.factory_id factoryId,t.factory_name,t.factory_name factoryName,t.remark,t.status_cd,t.status_cd statusCd,t.bean_impl,t.bean_impl beanImpl 
-from meter_machine_factory t 
-where 1 =1 
-<if test="factoryId !=null and factoryId != ''">
-   and t.factory_id= #{factoryId}
-</if> 
-<if test="factoryName !=null and factoryName != ''">
-   and t.factory_name= #{factoryName}
-</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="beanImpl !=null and beanImpl != ''">
-   and t.bean_impl= #{beanImpl}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
+        select t.factory_id,t.factory_id factoryId,t.factory_name,t.factory_name
+        factoryName,t.remark,t.status_cd,t.status_cd statusCd,t.bean_impl,t.bean_impl beanImpl
+        from meter_machine_factory t
+        where 1 =1
+        <if test="factoryId !=null and factoryId != ''">
+            and t.factory_id= #{factoryId}
+        </if>
+        <if test="factoryName !=null and factoryName != ''">
+            and t.factory_name= #{factoryName}
+        </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="beanImpl !=null and beanImpl != ''">
+            and t.bean_impl= #{beanImpl}
+        </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="updateMeterMachineFactoryInfo" parameterType="Map">
-        update  meter_machine_factory t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="factoryName !=null and factoryName != ''">
-, t.factory_name= #{factoryName}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="beanImpl !=null and beanImpl != ''">
-, t.bean_impl= #{beanImpl}
-</if> 
- where 1=1 <if test="factoryId !=null and factoryId != ''">
-and t.factory_id= #{factoryId}
-</if> 
-
+        update meter_machine_factory t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="factoryName !=null and factoryName != ''">
+            , t.factory_name= #{factoryName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="beanImpl !=null and beanImpl != ''">
+            , t.bean_impl= #{beanImpl}
+        </if>
+        where 1=1
+        <if test="factoryId !=null and factoryId != ''">
+            and t.factory_id= #{factoryId}
+        </if>
     </update>
 
     <!-- 鏌ヨ鐢佃〃鍘傚鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryMeterMachineFactorysCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from meter_machine_factory t 
-where 1 =1 
-<if test="factoryId !=null and factoryId != ''">
-   and t.factory_id= #{factoryId}
-</if> 
-<if test="factoryName !=null and factoryName != ''">
-   and t.factory_name= #{factoryName}
-</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="beanImpl !=null and beanImpl != ''">
-   and t.bean_impl= #{beanImpl}
-</if> 
-
-
-     </select>
-
+    <select id="queryMeterMachineFactorysCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from meter_machine_factory t
+        where 1 =1
+        <if test="factoryId !=null and factoryId != ''">
+            and t.factory_id= #{factoryId}
+        </if>
+        <if test="factoryName !=null and factoryName != ''">
+            and t.factory_name= #{factoryName}
+        </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="beanImpl !=null and beanImpl != ''">
+            and t.bean_impl= #{beanImpl}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.8.0