mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排班日历的显示顺序调整

Browse Source
This commit is contained in:
JinLu.Yin 2022-06-12 23:01:54 +08:00
parent 3f0973f90b
commit 8b112a636a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamshiftServiceImpl.java
View File

@ -232,7 +232,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanA.setTeamName(teams.get(0).getTeamName()); beanA.setTeamName(teams.get(0).getTeamName());
beanA.setShiftId(shifts.get(1).getShiftId()); beanA.setShiftId(shifts.get(1).getShiftId());
beanA.setShiftName(shifts.get(1).getShiftName()); beanA.setShiftName(shifts.get(1).getShiftName());
beanA.setOrderNum(1L); beanA.setOrderNum(2L);
saveTeamShift(beanA); saveTeamShift(beanA);
//B组上白班 //B组上白班
CalTeamshift beanB = new CalTeamshift(); CalTeamshift beanB = new CalTeamshift();
@ -244,7 +244,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanB.setTeamName(teams.get(1).getTeamName()); beanB.setTeamName(teams.get(1).getTeamName());
beanB.setShiftId(shifts.get(0).getShiftId()); beanB.setShiftId(shifts.get(0).getShiftId());
beanB.setShiftName(shifts.get(0).getShiftName()); beanB.setShiftName(shifts.get(0).getShiftName());
beanB.setOrderNum(2L); beanB.setOrderNum(1L);
saveTeamShift(beanB); saveTeamShift(beanB);
} }
} }
@ -286,7 +286,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanC.setTeamName(teams.get(2).getTeamName()); beanC.setTeamName(teams.get(2).getTeamName());
beanC.setShiftId(shifts.get(2).getShiftId()); beanC.setShiftId(shifts.get(2).getShiftId());
beanC.setShiftName(shifts.get(2).getShiftName()); beanC.setShiftName(shifts.get(2).getShiftName());
beanC.setOrderNum(2L); beanC.setOrderNum(3L);
saveTeamShift(beanC); saveTeamShift(beanC);
}else if(shiftIndex%2 == 1){ }else if(shiftIndex%2 == 1){
//A组上中班 //A组上中班
@ -299,7 +299,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanA.setTeamName(teams.get(0).getTeamName()); beanA.setTeamName(teams.get(0).getTeamName());
beanA.setShiftId(shifts.get(1).getShiftId()); beanA.setShiftId(shifts.get(1).getShiftId());
beanA.setShiftName(shifts.get(1).getShiftName()); beanA.setShiftName(shifts.get(1).getShiftName());
beanA.setOrderNum(1L); beanA.setOrderNum(2L);
saveTeamShift(beanA); saveTeamShift(beanA);
//B组上夜班 //B组上夜班
CalTeamshift beanB = new CalTeamshift(); CalTeamshift beanB = new CalTeamshift();
@ -311,7 +311,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanB.setTeamName(teams.get(1).getTeamName()); beanB.setTeamName(teams.get(1).getTeamName());
beanB.setShiftId(shifts.get(2).getShiftId()); beanB.setShiftId(shifts.get(2).getShiftId());
beanB.setShiftName(shifts.get(2).getShiftName()); beanB.setShiftName(shifts.get(2).getShiftName());
beanB.setOrderNum(2L); beanB.setOrderNum(3L);
saveTeamShift(beanB); saveTeamShift(beanB);
//C组上白班 //C组上白班
CalTeamshift beanC = new CalTeamshift(); CalTeamshift beanC = new CalTeamshift();
@ -323,7 +323,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanC.setTeamName(teams.get(2).getTeamName()); beanC.setTeamName(teams.get(2).getTeamName());
beanC.setShiftId(shifts.get(0).getShiftId()); beanC.setShiftId(shifts.get(0).getShiftId());
beanC.setShiftName(shifts.get(0).getShiftName()); beanC.setShiftName(shifts.get(0).getShiftName());
beanC.setOrderNum(2L); beanC.setOrderNum(1L);
saveTeamShift(beanC); saveTeamShift(beanC);
}else{ }else{
//A组上夜班 //A组上夜班
@ -336,7 +336,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanA.setTeamName(teams.get(0).getTeamName()); beanA.setTeamName(teams.get(0).getTeamName());
beanA.setShiftId(shifts.get(2).getShiftId()); beanA.setShiftId(shifts.get(2).getShiftId());
beanA.setShiftName(shifts.get(2).getShiftName()); beanA.setShiftName(shifts.get(2).getShiftName());
beanA.setOrderNum(1L); beanA.setOrderNum(3L);
saveTeamShift(beanA); saveTeamShift(beanA);
//B组上白班 //B组上白班
CalTeamshift beanB = new CalTeamshift(); CalTeamshift beanB = new CalTeamshift();
@ -348,7 +348,7 @@ public class CalTeamshiftServiceImpl implements ICalTeamshiftService
beanB.setTeamName(teams.get(1).getTeamName()); beanB.setTeamName(teams.get(1).getTeamName());
beanB.setShiftId(shifts.get(0).getShiftId()); beanB.setShiftId(shifts.get(0).getShiftId());
beanB.setShiftName(shifts.get(0).getShiftName()); beanB.setShiftName(shifts.get(0).getShiftName());
beanB.setOrderNum(2L); beanB.setOrderNum(1L);
saveTeamShift(beanB); saveTeamShift(beanB);
//C组上中班 //C组上中班
CalTeamshift beanC = new CalTeamshift(); CalTeamshift beanC = new CalTeamshift();