From 110cf37e66ad349e205890c0d5965ccc5fffd140 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 18 八月 2023 17:27:26 +0800
Subject: [PATCH] MOM系统-8-18计量管理版本一修改
---
inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 7fc217e..758a528 100644
--- a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -9,6 +9,7 @@
<result property="founder" column="founder"/>
<result property="personCharge" column="personCharge"/>
<result property="createTime" column="createTime"/>
+ <result property="planUnit" column="plan_unit"/>
<collection property="result" resultMap="selectMeteringTableTwoMap" javaType="List"/>
</resultMap>
@@ -18,14 +19,21 @@
<select id="selectMeteringTable" resultMap="selectMeteringTableMap">
SELECT s.*, IFNULL(l.`measure_result`, 'n') result
FROM (SELECT m.`id`, m.`plan_number`, CONCAT(m.`plan_date_begin`, ' ~ ', m.`plan_date_end`) planDate,
- s.`name` founder, u.`name` personCharge, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime
+ s.`name` founder, u.`name` personCharge, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime, m.`plan_unit`
FROM metering_plan m, `user` u, `user` s
WHERE u.`id` = m.`founder`
AND s.`id` = m.`person_charge`
+ AND m.`state` = 1
+ <if test="code != null and code != ''">
+ AND m.`plan_number` LIKE CONCAT('%', #{code}, '%')
+ </if>
+ <if test="meteringUnit != null and meteringUnit != ''">
+ AND m.`plan_unit` LIKE CONCAT('%', #{meteringUnit}, '%')
+ </if>
LIMIT #{pageNo}, #{pageSize}) s
LEFT JOIN measure_ledger l
ON l.`measure_plan_id` = s.`id`
- WHERE l.`state` = 1
+ WHERE (l.`state` = 1 OR l.`state` IS NULL)
</select>
<select id="selectIdPlan" resultType="map">
@@ -49,4 +57,16 @@
AND p.`state` = 1
AND p.`id` = #{measureId}
</select>
+
+ <select id="selectPlanId" resultType="map">
+ SELECT p.`plan_number`, u.`name` founder, r.`name` person_charge, CONCAT(p.`plan_date_begin`, ' ~ ', p.`plan_date_end`) planTime,
+ DATE_FORMAT(p.`create_time`, '%Y-%m-%d') createTime, p.`plan_unit`
+ FROM metering_plan p, `user` u, `user` r, measure_ledger l
+ WHERE r.`id` = p.`person_charge`
+ AND u.`id` = p.`founder`
+ AND p.`state` = 1
+ AND l.`state` = 1
+ AND p.`id` = l.`measure_plan_id`
+ AND l.`id` = #{measureId}
+ </select>
</mapper>
--
Gitblit v1.9.3