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'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java | 24 +++++++----
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 7 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java | 2
inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml | 3 -
inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml | 24 +++++++++++-
inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java | 4 +
7 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
index afd2879..bf35b7b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
@@ -84,18 +84,21 @@
})
@GetMapping("/metering_table")
public Result<?> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit){
+ pageNo = (pageNo - 1) * pageSize;
Map<String, Object> maps = meteringPlanService.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
return Result.success(maps);
}
@ApiOperation(value = "璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�")
@ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "measureId", value = "璁￠噺Id", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "accountOrPlan", value = "true涓哄彴璐false涓鸿鍒�", dataTypeClass = Boolean.class, required = true),
})
@GetMapping("/list_record")
- public Result<?> standingBook(Integer measureId, Boolean accountOrPlan){
- Object maps = meteringPlanService.standingBook(measureId, accountOrPlan);
+ public Result<?> standingBook(Integer pageNo, Integer pageSize, Integer measureId, Boolean accountOrPlan){
+ Object maps = meteringPlanService.standingBook(pageNo, pageSize, measureId, accountOrPlan);
return Result.success(maps);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java
index f3afde4..a79a363 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java
@@ -20,7 +20,9 @@
List<Map<String, Object>> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit);
- List<Map<String, Object>> selectIdPlan(Integer measureId);
+ IPage<Map<String, Object>> selectIdPlan(Page<Object> page, Integer measureId);
Map<String, Object> selectIdPlanIdMessage(Integer measureId);
+
+ Map<String, Object> selectPlanId(Integer measureId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java
index f4759fa..06129d0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java
@@ -26,5 +26,5 @@
Map<String, Object> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit);
- Object standingBook(Integer measureId, Boolean accountOrPlan);
+ Object standingBook(Integer pageNo, Integer pageSize,Integer measureId, Boolean accountOrPlan);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java
index c9cbb3a..ae7a7a8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java
@@ -64,13 +64,13 @@
List<Map<String, Object>> mapList = meteringPlanMapper.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
if (!ObjectUtils.isEmpty(mapList)){
for (Map<String, Object> map : mapList){
- int statue = 1;
+ String statue = "y";
try {
List<Map<String, Object>> result = JackSonUtil.unmarshal(JackSonUtil.marshal(map.get("result")), List.class);
for (Map<String, Object> mapResult : result){
String result1 = mapResult.get("result").toString();
if (result1.equals("n")){
- statue = 0;
+ statue = "n";
break;
}
}
@@ -83,10 +83,10 @@
}
LambdaQueryWrapper<MeteringPlan> wrapper = new LambdaQueryWrapper<>();
if (!ObjectUtils.isEmpty(code)){
- wrapper.eq(MeteringPlan::getPlanNumber, code);
+ wrapper.like(MeteringPlan::getPlanNumber, code);
}
if (!ObjectUtils.isEmpty(meteringUnit)){
- wrapper.eq(MeteringPlan::getPlanUnit, meteringUnit);
+ wrapper.like(MeteringPlan::getPlanUnit, meteringUnit);
}
Long aLong = meteringPlanMapper.selectCount(wrapper);
Map<String, Object> map = new HashMap<>();
@@ -96,16 +96,22 @@
}
@Override
- public Object standingBook(Integer measureId, Boolean accountOrPlan) {
+ public Object standingBook(Integer pageNo, Integer pageSize,Integer measureId, Boolean accountOrPlan) {
if (accountOrPlan){
- return measureLedgerService.standingBook(measureId);
- } else {
- Map<String, Object> meteringPlan = meteringPlanMapper.selectIdPlanIdMessage(measureId);
- List<Map<String, Object>> mapList = meteringPlanMapper.selectIdPlan(measureId);
+ Map<String, Object> meteringPlan = meteringPlanMapper.selectPlanId(measureId);
+ List<Map<String, Object>> mapList = measureLedgerService.standingBook(measureId);
Map<String, Object> map = new HashMap<>();
map.put("top", meteringPlan);
map.put("table", mapList);
return map;
+ } else {
+ Map<String, Object> meteringPlan = meteringPlanMapper.selectIdPlanIdMessage(measureId);
+ IPage<Map<String, Object>> mapList = meteringPlanMapper.selectIdPlan(new Page<Object>(pageNo, pageSize), measureId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("top", meteringPlan);
+ map.put("total", mapList.getTotal());
+ map.put("table", mapList.getRecords());
+ return map;
}
}
}
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}
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>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 76e4c37..4d21f86 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -118,7 +118,7 @@
@Override
public List<Map<String, Object>> selectDeviceIdAndName() {
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(Device::getId, Device::getName);
+ wrapper.select(Device::getId, Device::getName, Device::getCode);
return deviceMapper.selectMaps(wrapper);
}
}
--
Gitblit v1.9.3