提交

src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java

@@ -54,4 +54,6 @@ public class AttendanceAssistant implements Serializable{
 	int fieldpersonnel;//外勤
 	int fieldpersonnel;//外勤
 	
 	
 	int restdayclock;//休息日打卡
 	int restdayclock;//休息日打卡
+	
+	String PagetransferDate;//页面传输修改日期
 }
 }

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

@@ -340,8 +340,13 @@ public class AttController {
 			//记录排班（排班制）
 			//记录排班（排班制）
 			List<Schedule> schlist=new ArrayList<Schedule>();
 			List<Schedule> schlist=new ArrayList<Schedule>();
 			Schedule[] schedules = attass.getSchedules();// 排班日期【排班制】--班次id、日期
 			Schedule[] schedules = attass.getSchedules();// 排班日期【排班制】--班次id、日期
+			
+			String date_scmx = null;
+			
 			if(schedules.length>0 && attass.getAtttype() == 2){
 			if(schedules.length>0 && attass.getAtttype() == 2){
 				
 				
+				date_scmx = ClockInTool.SunNovCSTYM(schedules[0].getData());
+				
 				String date = String.valueOf(schedules[0].getData());
 				String date = String.valueOf(schedules[0].getData());
 				Date dt=new Date(date);
 				Date dt=new Date(date);
 				SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM");
 				SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM");
@@ -1135,7 +1140,10 @@ public class AttController {
 			}
 			}
 			if(schlist.size()>0 && xiugai){
 			if(schlist.size()>0 && xiugai){
 				//删除排班明细表（自由排班）
 				//删除排班明细表（自由排班）
-				scheduleservice.deleteByPrimaryBykqzid(id);
+//				scheduleservice.deleteByPrimaryBykqzid(id);
+				
+				scheduleservice.deleteByPrimaryBykqzid(id,date_scmx);
+				
 				scheduleservice.insertKqglAssoPbmxList(schlist);
 				scheduleservice.insertKqglAssoPbmxList(schlist);
 				return ResultUtil.data(schlist,"修改考勤组排班成功");
 				return ResultUtil.data(schlist,"修改考勤组排班成功");
 			}
 			}
@@ -1458,7 +1466,13 @@ public class AttController {
 				for(int u=0;u<attser.length;u++){
 				for(int u=0;u<attser.length;u++){
 					
 					
 					if(attass.getAtttype() == 2){//排班制     考勤组与用户、用户排班
 					if(attass.getAtttype() == 2){//排班制     考勤组与用户、用户排班
-						scheduleservice.deleteByPrimaryByUserid(Integer.valueOf(attser[u]));
+						Schedule[] schedules = attass.getSchedules();// 排班日期【排班制】--班次id、日期
+						if(schedules.length>0) {
+							String date = ClockInTool.SunNovCSTYM(schedules[0].getData());
+							
+							scheduleservice.deleteByPrimaryByUserid(Integer.valueOf(attser[u]),attgrpid,date);
+						}
+//						scheduleservice.deleteByPrimaryByUserid(Integer.valueOf(attser[u]));
 					}
 					}
 					userattendancerelservice.deleteByPrimaryByUserid(Integer.valueOf(attser[u]),qyid);
 					userattendancerelservice.deleteByPrimaryByUserid(Integer.valueOf(attser[u]),qyid);
 					
 					
@@ -1581,12 +1595,17 @@ public class AttController {
 			}
 			}
 			
 			
 			/**********/
 			/**********/
-			scheduleservice.deleteByPrimaryBykqzid(attgrpid);
+//			scheduleservice.deleteByPrimaryBykqzid(attgrpid);
 			/***********/
 			/***********/
 			//记录排班（排班制）
 			//记录排班（排班制）
 			List<Schedule> schlist=new ArrayList<Schedule>();
 			List<Schedule> schlist=new ArrayList<Schedule>();
 			Schedule[] schedules = attass.getSchedules();// 排班日期【排班制】--班次id、日期
 			Schedule[] schedules = attass.getSchedules();// 排班日期【排班制】--班次id、日期
 			if(schedules.length>0 && attass.getAtttype() == 2){
 			if(schedules.length>0 && attass.getAtttype() == 2){
+				
+				String date = ClockInTool.SunNovCSTYM(schedules[0].getData());
+				
+				scheduleservice.deleteByPrimaryBykqzid(attgrpid,date);
+				
 				for(int p=0;p<schedules.length;p++){
 				for(int p=0;p<schedules.length;p++){
 					Schedule sch = new Schedule();
 					Schedule sch = new Schedule();
 					sch.setUserid(schedules[p].getUserid());
 					sch.setUserid(schedules[p].getUserid());

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

@@ -729,4 +729,26 @@ public class ClockInTool {
         return sdf.format(date2);
         return sdf.format(date2);
     }
     }
     
     
+    
+    /**
+	 * 	Sun Nov 01 00:00:00 CST 2020
+	 */
+    public static String SunNovCST(String s){
+    	String cst;
+    	Date date = new Date(s);
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		cst = simpleDateFormat.format(date);
+        return cst;
+    }
+    
+    /**
+	 * 	Sun Nov 01 00:00:00 CST 2020
+	 */
+    public static String SunNovCSTYM(Date date2){
+    	String cst;
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+		cst = simpleDateFormat.format(date2);
+        return cst;
+    }
+
 }
 }

src/main/java/cn/timer/api/dao/kqgl/ScheduleMapper.java

@@ -23,11 +23,11 @@ public interface ScheduleMapper {
     
     
     int insertKqglAssoPbmxList(List<Schedule> schedule);
     int insertKqglAssoPbmxList(List<Schedule> schedule);
     
     
-    int deleteByPrimaryBykqzid(Integer kqzid);
+    int deleteByPrimaryBykqzid(Integer kqzid,String date);
     
     
     List<Schedule> selectAttGroupScheduling(AttScheduling attscheduling);
     List<Schedule> selectAttGroupScheduling(AttScheduling attscheduling);
     
     
-    int deleteByPrimaryByUserid(Integer userid);
+    int deleteByPrimaryByUserid(Integer userid,Integer kqzid,String date);
     
     
     List<Schedule> getAttendanceShouldList(Integer userid,Long start,Long end);
     List<Schedule> getAttendanceShouldList(Integer userid,Long start,Long end);
     
     

src/main/resources/mapping/kqgl/ScheduleMapper.xml

@@ -147,9 +147,10 @@
 	    </foreach>
 	    </foreach>
    </insert>
    </insert>
    
    
-   <delete id="deleteByPrimaryBykqzid" parameterType="java.lang.Integer" >
+   <delete id="deleteByPrimaryBykqzid" >
     delete from kqgl_asso_pbmx
     delete from kqgl_asso_pbmx
     where kqzid = #{kqzid,jdbcType=INTEGER}
     where kqzid = #{kqzid,jdbcType=INTEGER}
+    and SUBSTR(data,1,7) = #{date,jdbcType=VARCHAR}
   </delete>
   </delete>
   
   
   <select id="selectAttGroupScheduling" resultMap="BaseResultMap">
   <select id="selectAttGroupScheduling" resultMap="BaseResultMap">
@@ -168,9 +169,11 @@
 		and pbmx.kqzid = #{kqzid,jdbcType=INTEGER}
 		and pbmx.kqzid = #{kqzid,jdbcType=INTEGER}
   </select>
   </select>
   
   
-  <delete id="deleteByPrimaryByUserid" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryByUserid">
     delete from kqgl_asso_pbmx
     delete from kqgl_asso_pbmx
     where userid = #{userid,jdbcType=INTEGER}
     where userid = #{userid,jdbcType=INTEGER}
+    and SUBSTR(data,1,7) = #{date,jdbcType=VARCHAR}
+    and kqzid = #{kqzid,jdbcType=INTEGER}
   </delete>
   </delete>
   
   
   <select id="getAttendanceShouldList" resultMap="BaseResultMap">
   <select id="getAttendanceShouldList" resultMap="BaseResultMap">