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/common/MeterMachineFactorySpecV1ServiceDaoImplMapper.xml | 144 +++++++++++++++++++++++++----------------------
1 files changed, 76 insertions(+), 68 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/MeterMachineFactorySpecV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MeterMachineFactorySpecV1ServiceDaoImplMapper.xml
index dc66861..830c060 100644
--- a/java110-db/src/main/resources/mapper/common/MeterMachineFactorySpecV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MeterMachineFactorySpecV1ServiceDaoImplMapper.xml
@@ -5,93 +5,101 @@
<mapper namespace="meterMachineFactorySpecV1ServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鐢佃〃鍘傚鍙傛暟淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveMeterMachineFactorySpecInfo" parameterType="Map">
insert into meter_machine_factory_spec(
-spec_id,spec_name,factory_id,remark
-) values (
-#{specId},#{specName},#{factoryId},#{remark}
-)
+ spec_id,spec_name,factory_id,remark
+ ) values (
+ #{specId},#{specName},#{factoryId},#{remark}
+ )
</insert>
-
<!-- 鏌ヨ鐢佃〃鍘傚鍙傛暟淇℃伅 add by wuxw 2018-07-03 -->
<select id="getMeterMachineFactorySpecInfo" parameterType="Map" resultType="Map">
- select t.spec_id,t.spec_id specId,t.spec_name,t.spec_name specName,t.factory_id,t.factory_id factoryId,t.status_cd,t.status_cd statusCd,t.remark
-from meter_machine_factory_spec t
-where 1 =1
-<if test="specId !=null and specId != ''">
- and t.spec_id= #{specId}
-</if>
-<if test="specName !=null and specName != ''">
- and t.spec_name= #{specName}
-</if>
-<if test="factoryId !=null and factoryId != ''">
- and t.factory_id= #{factoryId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.spec_id,t.spec_id specId,t.spec_name,t.spec_name specName,t.factory_id,t.factory_id
+ factoryId,t.status_cd,t.status_cd statusCd,t.remark
+ from meter_machine_factory_spec t
+ where 1 =1
+ <if test="specId !=null and specId != ''">
+ and t.spec_id= #{specId}
+ </if>
+ <if test="specName !=null and specName != ''">
+ and t.spec_name= #{specName}
+ </if>
+ <if test="factoryId !=null and factoryId != ''">
+ and t.factory_id= #{factoryId}
+ </if>
+ <if test="factoryIds !=null">
+ and t.factory_id in
+ <foreach collection="factoryIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </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="updateMeterMachineFactorySpecInfo" parameterType="Map">
- update meter_machine_factory_spec t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="specName !=null and specName != ''">
-, t.spec_name= #{specName}
-</if>
-<if test="factoryId !=null and factoryId != ''">
-, t.factory_id= #{factoryId}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
- where 1=1 <if test="specId !=null and specId != ''">
-and t.spec_id= #{specId}
-</if>
+ update meter_machine_factory_spec t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="specName !=null and specName != ''">
+ , t.spec_name= #{specName}
+ </if>
+ <if test="factoryId !=null and factoryId != ''">
+ , t.factory_id= #{factoryId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ where 1=1
+ <if test="specId !=null and specId != ''">
+ and t.spec_id= #{specId}
+ </if>
</update>
<!-- 鏌ヨ鐢佃〃鍘傚鍙傛暟鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryMeterMachineFactorySpecsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from meter_machine_factory_spec t
-where 1 =1
-<if test="specId !=null and specId != ''">
- and t.spec_id= #{specId}
-</if>
-<if test="specName !=null and specName != ''">
- and t.spec_name= #{specName}
-</if>
-<if test="factoryId !=null and factoryId != ''">
- and t.factory_id= #{factoryId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
+ <select id="queryMeterMachineFactorySpecsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from meter_machine_factory_spec t
+ where 1 =1
+ <if test="specId !=null and specId != ''">
+ and t.spec_id= #{specId}
+ </if>
+ <if test="specName !=null and specName != ''">
+ and t.spec_name= #{specName}
+ </if>
+ <if test="factoryId !=null and factoryId != ''">
+ and t.factory_id= #{factoryId}
+ </if>
+ <if test="factoryIds !=null">
+ and t.factory_id in
+ <foreach collection="factoryIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0