Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!561

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -73,6 +73,7 @@ import cn.timer.api.bean.kqgl.SpecialDate;
 import cn.timer.api.bean.kqgl.SystemShift;
 import cn.timer.api.bean.kqgl.SystemShift;
 import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
+import cn.timer.api.bean.kqmk.KqglAssoPbmx;
 import cn.timer.api.bean.kqmk.KqglAssoYhkqz;
 import cn.timer.api.bean.kqmk.KqglAssoYhkqz;
 import cn.timer.api.bean.kqmk.KqglAssoYhsb;
 import cn.timer.api.bean.kqmk.KqglAssoYhsb;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
@@ -354,8 +355,14 @@ public class AttController {
 				System.out.println(famt.format(dt));
 				System.out.println(famt.format(dt));
 				
 				
 				if(!(famt.format(dt)).equals(dastr)) {
 				if(!(famt.format(dt)).equals(dastr)) {
+					
 					xiugai = false;
 					xiugai = false;
 					for(int p=0;p<schedules.length;p++){
 					for(int p=0;p<schedules.length;p++){
+//						scheduleservice.deleteByPrimaryBykqzid(Integer.valueOf(attass.getAttgroupid()),ClockInTool.SunNovCST(String.valueOf(schedules[p].getData())));
+						
+						KqglAssoPbmx.builder().build().delete(new QueryWrapper<KqglAssoPbmx>().lambda().eq(KqglAssoPbmx::getUserid, schedules[p].getUserid()).eq(KqglAssoPbmx::getData, ClockInTool.SunNovCST(String.valueOf(schedules[p].getData())))
+								.eq(KqglAssoPbmx::getKqzid, Integer.valueOf(attass.getAttgroupid())));
+						
 						Schedule sch = new Schedule();
 						Schedule sch = new Schedule();
 						sch.setUserid(schedules[p].getUserid());//用户id 
 						sch.setUserid(schedules[p].getUserid());//用户id 
 						sch.setData(schedules[p].getData());//排班日期   格式：yyyy-MM-dd
 						sch.setData(schedules[p].getData());//排班日期   格式：yyyy-MM-dd