提交

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

@@ -592,11 +592,11 @@ public class ClockInController {
 												}
 												 int ydkcs = 0;
 												 if(shif != null){ydkcs = shif.getSxbcs()*2;}//应打卡次数
-												 if(sbdkjg > yzcd) {
+												 if(sbdkjg > yzcd && yzcd>0) {
 													 yzcdcs++;
 													 yzcdsc = sbdkjg - yzcd;
 												 }
-												 if(sbdkjg > kgcdfzs) {kgcdcs++;}
+												 if(sbdkjg > kgcdfzs && kgcdfzs>0) {kgcdcs++;}
 												 pcd.setYdkcs(ydkcs);
 												 pcd.setYzcdcs(yzcdcs);
 												 pcd.setYzcdsc(Double.valueOf(yzcdsc));
@@ -632,11 +632,11 @@ public class ClockInController {
 														 Long time = (time_ - punchcardtime)/1000/60;
 														 if(time > 0){sbdk2jg = Math.abs(Integer.valueOf(time.toString()));}
 													 }
-													 if(sbdk2jg > yzcd) {
+													 if(sbdk2jg > yzcd&& yzcd>0) {
 														 yzcdcs = dkmc.getYzcdcs()+1;
 														 yzcdsc = sbdk2jg - yzcd;
 													 }
-													 if(sbdk2jg > kgcdfzs) {kgcdcs++;}
+													 if(sbdk2jg > kgcdfzs&& kgcdfzs>0) {kgcdcs++;}
 													 
 													 pcd.setId(dkmc.getId());
 											    	 pcd.setSbdk2(time_);//上班1打卡时间
@@ -671,11 +671,11 @@ public class ClockInController {
 														 Long time = (time_ - punchcardtime)/1000/60;
 														 if(time > 0){sbdk3jg = Math.abs(Integer.valueOf(time.toString()));}
 													 }
-													 if(sbdk3jg > yzcd) {
+													 if(sbdk3jg > yzcd&& yzcd>0) {
 														 yzcdcs = dkmc.getYzcdcs()+1;
 														 yzcdsc = sbdk3jg - yzcd;
 													 }
-													 if(sbdk3jg > kgcdfzs) {kgcdcs++;}
+													 if(sbdk3jg > kgcdfzs&& kgcdfzs>0) {kgcdcs++;}
 													 pcd.setId(dkmc.getId());
 											    	 pcd.setSbdk3(time_);//上班1打卡时间
 													 pcd.setSbdk3jg(sbdk3jg);

src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java

@@ -39,6 +39,7 @@ public class DailyDetailsDto {
 	private String bcxbdk2;
 	private String bcsbdk3;
 	private String bcxbdk3;
+	private Integer isxbdk;
 	
 	private Integer dktj1;
 	private Integer dktj2;

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

@@ -167,6 +167,7 @@
                  <result column="bcxbdk2" property="bcxbdk2" />
                  <result column="bcsbdk3" property="bcsbdk3" />
                  <result column="bcxbdk3" property="bcxbdk3" />
+                 <result column="isxbdk" property="isxbdk" />
                  
                  <result column="dktj1" property="dktj1" />
                  <result column="dktj2" property="dktj2" />
@@ -349,7 +350,20 @@
 							 WHEN DAYNAME(#{param.times}) = 'Saturday' THEN '6' ELSE '7' END)),(select te.bcid from kqgl_asso_teshu te where te.kqzid = sum.att_group and te.tsrq = #{param.times})))
 					WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2 
 					THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
-							and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs,	
+							and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs,
+					
+					IFNULL((select bc.is_xbdk from kqgl_asso_bcsz bc where bc.id = ((CASE WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 1 
+					THEN (IFNULL((select zh.bcid from kqgl_asso_zhoupaiban zh where zh.kqzid = sum.att_group
+							 and zh.type = (select CASE WHEN DAYNAME(#{param.times}) = 'Monday' THEN '1' 
+							 WHEN DAYNAME(#{param.times}) = 'Tuesday' THEN '2' 
+							 WHEN DAYNAME(#{param.times}) = 'Wednesday' THEN '3' 
+							 WHEN DAYNAME(#{param.times}) = 'Thursday' THEN '4' 
+							 WHEN DAYNAME(#{param.times}) = 'Friday' THEN '5' 
+							 WHEN DAYNAME(#{param.times}) = 'Saturday' THEN '6' ELSE '7' END)), (select te.bcid from kqgl_asso_teshu te where te.kqzid = sum.att_group and te.tsrq = #{param.times})))
+					WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2 
+					THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
+							and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as isxbdk,
+						
 					'' address,'' remarks,'' cardtype,'' macaddress,'' macname,
 					IFNULL(rtj.attdate, '') attdate,IFNULL(rtj.userid,'') userid,
 					#{param.times} data,