Skip to content

A
attendance-performance-platform
Commit bd4e685a authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a3c61810 27d6a162
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9732 additions and 9325 deletions
attendance-performance-manager-ui/admin/src/components/DataTable.vue
View file @ bd4e685a
......@@ -12,7 +12,7 @@
:empty-text="emptytxt ? emptytxt : emptyText"
border
style="width: 100%"
height="570"
height="530"
>
<el-table-column
v-for="column in columns"
......
attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue
View file @ bd4e685a
......@@ -7,9 +7,9 @@
size="mini"
@click="$emit('edit', row)"
title="编辑"
style="margin-left: 0;margin-right: 5px"
>编辑</el-button
>
<span>&nbsp;</span>
<el-button
v-if="!noView"
type="text"
......@@ -17,18 +17,18 @@
size="mini"
@click="$emit('view', row)"
title="查看"
style="margin-left: 0;margin-right: 5px"
>查看</el-button
>
<span>&nbsp;</span>
<el-switch
v-if="switchBtn"
v-model="row.check"
@change="$emit('view', row)"
title="核查"
:active-value="true"
style="margin-left: 0;margin-right: 5px"
:inactive-value="false"
></el-switch>
<span>&nbsp;</span>
<el-button
v-if="reCheck"
type="text"
......@@ -36,9 +36,9 @@
size="mini"
@click="$emit('edit', row)"
title="核查"
style="margin-left: 0;margin-right: 5px"
>核查</el-button
>
<span>&nbsp;</span>
<el-button
v-if="chuli"
type="text"
......@@ -46,9 +46,9 @@
size="mini"
@click="$emit('edit', row)"
title="处理"
style="margin-left: 0;margin-right: 5px"
>处理</el-button
>
<span>&nbsp;</span>
<Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗？">
<el-button
v-if="!noDel"
......@@ -56,6 +56,7 @@
icon="el-icon-delete"
size="mini"
title="删除"
style="margin-left: 0;margin-right: 5px"
>删除</el-button
>
</Confirm>
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ bd4e685a
......@@ -255,6 +255,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ bd4e685a
......@@ -262,6 +262,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ bd4e685a
......@@ -262,6 +262,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ bd4e685a
......@@ -250,6 +250,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ bd4e685a
......@@ -258,6 +258,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ bd4e685a
......@@ -259,6 +259,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.checkStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
View file @ bd4e685a
......@@ -507,6 +507,9 @@ export default {
],
createTime: [{ required: true, message: "请选择创建时间" }],
},
urls: {
saveUrl: "/perform/attend/appeal/audit",
},
};
},
......@@ -521,7 +524,6 @@ export default {
formatterDate,
// 下载附件
hanldeDownloadFile(val) {
console.log(val);
downloadFile(val.filePath, val.fileName);
},
picMatter(val) {
......@@ -617,10 +619,20 @@ export default {
view(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "perform/attend/appeal/view";
this.getData();
this.form.view = "查看";
this.pageInfo.type = "view";
// this.urls.currUrl = "perform/attend/appeal/view";
// this.getData();
this.$get("/perform/attend/appeal/view", { id: row.id }).then((res) => {
if (res.code == 1) {
this.form = res.data.entity;
this.dict = res.data.dict;
} else {
this.reset();
}
this.form.view = "查看";
this.pageInfo.type = "view";
this.open = true;
});
this.title = "绩效记录申诉信息详细";
},
/**取消按钮 */
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
View file @ bd4e685a
......@@ -13,8 +13,17 @@
<div class="content">
<div class="search_box">
<div class="search">
<el-select v-model="dateValue" placeholder="请选择" style="margin: 0 10px;">
<el-option v-for="item in optionsMonths" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="dateValue"
placeholder="请选择"
style="margin: 0 10px;"
>
<el-option
v-for="item in optionsMonths"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-button type="primary" @click="getChartsData">搜索</el-button>
......@@ -23,17 +32,32 @@
<div class="data_box">
<div class="top">
<div class="box">
<bar-charts :title="'申诉次数部门排名TOP20'" :id="'dept_20'" :legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }" :chartsData="depChartsData" />
<bar-charts
:title="'申诉次数部门排名TOP20'"
:id="'dept_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }"
:chartsData="depChartsData"
/>
</div>
<div class="box">
<bar-charts :title="'申诉次数个人排名TOP20'" :id="'person_20'" :legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }" :chartsData="personChartsData" />
<bar-charts
:title="'申诉次数个人排名TOP20'"
:id="'person_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '800px', height: '360px' }"
:chartsData="personChartsData"
/>
</div>
</div>
<div class="down">
<bar-charts :title="'申诉次数规则排名TOP20'" :id="'rule_20'" :legendName="'申诉次数'"
:styleObj="{ width: '1800px', height: '320px' }" :chartsData="depChartsData" />
<bar-charts
:title="'申诉次数规则排名TOP20'"
:id="'rule_20'"
:legendName="'申诉次数'"
:styleObj="{ width: '1800px', height: '320px' }"
:chartsData="depChartsData"
/>
</div>
</div>
</div>
......@@ -71,28 +95,37 @@ export default {
getData() {
this.activeName == 1 || this.activeName == 2
? this.$post("/perform/attend/appeal/list", {
processStatus: this.activeName,
}).then((res) => {
console.log(res);
if (res.code == 1) {
this.tableData = res.data;
}
})
processStatus: this.activeName,
}).then((res) => {
console.log(res);
if (res.code == 1) {
this.tableData = res.data;
}
})
: this.getChartsData();
},
getChartsData() {
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 1 }).then(res => {
console.log(res)
this.depChartsData = res.data
})
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 2 }).then(res => {
console.log(res)
this.personChartsData = res.data
})
this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 3 }).then(res => {
console.log(res)
this.ruleChartsData = res.data
})
this.$post("/perform/attend/appeal/stat", {
appealTimeStart: this.dateValue,
statType: 1,
}).then((res) => {
console.log(res);
this.depChartsData = res.data;
});
this.$post("/perform/attend/appeal/stat", {
appealTimeStart: this.dateValue,
statType: 2,
}).then((res) => {
console.log(res);
this.personChartsData = res.data;
});
this.$post("/perform/attend/appeal/stat", {
appealTimeStart: this.dateValue,
statType: 3,
}).then((res) => {
console.log(res);
this.ruleChartsData = res.data;
});
},
renderTable(tableData) {
return (
......@@ -171,10 +204,19 @@ export default {
{ label: "所属部门", prop: "deptName" },
{ label: "违规类型", prop: "irregularOtherType" },
{
label: "违规类型",
prop: "irregularType",
formatter: this.formatter,
},
{ label: "绩效规则", prop: "ruleId", formatter: this.formatter },
{ label: "加分/扣分方式", prop: "subAddType", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subAddType",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -225,7 +267,6 @@ export default {
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
......@@ -293,7 +334,7 @@ export default {
label: "12月",
},
],
dateValue: '2023-07-01 00:00:00',
dateValue: "2023-07-01 00:00:00",
};
},
};
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @ bd4e685a
......@@ -218,7 +218,7 @@ export default {
{ label: "异常结果", prop: "errorResult" },
/*
/*
{
label: "图片凭证",
prop: "filePaths",
......@@ -232,10 +232,13 @@ export default {
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -256,6 +259,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
View file @ bd4e685a
......@@ -232,7 +232,11 @@ export default {
{ label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -253,6 +257,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
View file @ bd4e685a
......@@ -232,7 +232,11 @@ export default {
},
{ label: "绩效规则", prop: "ruleName" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -252,7 +256,8 @@ export default {
{
label: "操作",
width: 240,
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
View file @ bd4e685a
......@@ -219,7 +219,11 @@ export default {
},
{ label: "绩效规则", prop: "ruleName" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -239,7 +243,8 @@ export default {
{
label: "操作",
width: 240,
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
View file @ bd4e685a
......@@ -248,7 +248,8 @@ export default {
{
label: "操作",
width: 240,
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
View file @ bd4e685a
......@@ -230,7 +230,11 @@ export default {
{ label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{
label: "加分/扣分时间",
......@@ -251,6 +255,7 @@ export default {
{
label: "操作",
width: 200,
fixed: "right",
formatter: (row) => {
return row.processStatus == 1 ? (
<table-buttons
......
attendance-performance-manager-ui/admin/src/views/system/user/list.vue
View file @ bd4e685a
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig" notDel />
<LayoutTable :data="tableData" :config="tableConfig" notDel />
<dialog-show ref="dialogform" @ok="getData" />
<el-dialog title="用户已分配的角色" :visible.sync="role.visible">
......@@ -40,27 +40,25 @@
</div>
</el-dialog>
<el-dialog
:title="userDeptDialog.title"
:visible.sync="userDeptDialog.open"
width="60%"
append-to-body
:title="userDeptDialog.title"
:visible.sync="userDeptDialog.open"
width="60%"
append-to-body
>
<div class="mytree">
<el-tree
ref="bomTree"
:data="data"
id="el-tree"
indent="0"
node-key="id"
:props="treeProps"
:load="loadNode"
highlight-current
lazy
:render-content="renderContent"
@node-click="handleNodeClick"
ref="bomTree"
:data="data"
id="el-tree"
indent="0"
node-key="id"
:props="treeProps"
:load="loadNode"
highlight-current
lazy
:render-content="renderContent"
@node-click="handleNodeClick"
>
</el-tree>
</div>
......@@ -95,9 +93,9 @@ export default {
this.tableData.loading = false;
},
renderContent: function (h, { node, data, store }) {
renderContent: function(h, { node, data, store }) {
return (
<span>
<span>
<i style="font-size:16px;color:#409EFF" class={data.icon}></i>
<span style="padding-left: 2px;font-size:14px">{node.label}</span>
</span>
......@@ -128,18 +126,17 @@ export default {
// });
},
userDeptConfirm(row) {
if(Object.keys(this.node).length === 0){
if (Object.keys(this.node).length === 0) {
this.$message.error("请选择一个部门！");
return;
}
this.userDeptDialog.data['deptId']=this.node.id;
this.userDeptDialog.data['deptName']=this.node.label;
this.userDeptDialog.data["deptId"] = this.node.id;
this.userDeptDialog.data["deptName"] = this.node.label;
this.$post("/user/save", this.userDeptDialog.data).then((res) => {
if (res && res.code == 1) {
this.userDeptDialog.data = {};
this.node=null;
this.node = null;
this.$message.success("分配部门成功！");
this.getData();
}
......@@ -148,7 +145,6 @@ export default {
});
},
// 获取角色列表与当前用户角色列表
userRoleConfirm(row) {
let data = this.userRoleDialog.data;
......@@ -182,7 +178,6 @@ export default {
this.tableData.loading = false;
},
async distributeDept(row) {
console.log("分配部门");
try {
......@@ -193,9 +188,8 @@ export default {
parentId: 0,
}).then(({ data }) => {
this.data = data.result;
this.node={}
console.log("data",this.data)
this.node = {};
console.log("data", this.data);
});
this.userDeptDialog.open = true;
});
......@@ -218,8 +212,8 @@ export default {
getRoleUsers(id) {
return new Promise((resolve, reject) => {
this.$post("/role/user/list", {
"userId": id,
"size": -1,
userId: id,
size: -1,
})
.then(({ data }) => {
const result = data.data
......@@ -247,7 +241,7 @@ export default {
return {
allRoles: {},
nodeData: {},
node:{},
node: {},
data: [],
tree: [],
roles: [],
......@@ -276,10 +270,10 @@ export default {
visible: false,
},
config: {
isshowTabPane:true,
isshowTabPane: true,
columns: [
{ type: "selection",reserveSelection:true, width: 60 },
{ type: "index", label: "序号",align:"center", width: 50 },
{ type: "selection", reserveSelection: true, width: 60 },
{ type: "index", label: "序号", align: "center", width: 50 },
{
prop: "loginName",
label: "登录名称",
......@@ -346,23 +340,22 @@ export default {
*/}
<span> </span>
<el-button
size="mini"
type="text"
icon="el-icon-share"
onClick={() => this.distributeDept(row)}
size="mini"
type="text"
icon="el-icon-share"
onClick={() => this.distributeDept(row)}
>
分配部门
</el-button>
<span> </span>
<span> </span>
<el-button
size="mini"
type="text"
icon="el-icon-share"
onClick={() => this.distributeDept(row)}
size="mini"
type="text"
icon="el-icon-share"
onClick={() => this.distributeDept(row)}
>
修改密码
</el-button>
</div>
);
},
......@@ -394,16 +387,16 @@ export default {
<style lang="scss" scoped>
.mytree ::v-deep {
.el-tree--highlight-current
::v-deep
.el-tree-node.is-checked
> .el-tree-node__content {
::v-deep
.el-tree-node.is-checked
> .el-tree-node__content {
background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255);
}
.el-tree--highlight-current
::v-deep
.el-tree-node.is-current
> .el-tree-node__content {
::v-deep
.el-tree-node.is-current
> .el-tree-node__content {
background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255);
}
......@@ -464,7 +457,5 @@ export default {
top: 12px;
width: 24px;
}
}
</style>
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ bd4e685a
......@@ -155,6 +155,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setAttendScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -163,20 +164,20 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if (temp != null) {
if (temp.getReviewScore() == null) {
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
if (temp.getReviewScore() != null) {
staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
}
if (temp.getOtherScore() == null) {
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
if (temp.getOtherScore() != null) {
staffPerformSummaryEntity.setOtherScore(temp.getOtherScore());
}
if (temp.getGoworkScore() == null) {
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
if (temp.getGoworkScore() != null) {
staffPerformSummaryEntity.setGoworkScore(temp.getGoworkScore());
}
if (temp.getEffectScore() == null) {
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
if (temp.getEffectScore() != null) {
staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
}
if (temp.getComplainScore() == null) {
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
if (temp.getComplainScore() != null) {
staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
View file @ bd4e685a
......@@ -157,6 +157,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
if(CollectionUtils.isNotEmpty(summaryVoList)){
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setComplainScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -165,20 +166,20 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getAttendScore()==null){
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
if(temp.getAttendScore()!=null){
staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
if(temp.getOtherScore()!=null){
staffPerformSummaryEntity.setOtherScore(temp.getOtherScore());
}
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
if(temp.getGoworkScore()!=null){
staffPerformSummaryEntity.setGoworkScore(temp.getGoworkScore());
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
if(temp.getEffectScore()!=null){
staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
}
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
if(temp.getReviewScore()!=null){
staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java
View file @ bd4e685a
......@@ -157,6 +157,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
if(CollectionUtils.isNotEmpty(summaryVoList)){
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setEffectScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -165,20 +166,20 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
if(temp.getReviewScore()!=null){
staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
if(temp.getOtherScore()!=null){
staffPerformSummaryEntity.setOtherScore(temp.getOtherScore());
}
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
if(temp.getGoworkScore()!=null){
staffPerformSummaryEntity.setGoworkScore(temp.getGoworkScore());
}
if(temp.getAttendScore()==null){
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
if(temp.getAttendScore()!=null){
staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());
}
if (temp.getComplainScore() == null) {
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
if (temp.getComplainScore() != null) {
staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java
View file @ bd4e685a
......@@ -156,6 +156,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
if(CollectionUtils.isNotEmpty(summaryVoList)){
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setGoworkScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -164,20 +165,20 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
if(temp.getReviewScore()!=null){
staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
if(temp.getOtherScore()!=null){
staffPerformSummaryEntity.setOtherScore(temp.getOtherScore());
}
if(temp.getAttendScore()==null){
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
if(temp.getAttendScore()!=null){
staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
if(temp.getEffectScore()!=null){
staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
}
if (temp.getComplainScore() == null) {
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
if (temp.getComplainScore() != null) {
staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java
View file @ bd4e685a
......@@ -162,6 +162,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setOtherScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -170,20 +171,20 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if (temp != null) {
if (temp.getReviewScore() == null) {
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
if (temp.getReviewScore() != null) {
staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
}
if (temp.getAttendScore() == null) {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
if (temp.getAttendScore() != null) {
staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());
}
if (temp.getGoworkScore() == null) {
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
if (temp.getGoworkScore() != null) {
staffPerformSummaryEntity.setGoworkScore(temp.getGoworkScore());
}
if (temp.getEffectScore() == null) {
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
if (temp.getEffectScore() != null) {
staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
}
if (temp.getComplainScore() == null) {
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
if (temp.getComplainScore() != null) {
staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java
View file @ bd4e685a
......@@ -162,6 +162,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setReviewScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
......@@ -170,20 +171,20 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if (temp != null) {
if (temp.getAttendScore() == null) {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
if (temp.getAttendScore() != null) {
staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());
}
if (temp.getOtherScore() == null) {
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
if (temp.getOtherScore() != null) {
staffPerformSummaryEntity.setOtherScore(temp.getOtherScore());
}
if (temp.getGoworkScore() == null) {
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
if (temp.getGoworkScore() != null) {
staffPerformSummaryEntity.setGoworkScore(temp.getGoworkScore());
}
if (temp.getEffectScore() == null) {
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
if (temp.getEffectScore() != null) {
staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
}
if (temp.getComplainScore() == null) {
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
if (temp.getComplainScore() != null) {
staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
}
BigDecimal erro = new BigDecimal(0);
erro = erro.add(staffPerformSummaryEntity.getReviewScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
View file @ bd4e685a
......@@ -110,15 +110,30 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
PageInfo pageInfo = this.buildPageInfo(query);
Result<FeedbackStaffInfoVo> result = this.getService().getFeedbackStaffList(query, pageInfo);
if (CollectionUtils.isNotEmpty(result.getList())) {
Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.getList().stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
if (groupMap.containsKey(1)) {
model.put("feedBack", groupMap.get(1).size());
} else {
// Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.getList().stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
// if (groupMap.containsKey(1)) {
// model.put("feedBack", groupMap.get(1).size());
// } else {
// model.put("feedBack", 0);
// }
// if (groupMap.containsKey(0)) {
// model.put("notBack", groupMap.get(0).size());
// } else {
// model.put("notBack", 0);
// }
query.setBackStatus(1);
PageInfo noPageInfo = new PageInfo(-1);
Result<FeedbackStaffInfoVo> feedBack = this.getService().getFeedbackStaffList(query, noPageInfo);
query.setBackStatus(0);
Result<FeedbackStaffInfoVo> notBack = this.getService().getFeedbackStaffList(query, noPageInfo);
if(CollectionUtils.isNotEmpty(feedBack.getList())){
model.put("feedBack", feedBack.getList().size());
}else {
model.put("feedBack", 0);
}
if (groupMap.containsKey(0)) {
model.put("notBack", groupMap.get(0).size());
} else {
if(CollectionUtils.isNotEmpty(notBack.getList())){
model.put("notBack", notBack.getList().size());
}else {
model.put("notBack", 0);
}
} else {
......
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