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/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
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;
}
}
}
--
Gitblit v1.9.3