From 65416a668870cb819c004f8bdd9089e1f8f2b2e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:00 +0800
Subject: [PATCH] MOM系统-8-28
---
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 2 --
inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml | 2 ++
2 files changed, 2 insertions(+), 2 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 b17c527..55435c5 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
@@ -47,8 +47,6 @@
@ApiOperation(value = "璁￠噺璁″垝-->鏂板鎸夐挳")
@PostMapping("/add_plan")
public Result<?> addMeteringPlan(@RequestHeader("token") String token, @Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
- MyUtil.PrintLog(meteringPlan.toString());
-
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
String id = data.get("id").replaceAll("\"", "");
meteringPlan.setFounder(Integer.valueOf(id));
diff --git a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 758a528..5e9f9db 100644
--- a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -30,10 +30,12 @@
<if test="meteringUnit != null and meteringUnit != ''">
AND m.`plan_unit` LIKE CONCAT('%', #{meteringUnit}, '%')
</if>
+ ORDER BY m.create_time DESC
LIMIT #{pageNo}, #{pageSize}) s
LEFT JOIN measure_ledger l
ON l.`measure_plan_id` = s.`id`
WHERE (l.`state` = 1 OR l.`state` IS NULL)
+ ORDER BY s.createTime DESC
</select>
<select id="selectIdPlan" resultType="map">
--
Gitblit v1.9.3