Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -169,10 +169,12 @@ public class DingMessageController {
                                             switch (jsonArray.get(3).toString()){
                                                 case "halfDay":
                                                 case "day":
-                                                    leaveRecordEntity.setDuration((int) (Float.parseFloat(jsonArray.get(2).toString())*60*60*24)); //天转换成秒
+                                                    leaveRecordEntity.setDuration((int) (Float.parseFloat(jsonArray.get(2).toString())*60*60*9)); //天转换成秒 一天工作时间9小时
+                                                    leaveRecordEntity.setSourceDingTime(jsonArray.get(2).toString()+"天");
                                                     break;
                                                 default:  //除了按天和半天计算的假期  其余都是按小时返回
                                                     leaveRecordEntity.setDuration((int) (Float.parseFloat(jsonArray.get(2).toString())*60*60)); //小时转换成秒
+                                                    leaveRecordEntity.setSourceDingTime(jsonArray.get(2).toString()+"小时");
                                                     break;
 
                                             }
@@ -635,7 +637,7 @@ public class DingMessageController {
      * @return
      */
     private float converMillsToDays(long milliseconds){
-        float days = ((float) milliseconds) / (60*60*24);
+        float days = ((float) milliseconds) / (60*60*9);
         return days;
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -202,7 +202,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             //汇总当前日期请假情况
             List<LeaveSummaryVo> leaveSummaryVoList = attendanceSummaryDao.getLeaveSummary(query);
             if (CollectionUtils.isNotEmpty(leaveSummaryVoList)) {
-                BigDecimal day = new BigDecimal(3600 * 24);
+                BigDecimal day = new BigDecimal(3600 * 9); //一天按9小时折算
                 BigDecimal oneDay = new BigDecimal(1);
                 for (LeaveSummaryVo item : leaveSummaryVoList) {
                     String attendanceSummary = "";