111

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/controller/viewClockInController.java

@@ -143,8 +143,10 @@ public class viewClockInController extends JeecgController<ViewClockIn, IviewClo
 
 		 String viewDate = jsonObject.getString("viewDate");
 		 String ids = jsonObject.getString("ids");
-		 String[] userId = ids.split(",");
-
+		 String[] userId = {};//ids.split(",");
+		 if(!StringUtil.isNullOrEmpty(ids)){
+			 userId = ids.split(",");
+		 }
 //		 List<bdClockinMonth> list = bdClockinMonthService.selectAllByMonth(viewDate,userId);
 		 	try {
 				String err = bdClockinMonthService.reportIntoU8Job(viewDate,userId);
@@ -218,7 +220,7 @@ public class viewClockInController extends JeecgController<ViewClockIn, IviewClo
 				if(StringUtil.isNullOrEmpty(o.getIsAttendance()) && o.getIsAttendance().equals("1")){
 					 o.setWorkDayReal("21.75");//真实考勤天数
 				}else{
-					BigDecimal workDay = new BigDecimal("21.75");
+					BigDecimal workDay = new BigDecimal("21.75").setScale(2,BigDecimal.ROUND_HALF_UP);;
 					if(!StringUtil.isNullOrEmpty(o.getHolidayTimeBj()) && !o.getHolidayTimeBj().equals("0")){
 						workDay = workDay.subtract(new BigDecimal(o.getHolidayTimeBj()));
 					}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/xml/bdClockinMonthMapper.xml

@@ -33,12 +33,12 @@
         ) B on C.ID = B.personId
 
         left join (
-        select sum(TIMESTAMPDIFF(hour,start_date,end_date)) holiday_time_sj,user_id
+        select sum(TIMESTAMPDIFF(hour,start_date,end_date)/24) holiday_time_sj,user_id
         from geke_vacation_body where holiday_type='事假' and DATE_FORMAT(start_date,'%Y-%m') = #{nowDate}
         group by user_id
         ) sj on sj.user_id = C.id
         left join (
-        select TIMESTAMPDIFF(hour,start_date,end_date)/24 holiday_time_bj,user_id
+        select sum(TIMESTAMPDIFF(hour,start_date,end_date)/24) holiday_time_bj,user_id
         from geke_vacation_body where holiday_type='病假' and DATE_FORMAT(start_date,'%Y-%m') = #{nowDate}
         group by user_id
         ) bj on bj.user_id = C.id