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/ReportCustomV1ServiceDaoImplMapper.xml | 151 ++++++++++++++++++++++++-------------------------
1 files changed, 74 insertions(+), 77 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportCustomV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCustomV1ServiceDaoImplMapper.xml
index 60b442d..e330561 100644
--- a/java110-db/src/main/resources/mapper/report/ReportCustomV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCustomV1ServiceDaoImplMapper.xml
@@ -5,102 +5,99 @@
<mapper namespace="reportCustomV1ServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鎶ヨ〃缁勪欢淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveReportCustomInfo" parameterType="Map">
insert into report_custom(
-group_id,remark,title,custom_id,seq
-) values (
-#{groupId},#{remark},#{title},#{customId},#{seq}
-)
+ group_id,remark,title,custom_id,seq
+ ) values (
+ #{groupId},#{remark},#{title},#{customId},#{seq}
+ )
</insert>
-
<!-- 鏌ヨ鎶ヨ〃缁勪欢淇℃伅 add by wuxw 2018-07-03 -->
<select id="getReportCustomInfo" parameterType="Map" resultType="Map">
- select t.group_id,t.group_id groupId,t.remark,t.status_cd,t.status_cd statusCd,t.title,t.custom_id,t.custom_id customId,t.seq
-from report_custom t
-where 1 =1
-<if test="groupId !=null and groupId != ''">
- and t.group_id= #{groupId}
-</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="title !=null and title != ''">
- and t.title= #{title}
-</if>
-<if test="customId !=null and customId != ''">
- and t.custom_id= #{customId}
-</if>
-<if test="seq !=null and seq != ''">
- and t.seq= #{seq}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.group_id,t.group_id groupId,t.remark,t.status_cd,t.status_cd statusCd,t.title,t.custom_id,t.custom_id
+ customId,t.seq,cg.`name` groupName
+ from report_custom t
+ left join report_custom_group cg on t.group_id = cg.group_id and cg.status_cd = '0'
+ where 1 =1
+ <if test="groupId !=null and groupId != ''">
+ and t.group_id= #{groupId}
+ </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="title !=null and title != ''">
+ and t.title= #{title}
+ </if>
+ <if test="customId !=null and customId != ''">
+ and t.custom_id= #{customId}
+ </if>
+ <if test="seq !=null and seq != ''">
+ and t.seq= #{seq}
+ </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="updateReportCustomInfo" parameterType="Map">
- update report_custom t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="groupId !=null and groupId != ''">
-, t.group_id= #{groupId}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
-<if test="title !=null and title != ''">
-, t.title= #{title}
-</if>
-<if test="seq !=null and seq != ''">
-, t.seq= #{seq}
-</if>
- where 1=1 <if test="customId !=null and customId != ''">
-and t.custom_id= #{customId}
-</if>
+ update report_custom t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="groupId !=null and groupId != ''">
+ , t.group_id= #{groupId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ <if test="title !=null and title != ''">
+ , t.title= #{title}
+ </if>
+ <if test="seq !=null and seq != ''">
+ , t.seq= #{seq}
+ </if>
+ where 1=1
+ <if test="customId !=null and customId != ''">
+ and t.custom_id= #{customId}
+ </if>
</update>
<!-- 鏌ヨ鎶ヨ〃缁勪欢鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryReportCustomsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from report_custom t
-where 1 =1
-<if test="groupId !=null and groupId != ''">
- and t.group_id= #{groupId}
-</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="title !=null and title != ''">
- and t.title= #{title}
-</if>
-<if test="customId !=null and customId != ''">
- and t.custom_id= #{customId}
-</if>
-<if test="seq !=null and seq != ''">
- and t.seq= #{seq}
-</if>
+ <select id="queryReportCustomsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from report_custom t
+ where 1 =1
+ <if test="groupId !=null and groupId != ''">
+ and t.group_id= #{groupId}
+ </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="title !=null and title != ''">
+ and t.title= #{title}
+ </if>
+ <if test="customId !=null and customId != ''">
+ and t.custom_id= #{customId}
+ </if>
+ <if test="seq !=null and seq != ''">
+ and t.seq= #{seq}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0