From feb290a268428fec3f331d09c51894de5728ebc1 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 16:13:04 +0800
Subject: [PATCH] fix order test error
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 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 a7c5ec4..2df51e4 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
@@ -1,10 +1,13 @@
package com.dy.pmsProduct.schedule;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pmsGlobal.daoBa.BaPrivilegeMapper;
+import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrScheduleMapper;
import com.dy.pmsGlobal.daoPr.PrScheduleRelMapper;
+import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrSchedule;
import com.dy.pmsGlobal.pojoPr.PrScheduleRel;
@@ -25,39 +28,53 @@
private PrScheduleRelMapper scheduleRelDao;
private PrAssemblyPlanMapper assemblyPlanDao;
private PltStationMapper stationDao;
+ private BaUserMapper baUserDao;
+
@Autowired
public void setStationDao(PltStationMapper stationDao) {
this.stationDao = stationDao;
}
+
@Autowired
public void setScheduleRelDao(PrScheduleRelMapper scheduleRelDao) {
this.scheduleRelDao = scheduleRelDao;
}
+
@Autowired
public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
this.assemblyPlanDao = assemblyPlanDao;
}
+
@Autowired
public void setScheduleDao(PrScheduleMapper scheduleDao) {
this.scheduleDao = scheduleDao;
}
+
+ @Autowired
+ private void setBaUserMapper(BaUserMapper baUserDao) {
+ this.baUserDao = baUserDao;
+ }
+
@Transactional
public int save(PrSchedule schedule) {
int count = scheduleDao.insertSelective(schedule);
saveRel(schedule);
return count;
}
+
@Transactional
public int update(PrSchedule schedule) {
scheduleRelDao.deleteByScheduleId(schedule.id);
saveRel(schedule);
return scheduleDao.updateByPrimaryKeySelective(schedule);
}
+
private void saveRel(PrSchedule schedule) {
- schedule.relList.forEach(rel ->validateRelData(rel, schedule));
+ schedule.relList.forEach(rel -> validateRelData(rel, schedule));
schedule.relList.forEach(rel -> scheduleRelDao.insertSelective(rel));
}
- private void validateRelData(PrScheduleRel rel,PrSchedule schedule) {
+
+ private void validateRelData(PrScheduleRel rel, PrSchedule schedule) {
validatePlan(rel);
validateStation(rel);
rel.scheduleId = schedule.id;
@@ -87,11 +104,16 @@
return scheduleDao.selectByPrimaryKey(id);
}
+ public List<BaUser> selectById() {
+ List<BaUser> userList = baUserDao.getUserList();
+ return userList;
+ }
+
public QueryResultVo<List<PrSchedule>> selectSome(QueryVo vo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
//鏌ヨ绗﹀悎鏉′欢鐨勮褰曟�绘暟
Long itemTotal = scheduleDao.selectSomeCount(params);
- QueryResultVo<List<PrSchedule>> rsVo = new QueryResultVo<>(vo.pageSize, vo.pageCurr) ;
+ QueryResultVo<List<PrSchedule>> rsVo = new QueryResultVo<>(vo.pageSize, vo.pageCurr);
//璁＄畻鍒嗛〉绛変俊鎭�
rsVo.calculateAndSet(itemTotal, params);
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
@@ -100,8 +122,7 @@
}
public List<Map<String, Object>> selectPlan(QueryVo vo) {
- List<Map<String,Object>> list = assemblyPlanDao.selectByPlanName(vo.planName);
-
+ List<Map<String, Object>> list = assemblyPlanDao.selectByPlanName(vo.planName);
return list;
}
--
Gitblit v1.8.0