Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!488

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

@@ -97,7 +97,7 @@ public class AttendanceTaskTiming{
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 15 16 * * ?")
 //	@Scheduled(cron = "0 15 16 * * ?")
-//	@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

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

src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java

@@ -15,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
  */
  */
 @Repository
 @Repository
 public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> {
 public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> {
-	List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate);
+	List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId,String attdate,Integer qyid);
 }
 }

src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml

@@ -85,6 +85,7 @@
 		and dkjl.user_id = #{userId,jdbcType=INTEGER}
 		and dkjl.user_id = #{userId,jdbcType=INTEGER}
 		and dkjl.status not in (0,2) 
 		and dkjl.status not in (0,2) 
 		and dkjl.attdate = #{attdate}
 		and dkjl.attdate = #{attdate}
+		and dkjl.qyid = #{qyid}
   	</select>
   	</select>
 	<!-- 
 	<!--