From 398007a3e6815bd9543a22fbfe53b1db882abbe9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 五月 2025 11:02:44 +0800
Subject: [PATCH] 排班设置时，关联查询生产任务，修改其中的排序算法，任务是倒序，流程结点是升序
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
index 5080bd1..5cf915e 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
@@ -106,8 +106,8 @@
return scheduleDao.selectByPrimaryKey(id);
}
- public List<BaUser> selectById() {
- List<BaUser> userList = baUserDao.getUserList();
+ public List<BaUser> selectAllUsers() {
+ List<BaUser> userList = baUserDao.selectAll();
return userList;
}
@@ -125,11 +125,11 @@
public List<JSONObject> selectPlan(QueryVo vo) {
List<JSONObject> list = assemblyPlanDao.selectByPlanName(vo.planName);
- Map<Long, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
+ Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
for(JSONObject item:list){
- Long planId = (Long) item.getObj("planId");
+ String planId = String.valueOf(item.getObj("planId"));
JSONObject innerObject = new JSONObject()
- .set("nodeId", item.getObj("nodeId"))
+ .set("nodeId", String.valueOf(item.getObj("nodeId")))
.set("content", item.getObj("content"));
if(map.containsKey(planId)){
JSONArray array = (JSONArray)map.get(planId).get("nodes");
--
Gitblit v1.8.0