Skip to content

A
attendance-performance-platform
Commit ac4c4c57 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 76e4a7e5 58f8cd80
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 441 additions and 225 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ ac4c4c57
...@@ -14,7 +14,7 @@ const tagsMap = { ...@@ -14,7 +14,7 @@ const tagsMap = {
const baseUrl = process.env.VUE_APP_API_BASE_URL + "/"; const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
export default { export default {
mounted() { mounted() {
this.getData(); // this.getData();
}, },
watch: { watch: {
$route(route) { $route(route) {
......
attendance-performance-manager-ui/admin/src/components/tabPane.vue
View file @ ac4c4c57
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
export default { export default {
props: { props: {
thirdList: { thirdList: {
type: Boolean, type: Array,
default: [], default: [],
}, },
activeName: { activeName: {
......
attendance-performance-manager-ui/admin/src/views/attendance/class/dialogshow.vue
View file @ ac4c4c57
...@@ -174,7 +174,6 @@ export default { ...@@ -174,7 +174,6 @@ export default {
value = false; value = false;
return; return;
} else { } else {
console.log(this.attendanceClassDetailList.length, "执行了");
this.attendanceClassDetailList.forEach((item, index) => { this.attendanceClassDetailList.forEach((item, index) => {
let valueres = this.judgeStatus( let valueres = this.judgeStatus(
this.attendanceClassDetailList, this.attendanceClassDetailList,
...@@ -217,7 +216,6 @@ export default { ...@@ -217,7 +216,6 @@ export default {
}, },
// 判断添加上下班考勤时间 // 判断添加上下班考勤时间
judgeStatus(arr, index) { judgeStatus(arr, index) {
console.log(arr, index, "ces");
let status = true; let status = true;
if (arr.length == 0) { if (arr.length == 0) {
} else { } else {
...@@ -266,24 +264,24 @@ export default { ...@@ -266,24 +264,24 @@ export default {
status = false; status = false;
return; return;
} }
if (arr.length > 1 && index > 0) { // if (arr.length > 1 && index > 0) {
// 上一次比较 // // 上一次比较
let lastoffTime = // let lastoffTime =
transFormMinut(arr[index - 1].offWorkDate) + // transFormMinut(arr[index - 1].offWorkDate) +
transFormMinut(arr[index - 1].offWorkDateAfter); // transFormMinut(arr[index - 1].offWorkDateAfter);
let currentwokeTime = // let currentwokeTime =
transFormMinut(arr[index].goWorkDate) - // transFormMinut(arr[index].goWorkDate) -
transFormMinut(arr[index].goWorkDateBefore); // transFormMinut(arr[index].goWorkDateBefore);
if (currentwokeTime <= lastoffTime) { // if (currentwokeTime <= lastoffTime) {
this.$message.error( // this.$message.error(
`第${index}上班考勤时间需大于第${index - 1}上班考勤时间` // `第${index}上班考勤时间需大于第${index - 1}上班考勤时间`
); // );
status = false; // status = false;
return; // return;
} // }
} // }
} }
return status; return status;
}, },
...@@ -354,7 +352,6 @@ export default { ...@@ -354,7 +352,6 @@ export default {
}); });
this.currentIndex = this.attendanceClassDetailList.length - 1; this.currentIndex = this.attendanceClassDetailList.length - 1;
this.form.classResponsiblePersonId = this.form.classResponsiblePersonId.toString(); this.form.classResponsiblePersonId = this.form.classResponsiblePersonId.toString();
console.log(this.currentIndex, "执行了");
} }
this.open = true; this.open = true;
}, },
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
View file @ ac4c4c57
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
/> />
<Field <Field
label="时长(单位:秒)" label="时长(单位:小时)"
disabled disabled
prop="duration" prop="duration"
v-model="form.duration" v-model="form.duration / 60 / 60"
placeholder="请输入时长(秒)" placeholder="请输入时长(秒)"
:maxLength="4" :maxLength="4"
/> />
...@@ -169,14 +169,14 @@ export default { ...@@ -169,14 +169,14 @@ export default {
{ required: true, message: "请输入请假人", trigger: "blur" }, { required: true, message: "请输入请假人", trigger: "blur" },
], ],
deptId: [{ required: true, message: "请选择部门", trigger: "change" }], deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
phoneNumber: [ // phoneNumber: [
{ required: true, message: "请输入电话号码", trigger: "blur" }, // { required: true, message: "请输入电话号码", trigger: "blur" },
{ // {
validator: valid.phone, // validator: valid.phone,
message: "电话号码格式不正确", // message: "电话号码格式不正确",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
leaveType: [ leaveType: [
{ required: true, message: "请选择请假类型", trigger: "change" }, { required: true, message: "请选择请假类型", trigger: "change" },
], ],
...@@ -187,9 +187,9 @@ export default { ...@@ -187,9 +187,9 @@ export default {
{ required: true, message: "请选择结束时间", trigger: "change" }, { required: true, message: "请选择结束时间", trigger: "change" },
], ],
duration: [{ required: true, message: "请输入时长", trigger: "blur" }], duration: [{ required: true, message: "请输入时长", trigger: "blur" }],
reason: [ // reason: [
{ required: true, message: "请输入请假理由", trigger: "blur" }, // { required: true, message: "请输入请假理由", trigger: "blur" },
], // ],
approverId: [ approverId: [
{ required: true, message: "请选择审批人", trigger: "change" }, { required: true, message: "请选择审批人", trigger: "change" },
], ],
......
attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
View file @ ac4c4c57
...@@ -282,9 +282,11 @@ export default { ...@@ -282,9 +282,11 @@ export default {
}, },
// 表格接收数据后 // 表格接收数据后
afterRender(data) { afterRender(data) {
console.log(data);
let addobjArr = []; let addobjArr = [];
data.dyncColumns.map((item) => { data.dyncColumns.map((item) => {
let obj = { let obj = {
show: true,
label: item.name, label: item.name,
prop: "", prop: "",
formatter: (row) => { formatter: (row) => {
...@@ -299,6 +301,7 @@ export default { ...@@ -299,6 +301,7 @@ export default {
} }
}, },
}; };
addobjArr.push(obj);
}); });
this.config.columns = [...this.initalArr, ...addobjArr]; this.config.columns = [...this.initalArr, ...addobjArr];
this.$refs.layoutTable.showType = "tableSelect"; this.$refs.layoutTable.showType = "tableSelect";
...@@ -512,6 +515,8 @@ export default { ...@@ -512,6 +515,8 @@ export default {
}, },
data() { data() {
return { return {
// 动态新增列表
addColumn: [],
progress: false, progress: false,
percent: 0, percent: 0,
upload: { upload: {
...@@ -666,25 +671,25 @@ export default { ...@@ -666,25 +671,25 @@ export default {
show: true, show: true,
}, },
{ // {
label: "考勤打卡记录详细信息", // label: "考勤打卡记录详细信息",
width: 120, // width: 120,
prop: "subColumns", // prop: "subColumns",
show: true, // show: true,
formatter: (row) => { // formatter: (row) => {
let widthsize = this.columnSet.reduce((pre, cur) => { // let widthsize = this.columnSet.reduce((pre, cur) => {
return pre + Number(cur.width); // return pre + Number(cur.width);
}, 50); // }, 50);
return ( // return (
<el-popover placement="right" width={widthsize} trigger="click"> // <el-popover placement="right" width={widthsize} trigger="click">
{this.renderTable(row.attendanceRecordDetailList)} // {this.renderTable(row.attendanceRecordDetailList)}
<el-button type="text" slot="reference"> // <el-button type="text" slot="reference">
详细 // 详细
</el-button> // </el-button>
</el-popover> // </el-popover>
); // );
}, // },
}, // },
// { // {
// label: "操作", // label: "操作",
// width: 240, // width: 240,
......
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
View file @ ac4c4c57
...@@ -168,9 +168,18 @@ export default { ...@@ -168,9 +168,18 @@ export default {
let index = arr.findIndex((item) => item.createTime == currentTime); let index = arr.findIndex((item) => item.createTime == currentTime);
if (index > -1) { if (index > -1) {
return arr[index].attendanceSummary ? ( return arr[index].attendanceSummary ? (
<el-tag type={"danger"} size="mini"> <el-tooltip
{arr[index].attendanceSummary} class="item"
</el-tag> effect="dark"
content={
arr[index].createTime + " " + arr[index].attendanceSummary
}
placement="top-start"
>
<el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
</el-tooltip>
) : ( ) : (
"-" "-"
); );
......
attendance-performance-manager-ui/admin/src/views/dept/list.vue
View file @ ac4c4c57
<template> <template>
<div className="page"> <div className="page">
<el-card style="height:80vh;overflow:scroll-y"> <el-card style="height:80vh;overflow:scroll-y">
<LayoutTable notPagination :data="tableData" ref="layoutTable" :config="tableConfig" notSearch></LayoutTable> <LayoutTable
</el-card> notPagination
<drawer-show ref="drawerform" @ok="getData" /> :data="tableData"
</div> notAdd
notDel
ref="layoutTable"
:config="tableConfig"
notSearch
></LayoutTable>
</el-card>
<drawer-show ref="drawerform" @ok="getData" />
</div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import {handleTree} from "@/assets/utils/table"; import { handleTree } from "@/assets/utils/table";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "DeptList", name: "DeptList",
components: { components: {
drawerShow, drawerShow,
Treeselect Treeselect,
}, },
mixins: [table], mixins: [table],
created() { created() {
this.query={"page":1,"size":-1} this.query = { page: 1, size: -1 };
}, },
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.drawerform.add(row,this.menuOptions); this.$refs.drawerform.add(row, this.menuOptions);
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.drawerform.edit(row,this.menuOptions); this.$refs.drawerform.edit(row, this.menuOptions);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
this.$refs.drawerform.view(row, this.menuOptions); this.$refs.drawerform.view(row, this.menuOptions);
}, },
afterRender(data) { afterRender(data) {
data.data = handleTree(data.data, "id", "parentId"); data.data = handleTree(data.data, "id", "parentId");
console.log("tree data:",data.data) console.log("tree data:", data.data);
this.menuOptions = data.data; this.menuOptions = data.data;
this.$refs.layoutTable.showType = "treetable" this.$refs.layoutTable.showType = "treetable";
}, },
}, },
data() { data() {
return { return {
config: { config: {
showType:'treetable', showType: "treetable",
isshowTabPane:true, isshowTabPane: true,
/** 树表是否默认展开 */ /** 树表是否默认展开 */
expand: false, expand: false,
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{label: "部门名称", prop: "deptName"}, { label: "部门名称", prop: "deptName" },
{label: "成员数量", prop: "personNum"}, { label: "成员数量", prop: "personNum" },
{label: "负责人", prop: "workName"}, { label: "负责人", prop: "workName" },
// {label: "部门状态", prop: "deptStatus",formatter: this.formatter}, // {label: "部门状态", prop: "deptStatus",formatter: this.formatter},
// {label: "顺序", prop: "orderNum",formatter: this.formatter}, // {label: "顺序", prop: "orderNum",formatter: this.formatter},
// {label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ // {
label: "操作", // label: "操作",
width: 240, // width: 240,
formatter: row => { // formatter: (row) => {
return ( // return (
<table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> // <table-buttons
) // noAdd
} // noView
} // row={row}
] // onEdit={this.toEdit}
} // onView={this.toView}
}; // onDel={this.toDel}
} // />
// );
// },
// },
],
},
}; };
</script> },
\ No newline at end of file };
</script>
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @ ac4c4c57
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@handleClick="handleClick" @handleClick="handleClick"
></tab-pane> ></tab-pane>
</div> </div>
<div class="totalNum flex" v-if="tableData.staff"> <!-- <div class="totalNum flex" v-if="tableData.staff">
<div class="item"> <div class="item">
在职员工 <span class="num">{{ tableData.staff.inWorkStaff }}</span> 在职员工 <span class="num">{{ tableData.staff.inWorkStaff }}</span>
</div> </div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
待离职 <span class="num">{{ tableData.staff.resignationStaff }}</span> 待离职 <span class="num">{{ tableData.staff.resignationStaff }}</span>
</div> </div>
</div> </div>
</div> </div> -->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="12" class="mytree"> <el-col :span="6" :xs="12" class="mytree">
<div class="titles">选择部门</div> <div class="titles">选择部门</div>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-col> </el-col>
<el-col :span="18" :xs="12"> <el-col :span="18" :xs="12">
<el-row> <el-row>
<LayoutTable notDel :data="tableData" :config="tableConfig"> <LayoutTable notDel notAdd :data="tableData" :config="tableConfig">
<el-button <el-button
type="primary" type="primary"
@click="doExport" @click="doExport"
...@@ -104,9 +104,7 @@ ...@@ -104,9 +104,7 @@
<i class="el-icon-refresh"></i> <i class="el-icon-refresh"></i>
<span <span
>上次同步时间：{{ >上次同步时间：{{
tableData.staff tableData.staff ? tableData.staff.refreshDate : "--"
? tableData.staff.refreshDate
: "--"
}}</span }}</span
> >
</span> </span>
...@@ -416,7 +414,14 @@ export default { ...@@ -416,7 +414,14 @@ export default {
}; };
</script> </script>
<style> <style lang="less" scoped>
/deep/.el-tree-node__expand-icon {
font-size: 18px !important;
color: #606266;
}
/deep/.el-tree-node__content {
padding-left: 2px !important;
}
.el-card__body { .el-card__body {
padding: 10px; padding: 10px;
} }
...@@ -556,7 +561,7 @@ export default { ...@@ -556,7 +561,7 @@ export default {
border-top: 1px dashed #4386c6; border-top: 1px dashed #4386c6;
height: 20px; height: 20px;
top: 12px; top: 12px;
width: 24px; width: 20px;
} }
} }
.titles { .titles {
......
attendance-performance-manager/pom.xml
View file @ ac4c4c57
...@@ -150,6 +150,39 @@ ...@@ -150,6 +150,39 @@
</properties> </properties>
</profile> </profile>
<profile>
<id>reg</id>
<properties>
<profiles.active>reg</profiles.active>
<profiles.server.port>17500</profiles.server.port>
<profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>INFO</profiles.log.level>
<profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>
<profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
<profiles.hik.host>10.207.153.105:443</profiles.hik.host>
<profiles.hik.protocol>https://</profiles.hik.protocol>
<profiles.hik.appKey>25594054</profiles.hik.appKey>
<profiles.hik.appSecret>K12IkZoSLxpsJjrUPtfV</profiles.hik.appSecret>
<profiles.dingtalk.domain>http://172.15.28.113:8918</profiles.dingtalk.domain>
<profiles.dingtalk.oaUrl>172.15.28.113:8919</profiles.dingtalk.oaUrl>
<profiles.dingtalk.agentId>2652674890</profiles.dingtalk.agentId>
<profiles.dingtalk.appKey>dingpqzradgfr4efdi2j</profiles.dingtalk.appKey>
<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
<profiles.webUrl>https://ybswxxcx.zwfwhfgjjfzj.yibin.gov.cn/performance-h5</profiles.webUrl>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
</properties>
</profile>
</profiles> </profiles>
<properties> <properties>
......
attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @ ac4c4c57
...@@ -190,7 +190,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -190,7 +190,10 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
String token = authTokenService.getToken(request); String token = authTokenService.getToken(request);
HomeStatInfo homeStatInfo = new HomeStatInfo();
HomeStatInfo homeStatInfo = cacheService.get(RedisKey.KEY_HOME_STAT_CACHE, HomeStatInfo.class);
/* HomeStatInfo homeStatInfo = new HomeStatInfo();
StaffQuery staffQuery = new StaffQuery(); StaffQuery staffQuery = new StaffQuery();
...@@ -207,8 +210,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -207,8 +210,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
homeStatInfo.setTotalDeptNum(totalDeptNum); homeStatInfo.setTotalDeptNum(totalDeptNum);
AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery(); AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery();
/* hikQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr()); *//* hikQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
hikQuery.setAttendanceDateEnd(DateUtil.today()); */ hikQuery.setAttendanceDateEnd(DateUtil.today()); *//*
hikQuery.setAttendanceDateStart(DateUtil.yesterday().toDateStr()); hikQuery.setAttendanceDateStart(DateUtil.yesterday().toDateStr());
hikQuery.setAttendanceDateEnd(DateUtil.yesterday().toDateStr()); hikQuery.setAttendanceDateEnd(DateUtil.yesterday().toDateStr());
...@@ -222,17 +225,17 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -222,17 +225,17 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
//获取当月打卡人数，如果存在 //获取当月打卡人数，如果存在
/* Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), Long.class); *//* Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), Long.class);
if (ObjectUtils.isEmpty(totalCache)) { if (ObjectUtils.isEmpty(totalCache)) {
totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count(); totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count();
cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), totalCache); cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), totalCache);
}*/ }*//*
/* Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), Long.class); *//* Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), Long.class);
if (ObjectUtils.isEmpty(totalCache)) { if (ObjectUtils.isEmpty(totalCache)) {
totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count(); totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count();
cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), totalCache); cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), totalCache);
}*/ }*//*
//迟到次数 //迟到次数
...@@ -260,14 +263,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -260,14 +263,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
.count(); .count();
/* AttendanceVacationRecordQuery vacationRecordQuery = new AttendanceVacationRecordQuery(); *//* AttendanceVacationRecordQuery vacationRecordQuery = new AttendanceVacationRecordQuery();
vacationRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr()); vacationRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
vacationRecordQuery.setCreateTimeEnd(DateUtil.today()); vacationRecordQuery.setCreateTimeEnd(DateUtil.today());
int levealPersonNum = vacationRecordService.count(vacationRecordQuery, getContext());*/ int levealPersonNum = vacationRecordService.count(vacationRecordQuery, getContext());*//*
AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery(); AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
/* leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr()); *//* leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
leaveRecordQuery.setCreateTimeEnd(DateUtil.today());*/ leaveRecordQuery.setCreateTimeEnd(DateUtil.today());*//*
leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr()); leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr()); leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue()); leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
...@@ -275,12 +278,12 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -275,12 +278,12 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
//总打卡记录 //总打卡记录
/* long totalAttend = attendanceRecordEntities.parallelStream().flatMap(item -> item.getAttendanceRecordDetailList().parallelStream()).count(); *//* long totalAttend = attendanceRecordEntities.parallelStream().flatMap(item -> item.getAttendanceRecordDetailList().parallelStream()).count();
long lackOfCardsAttend = attendanceRecordEntities.parallelStream() long lackOfCardsAttend = attendanceRecordEntities.parallelStream()
.flatMap(item -> item.getAttendanceRecordDetailList().stream()) .flatMap(item -> item.getAttendanceRecordDetailList().stream())
.filter(f -> GoWorkResultEnum.缺卡.getValue() == f.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == f.getOffWorkResult()) .filter(f -> GoWorkResultEnum.缺卡.getValue() == f.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == f.getOffWorkResult())
.count();*/ .count();*//*
//异常考勤记录 //异常考勤记录
//未考勤 //未考勤
// long noAtt=lackOfCards; // long noAtt=lackOfCards;
...@@ -298,7 +301,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -298,7 +301,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
homeStatInfo.setLatePersonNum(beLate); homeStatInfo.setLatePersonNum(beLate);
homeStatInfo.setLeftEarlyPersonNum(leaveEarly); homeStatInfo.setLeftEarlyPersonNum(leaveEarly);
homeStatInfo.setMissCardPersonNum(lackOfCards); homeStatInfo.setMissCardPersonNum(lackOfCards);
homeStatInfo.setAttendPersonNum(totalAttendPersonNum); homeStatInfo.setAttendPersonNum(totalAttendPersonNum);*/
data.put("homeStat", homeStatInfo); data.put("homeStat", homeStatInfo);
data.put("token", token); data.put("token", token);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java
View file @ ac4c4c57
...@@ -26,4 +26,7 @@ public class RedisKey { ...@@ -26,4 +26,7 @@ public class RedisKey {
/** 考勤统计 **/ /** 考勤统计 **/
public static final String KEY_ATTENDANCE_STAT_CACHE = "attendance:stat"; public static final String KEY_ATTENDANCE_STAT_CACHE = "attendance:stat";
public static final String KEY_HOME_STAT_CACHE = "attendance:home:stat";
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java
View file @ ac4c4c57
...@@ -15,6 +15,7 @@ import com.mortals.xhx.common.code.YesNoEnum; ...@@ -15,6 +15,7 @@ import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
import com.mortals.xhx.module.attendance.model.AttendanceRecordHikQuery; import com.mortals.xhx.module.attendance.model.AttendanceRecordHikQuery;
import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService; import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
import com.mortals.xhx.module.attendance.service.AttendanceStatService;
import com.mortals.xhx.module.hik.door.model.req.door.DoorEventReq; import com.mortals.xhx.module.hik.door.model.req.door.DoorEventReq;
import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo; import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo;
import com.mortals.xhx.module.hik.door.service.IHikDoorService; import com.mortals.xhx.module.hik.door.service.IHikDoorService;
...@@ -46,23 +47,30 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService { ...@@ -46,23 +47,30 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private IHikDoorService hikDoorService; private IHikDoorService hikDoorService;
@Autowired
private AttendanceStatService attendanceStatService;
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
// syncDoorEvents(); // syncDoorEvents();
//判断时间段 不在时间段的 不做计算 //判断时间段 不在时间段的 不做计算
//早上9点 子晚上8点 计算 //早上9点 子晚上8点 计算
Date beginDateTime=DateUtil.parseDateTime(DateUtil.today()+" 09:00:00"); Date beginDateTime = DateUtil.parseDateTime(DateUtil.today() + " 09:00:00");
Date endDateTime=DateUtil.parseDateTime(DateUtil.today()+" 20:30:00"); Date endDateTime = DateUtil.parseDateTime(DateUtil.today() + " 20:30:00");
boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime); boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime);
if(in){ if (in) {
calculateAttendByDay(); calculateAttendByDay();
} }
//统计当日
log.info("统计当日考勤");
attendanceStatService.homeStat(null);
log.info("统计当日考勤结束");
} }
private void calculateAttendByDay() { private void calculateAttendByDay() {
Context context = new Context(); Context context = new Context();
UserEntity userEntity = new UserEntity(); UserEntity userEntity = new UserEntity();
...@@ -115,7 +123,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService { ...@@ -115,7 +123,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
doorEventReq.setPageNo(i); doorEventReq.setPageNo(i);
doorEventReq.setPageSize(1000); doorEventReq.setPageSize(1000);
doorEventsRest = hikDoorService.getDoorEvents(doorEventReq); doorEventsRest = hikDoorService.getDoorEvents(doorEventReq);
// log.info("doorEventsRest:{} msg:{},page:{}", doorEventsRest.getCode(), doorEventsRest.getMsg(), doorEventReq.getPageNo()); // log.info("doorEventsRest:{} msg:{},page:{}", doorEventsRest.getCode(), doorEventsRest.getMsg(), doorEventReq.getPageNo());
getDoorEvents(doorEventsRest); getDoorEvents(doorEventsRest);
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @ ac4c4c57
...@@ -77,13 +77,14 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService { ...@@ -77,13 +77,14 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
private void syncDoorEvents() { private void syncDoorEvents() {
DoorEventReq doorEventReq = new DoorEventReq(); DoorEventReq doorEventReq = new DoorEventReq();
List<Integer> eventTypes = new ArrayList<>(); List<Integer> eventTypes = new ArrayList<>();
eventTypes.add(196885); // eventTypes.add(196885);
eventTypes.add(196887); // eventTypes.add(196887);
eventTypes.add(196893); // eventTypes.add(196893);
eventTypes.add(196888); // eventTypes.add(196888);
eventTypes.add(196889); // eventTypes.add(196889);
eventTypes.add(196890); // eventTypes.add(196890);
eventTypes.add(196891); // eventTypes.add(196891);
eventTypes.add(196893);//人脸认证通过
doorEventReq.setEventTypes(eventTypes); doorEventReq.setEventTypes(eventTypes);
// 获取当天的开始时间 // 获取当天的开始时间
//Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate(); //Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/AttendanceStatService.java
View file @ ac4c4c57
...@@ -24,4 +24,8 @@ public interface AttendanceStatService extends ICRUDService<AttendanceStatEntity ...@@ -24,4 +24,8 @@ public interface AttendanceStatService extends ICRUDService<AttendanceStatEntity
void doAttendanceSummary(AttendanceSummaryQuery query); void doAttendanceSummary(AttendanceSummaryQuery query);
Result<AttendanceStatEntity> findExt(AttendanceSummaryQuery params, PageInfo pageInfo, Context context) throws AppException; Result<AttendanceStatEntity> findExt(AttendanceSummaryQuery params, PageInfo pageInfo, Context context) throws AppException;
void homeStat(Context context) throws AppException;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java
View file @ ac4c4c57
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -50,6 +51,9 @@ import java.io.IOException; ...@@ -50,6 +51,9 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -338,16 +342,55 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -338,16 +342,55 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
Map<Object,Boolean> seen = new ConcurrentHashMap<>();
//putIfAbsent方法添加键值对，如果map集合中没有该key对应的值，则直接添加，并返回null，如果已经存在对应的值，则依旧为原来的值。
//如果返回null表示添加数据成功(不重复)，不重复(null==null :TRUE)
return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
}
@Override @Override
protected int doListAfter(AttendanceRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected int doListAfter(AttendanceRecordEntity query, Map<String, Object> model, Context context) throws AppException {
List<AttendanceRecordEntity> list = (List<AttendanceRecordEntity>) model.get(KEY_RESULT_DATA); List<AttendanceRecordEntity> list = (List<AttendanceRecordEntity>) model.get(KEY_RESULT_DATA);
//求出列表中最多detail 的 添加动态列
List<AttendanceRecordDetailEntity> collect = list.parallelStream() List<AttendanceRecordDetailEntity> collect = list.parallelStream()
.flatMap(item -> item.getAttendanceRecordDetailList().stream()) .flatMap(item -> item.getAttendanceRecordDetailList().stream())
.distinct() .filter(distinctByKey(f->f.getOrderNum()))
.sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum)) .sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum))
.collect(Collectors.toList()); .collect(Collectors.toList());
//list.parallelStream().collect(Collectors.groupingBy())
List<AttDsyncColumn> dsyncColumns = new ArrayList<>(); List<AttDsyncColumn> dsyncColumns = new ArrayList<>();
/* for (int i = 1; i <= collect.size(); i++) {
AttDsyncColumn attDsyncColumn = new AttDsyncColumn();
attDsyncColumn.setName(String.format("上班%s打卡时间", i));
attDsyncColumn.setProperty("goWorkDate");
attDsyncColumn.setOrderNum(i);
dsyncColumns.add(attDsyncColumn);
attDsyncColumn = new AttDsyncColumn();
attDsyncColumn.setName(String.format("上班%s打卡结果", i));
attDsyncColumn.setProperty("goWorkResult");
attDsyncColumn.setOrderNum(i);
dsyncColumns.add(attDsyncColumn);
attDsyncColumn = new AttDsyncColumn();
attDsyncColumn.setName(String.format("下班%s打卡时间", i));
attDsyncColumn.setProperty("offWorkDate");
attDsyncColumn.setOrderNum(i);
dsyncColumns.add(attDsyncColumn);
attDsyncColumn = new AttDsyncColumn();
attDsyncColumn.setName(String.format("下班%s打卡结果",i));
attDsyncColumn.setProperty("offWorkResult");
attDsyncColumn.setOrderNum(i);
dsyncColumns.add(attDsyncColumn);
}*/
collect.forEach(item -> { collect.forEach(item -> {
AttDsyncColumn attDsyncColumn = new AttDsyncColumn(); AttDsyncColumn attDsyncColumn = new AttDsyncColumn();
attDsyncColumn.setName(String.format("上班%s打卡时间", item.getOrderNum())); attDsyncColumn.setName(String.format("上班%s打卡时间", item.getOrderNum()));
...@@ -391,7 +434,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -391,7 +434,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
return null; return null;
}).filter(f -> f != null).collect(Collectors.toList()); }).filter(f -> f != null).collect(Collectors.toList());
if (ObjectUtils.isEmpty(addDetailList)) { if (!ObjectUtils.isEmpty(addDetailList)) {
recordEntity.getAttendanceRecordDetailList().addAll(addDetailList); recordEntity.getAttendanceRecordDetailList().addAll(addDetailList);
List<AttendanceRecordDetailEntity> orderList = recordEntity.getAttendanceRecordDetailList().stream().sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum)) List<AttendanceRecordDetailEntity> orderList = recordEntity.getAttendanceRecordDetailList().stream().sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum))
.collect(Collectors.toList()); .collect(Collectors.toList());
...@@ -399,57 +442,6 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -399,57 +442,6 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
} }
} }
model.put("dyncColumns", dsyncColumns); model.put("dyncColumns", dsyncColumns);
/* //出勤情况
//总人数
Integer total = (Integer)model.get("total");
//未出勤
Integer noAtt = 0;
//迟到
Integer beLate = 0;
//早退
Integer leaveEarly = 0;
//缺卡
Integer lackOfCards = 0;
for (AttendanceRecordEntity attendanceRecordEntity : list) {
boolean a = true;
for (AttendanceRecordDetailEntity item : attendanceRecordEntity.getAttendanceRecordDetailList()) {
if (item.getGoWorkResult()==3){
lackOfCards=lackOfCards+1;
}
if (item.getGoWorkResult()==4){
beLate = beLate+1;
}
if (item.getOffWorkResult()==3){
lackOfCards=lackOfCards+1;
}
if (item.getOffWorkResult()==5){
leaveEarly = leaveEarly +1;
}
if (item.getGoWorkResult()!=3 || item.getOffWorkResult()!=3){
a = false;
}
}
if (a){
noAtt = noAtt+1;
}
}
String attPercentage = "";
if (total!=0){
float l = ((total - noAtt) / total)*100;
attPercentage =l+"%";
}else {
attPercentage = "0";
}
AttendanceStatus attendanceStatus = new AttendanceStatus();
attendanceStatus.setNeedAttNum(total);
attendanceStatus.setAttPercentage(attPercentage);
attendanceStatus.setNoAtt(noAtt);
attendanceStatus.setBeLate(beLate);
attendanceStatus.setLeaveEarly(leaveEarly);
attendanceStatus.setLackOfCards(lackOfCards);
model.put("attendanceStatus",attendanceStatus);*/
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment