diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue index 3875f812fa964d353439bfd28e58f0b98f08afb8..0129e484d9107c148435edab8587895cb7a5f610 100644 --- a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue +++ b/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: "璇峰亣浜篿d", 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: "瀹℃壒璐熻矗浜篒d", 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> diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java index e79b081431588f0b1225529846e00f63a6757d3d..13f0d6e9da7fa49b376ef9e7bab137c0ee389fcd 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java +++ b/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; } diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java index 070d471e8c610b787c062b68410c5ec131c4da16..109f32718f7e9e336f9c51d1beb062eb169c34c7 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java +++ b/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 = "";