From ac4f0d8e61c545c74f287563765179696b51b856 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 五月 2025 17:21:49 +0800
Subject: [PATCH] 增加排班删除功能
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java | 15 ++++++++++-----
1 files changed, 10 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..1dc32c7 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
@@ -70,6 +70,11 @@
saveRel(schedule);
return scheduleDao.updateByPrimaryKeySelective(schedule);
}
+ @Transactional
+ public long delete(Long id) {
+ return this.scheduleRelDao.deleteByScheduleId(id);
+ }
+
private void saveRel(PrSchedule schedule) {
schedule.relList.forEach(rel -> validateRelData(rel, schedule));
@@ -106,8 +111,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 +130,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