From 6170908b69269ee14eae05787eafe682fda00eef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 八月 2023 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml b/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml
index c63deff..125e287 100644
--- a/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml
@@ -27,8 +27,7 @@
<select id="standingBook" resultType="map">
SELECT m.`id`, d.`code`, d.`name`, m.`measuring_range`, m.`measure_period`, m.`measure_result`, DATE_FORMAT(m.`measure_date`, '%Y-%m-%d') measureDate,
DATE_FORMAT(m.`validity_end`, '%Y-%m-%d') validityEnd, u.`name` founder, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime, p.`plan_unit`,
- r.`name` personCharge, p.`plan_number`, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') createTime,
- CONCAT(p.`plan_date_begin`, ' ~ ', p.`plan_date_end`) planTime
+ r.`name` personCharge, m.`measure_number`
FROM measure_ledger m, device d, metering_plan p, `user` u, `user` r
WHERE m.`state` = 1
AND m.`id` = #{measureId}
--
Gitblit v1.9.3