Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -107,7 +107,7 @@ export default {
           },
         ],
         columns: [
-          { type: "selection", width: 60 },
+          { type: "selection", width: 40 },
           { type: "index", label: "序号", width: 50 },
 
           // {label: "请假人id", prop: "leavePersonId", formatter: this.formatter},
@@ -129,12 +129,29 @@ export default {
           {
             label: "开始时间",
             prop: "startTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
-          { label: "结束时间", prop: "endTime", formatter: this.formatterDate },
+          {
+            label: "结束时间",
+            prop: "endTime",
+            width: 150,
+            formatter: this.formatterDate,
+          },
 
-          { label: "时长", prop: "duration", formatter: this.formatteSec },
+          {
+            label: "钉钉原始时间（换算时长）",
+            width: 165,
+            formatter: (row) => {
+              return (
+                (row.sourceDingTime ? row.sourceDingTime : "--") +
+                (row.duration
+                  ? "（" + (row.duration / 60 / 60 / 9).toFixed(2) + "天" + "）"
+                  : "（--）")
+              );
+            },
+          },
 
           // {label: "审批负责人Id", prop: "approverId", formatter: this.formatter},
 
@@ -170,12 +187,13 @@ export default {
           {
             label: "创建时间",
             prop: "createTime",
+            width: 150,
             formatter: this.formatterDate,
           },
 
           {
             label: "操作",
-            width: 240,
+            width: 220,
             formatter: (row) => {
               return (
                 <div>

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 = "";