Merge branch 'lal' into develop

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

@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 18 15 * * ?")
+//	@Scheduled(cron = "0 32 14 * * ?")
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行    
 	public void AttendanceTask() throws ParseException {
 
@@ -909,13 +909,16 @@ public class AttendanceTaskTiming{
 						 summary.setDay29(noticesArray[28]);
 						 summary.setDay30(noticesArray[29]);
 						 summary.setDay31(noticesArray[30]);
+						 summary.setId(summaryid);
 						 
-						 if(summaryid > 0) {
-							 summary.setId(summaryid);
-							 summary.updateById();
-						 }else {
-							 summary.insert();
-						 }
+						 summary.insertOrUpdate();
+						 
+//						 if(summaryid > 0) {
+//							 summary.setId(summaryid);
+//							 summary.updateById();
+//						 }else {
+//							 summary.insert();
+//						 }
 						 
 					}
 

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

@@ -93,7 +93,7 @@ public class LastMonthtimingExport {
 	
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	
-//	@Scheduled(cron = "0 31 18 * * ?")
+//	@Scheduled(cron = "0 22 14 * * ?")
 	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行  
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 		
@@ -910,13 +910,16 @@ public class LastMonthtimingExport {
 					 summary.setDay29(noticesArray[28]);
 					 summary.setDay30(noticesArray[29]);
 					 summary.setDay31(noticesArray[30]);
+					 summary.setId(summaryid);
 					 
-					 if(summaryid > 0) {
-						 summary.setId(summaryid);
-						 summary.updateById();
-					 }else {
-						 summary.insert();
-					 }
+					 summary.insertOrUpdate();
+					 
+//					 if(summaryid > 0) {
+//						 summary.setId(summaryid);
+//						 summary.updateById();
+//					 }else {
+//						 summary.insert();
+//					 }
 					 
 				}
 

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

@@ -885,9 +885,9 @@ public class RealTimeUpdate{
 				 summary.setDay30(noticesArray[29]);
 				 summary.setDay31(noticesArray[30]);
 				 
-				 if(summaryid > 0) {
+//				 if(summaryid > 0) {
 					 summary.setId(summaryid);
-				 }
+//				 }
 				 summary.insertOrUpdate();
 			}
 				

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

@@ -284,7 +284,7 @@
      <select id="AttendanceSummaryData" resultMap="SummarydataMap">
 			select sum.*,
      	       (select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
-     	       IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code),0) as turnover_status
+     	       IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code LIMIT 1),0) as turnover_status
 			from kqgl_asso_month_punch_summary sum
 			where sum.org_code = #{param.orgCode}
 			and sum.belong_year = #{param.year}