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/MachineTypeV1ServiceDaoImplMapper.xml | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 153 insertions(+), 17 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/MachineTypeV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MachineTypeV1ServiceDaoImplMapper.xml
index 19ee2b7..98a96e9 100644
--- a/java110-db/src/main/resources/mapper/common/MachineTypeV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MachineTypeV1ServiceDaoImplMapper.xml
@@ -1,31 +1,131 @@
<?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="machineTypeV1ServiceDaoImpl">
-
<!-- 淇濆瓨璁惧绫诲瀷淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveMachineTypeInfo" parameterType="Map">
- insert into machine_type(
- machine_type_name,type_id,machine_type_cd,community_id
- ) values (
- #{machineTypeName},#{typeId},#{machineTypeCd},#{communityId}
- )
+ insert into machine_type(machine_type_name, type_id, machine_type_cd, community_id, parent_type_id, is_enable,
+ machine_type_code, unit, importance_level, seq, warranty_deadline, remark)
+ values (#{machineTypeName}, #{typeId}, #{machineTypeCd}, #{communityId}, #{parentTypeId}, #{isEnable},
+ #{machineTypeCode}, #{unit}, #{importanceLevel}, #{seq}, #{warrantyDeadline}, #{remark})
</insert>
+ <insert id="saveMachineTypeInfoSelective" parameterType="Map">
+ insert into machine_type
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="typeId != null">
+ type_id,
+ </if>
+ <if test="machineTypeName != null">
+ machine_type_name,
+ </if>
+ <if test="machineTypeCd != null">
+ machine_type_cd,
+ </if>
+ <if test="communityId != null">
+ community_id,
+ </if>
+ <if test="parentTypeId != null">
+ parent_type_id,
+ </if>
+ <if test="isEnable != null">
+ is_enable,
+ </if>
+ <if test="machineTypeCode != null">
+ machine_type_code,
+ </if>
+ <if test="unit != null">
+ unit,
+ </if>
+ <if test="importanceLevel != null">
+ importance_level,
+ </if>
+ <if test="seq != null ">
+ seq,
+ </if>
+ <if test="warrantyDeadline != null and warrantyDeadline!=''">
+ warranty_deadline,
+ </if>
+ <if test="remark != null and remark!=''">
+ remark,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="typeId != null">
+ #{typeId},
+ </if>
+ <if test="machineTypeName != null">
+ #{machineTypeName},
+ </if>
+ <if test="machineTypeCd != null">
+ #{machineTypeCd},
+ </if>
+ <if test="communityId != null">
+ #{communityId},
+ </if>
+ <if test="parentTypeId != null">
+ #{parentTypeId},
+ </if>
+ <if test="isEnable != null">
+ #{isEnable},
+ </if>
+ <if test="machineTypeCode != null">
+ #{machineTypeCode},
+ </if>
+ <if test="unit != null">
+ #{unit},
+ </if>
+ <if test="importanceLevel != null">
+ #{importanceLevel},
+ </if>
+ <if test="seq != null">
+ #{seq},
+ </if>
+ <if test="warrantyDeadline != null and warrantyDeadline!=''">
+ #{warrantyDeadline},
+ </if>
+ <if test="remark != null and remark!=''">
+ #{remark},
+ </if>
+ </trim>
+ </insert>
<!-- 鏌ヨ璁惧绫诲瀷淇℃伅 add by wuxw 2018-07-03 -->
<select id="getMachineTypeInfo" parameterType="Map" resultType="Map">
select t.machine_type_name,t.machine_type_name machineTypeName,t.type_id,t.type_id
- typeId,t.status_cd,t.status_cd statusCd,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.community_id communityId
+ typeId,t.status_cd,t.status_cd statusCd,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.community_id
+ communityId
+ ,t.parent_type_id,t.parent_type_id parentTypeId,t.is_enable isEnable,t.machine_type_code machineTypeCode,t.unit
+ unit,t.importance_level importanceLevel,t.seq seq,t.warranty_deadline warrantyDeadline,t.remark remark
from machine_type t
- where 1 =1
+ where 1 = 1
+ <if test="isEnable !=null and isEnable != ''">
+ and t.is_enable= #{isEnable}
+ </if>
+ <if test="machineTypeCode !=null and machineTypeCode != ''">
+ and t.machine_type_code= #{machineTypeCode}
+ </if>
+ <if test="importanceLevel !=null and importanceLevel != ''">
+ and t.importance_level= #{importanceLevel}
+ </if>
+ <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+ and t.warranty_deadline= #{warrantyDeadline}
+ </if>
+ <if test="seq !=null and seq != ''">
+ and t.seq= #{seq}
+ </if>
+ <if test="unit !=null and unit != ''">
+ and t.unit= #{unit}
+ </if>
<if test="machineTypeName !=null and machineTypeName != ''">
and t.machine_type_name= #{machineTypeName}
</if>
<if test="typeId !=null and typeId != ''">
and t.type_id= #{typeId}
+ </if>
+ <if test="parentTypeId !=null and parentTypeId != ''">
+ and t.parent_type_id= #{parentTypeId}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -36,13 +136,11 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- order by t.create_time desc
+ order by t.create_time desc, t.seq desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璁惧绫诲瀷淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateMachineTypeInfo" parameterType="Map">
@@ -59,11 +157,31 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
+ <if test="isEnable !=null and isEnable != ''">
+ , t.is_enable= #{isEnable}
+ </if>
+ <if test="machineTypeCode !=null and machineTypeCode != ''">
+ , t.machine_type_code= #{machineTypeCode}
+ </if>
+ <if test="importanceLevel !=null and importanceLevel != ''">
+ , t.importance_level= #{importanceLevel}
+ </if>
+ <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+ , t.warranty_deadline= #{warrantyDeadline}
+ </if>
+ <if test="seq !=null and seq != ''">
+ , t.seq= #{seq}
+ </if>
+ <if test="unit !=null and unit != ''">
+ , t.unit= #{unit}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
where 1=1
<if test="typeId !=null and typeId != ''">
and t.type_id= #{typeId}
</if>
-
</update>
<!-- 鏌ヨ璁惧绫诲瀷鏁伴噺 add by wuxw 2018-07-03 -->
@@ -71,11 +189,32 @@
select count(1) count
from machine_type t
where 1 =1
+ <if test="isEnable !=null and isEnable != ''">
+ and t.is_enable= #{isEnable}
+ </if>
+ <if test="machineTypeCode !=null and machineTypeCode != ''">
+ and t.machine_type_code= #{machineTypeCode}
+ </if>
+ <if test="importanceLevel !=null and importanceLevel != ''">
+ and t.importance_level= #{importanceLevel}
+ </if>
+ <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+ and t.warranty_deadline= #{warrantyDeadline}
+ </if>
+ <if test="seq !=null and seq != ''">
+ and t.seq= #{seq}
+ </if>
+ <if test="unit !=null and unit != ''">
+ and t.unit= #{unit}
+ </if>
<if test="machineTypeName !=null and machineTypeName != ''">
and t.machine_type_name= #{machineTypeName}
</if>
<if test="typeId !=null and typeId != ''">
and t.type_id= #{typeId}
+ </if>
+ <if test="parentTypeId !=null and parentTypeId != ''">
+ and t.parent_type_id= #{parentTypeId}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -86,8 +225,5 @@
<if test="machineTypeCd !=null and machineTypeCd != ''">
and t.machine_type_cd= #{machineTypeCd}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0