解决BUG

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -99,7 +99,7 @@ public class AttendanceTaskTiming{
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 14 17 * * ?")
 //	@Scheduled(cron = "0 14 17 * * ?")
-	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行  
+//	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行  
 	public void AttendanceTask() throws ParseException {
 	public void AttendanceTask() throws ParseException {
 
 
 		boolean implement = true;
 		boolean implement = true;

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -91,7 +91,7 @@ public class LastMonthtimingExport {
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	
 	
 //	@Scheduled(cron = "0 5 11 * * ?")
 //	@Scheduled(cron = "0 5 11 * * ?")
-	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
+//	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 		
 		
 		 //获取前月的最后一天
 		 //获取前月的最后一天

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -2775,7 +2775,7 @@ public class SalaryManagementController {
 			if(("0").equals(search.getStatus())) {//全部
 			if(("0").equals(search.getStatus())) {//全部
 				search.setStatus("");
 				search.setStatus("");
 			}else if(("1").equals(search.getStatus())) {//在职
 			}else if(("1").equals(search.getStatus())) {//在职
-				search.setStatus("0");
+				search.setStatus("66");
 			}else {
 			}else {
 				search.setStatus("3");
 				search.setStatus("3");
 			}
 			}

src/main/resources/mapping/xcgl/XcglAssoZxfjkcMapper.xml

@@ -78,9 +78,12 @@
 		</if>
 		</if>
 		where emp.org_code = #{param.orgcode}
 		where emp.org_code = #{param.orgcode}
 		
 		
-		<if test="param.status != ''" >
+		<if test="param.status != '' and param.status != '66'" >
 			and emp.job_status = #{param.status}
 			and emp.job_status = #{param.status}
 		</if>
 		</if>
+		<if test="param.status != '' and param.status == '66'" >
+			and emp.job_status in (0,1)
+		</if>
 		<if test="param.text != ''" >
 		<if test="param.text != ''" >
 			and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
 			and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
 		</if>
 		</if>