Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 355de78b 6a54d719
Hide whitespace changes
Inline Side-by-side
Showing with 624 additions and 270 deletions
attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
View file @ d47fc167
...@@ -179,6 +179,15 @@ export default { ...@@ -179,6 +179,15 @@ export default {
}, },
mounted() { mounted() {
this.getDeptData() this.getDeptData()
// let query = this.$route
// console.log(query.query)
// if (query.id) {
// console.log(this.$route.query)
// let editFeedback = JSON.parse(localStorage.getItem("editFeedback"))
// console.log(editFeedback)
// this.titleForm.title = editFeedback.title
// this.titleForm.remark = editFeedback.remark
// }
}, },
methods: { methods: {
subUser() { subUser() {
......
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
View file @ d47fc167
...@@ -44,12 +44,14 @@ export default { ...@@ -44,12 +44,14 @@ export default {
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.drawerform.edit(row); // this.$refs.drawerform.edit(row);
this.$router.push({ path: `/feedback/addQuestion/list?id =${row.id}` });
localStorage.setItem('editFeedback', JSON.stringify(row))
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
console.log(row) console.log(row)
localStorage.setItem('checkFeedbackId',row.id) localStorage.setItem('checkFeedbackId', row.id)
// this.$refs.drawerform.view(row); // this.$refs.drawerform.view(row);
this.$router.push('/feedback/questionnaire/list') this.$router.push('/feedback/questionnaire/list')
}, },
...@@ -86,7 +88,16 @@ export default { ...@@ -86,7 +88,16 @@ export default {
{ label: "反馈人数", prop: "feedbackNum", formatter: this.formatter }, { label: "反馈人数", prop: "feedbackNum", formatter: this.formatter },
{ label: "创建用户", prop: "createUserId", formatter: this.formatter }, // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
{
label: "状态", prop: "processStatus", formatter: (row) => {
return (
<el-tag type={row.processStatus ? row.processStatus = 1 ? 'success' : 'info' : 'danger'} size="small">
{row.processStatus ? row.processStatus = 1 ? '进行中' : '已结束' : '未开始'}
</el-tag>
)
}
},
// { // {
// label: "绩效反馈问题", // label: "绩效反馈问题",
// width: 120, // width: 120,
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ d47fc167
...@@ -6,43 +6,73 @@ ...@@ -6,43 +6,73 @@
<el-tab-pane label="问卷情况" name="1"> <el-tab-pane label="问卷情况" name="1">
<div class="top" style="margin: 10px 0;"> <div class="top" style="margin: 10px 0;">
<div style="width: 80%;"> <div style="width: 80%;">
<div class="title">{{ this.feedbackData.title }}</div> <div class="title">{{ feedbackData.title }}</div>
<div class="tips"> <div class="tips">
{{ this.feedbackData.remark }} {{ feedbackData.remark }}
</div> </div>
</div> </div>
<el-button type="success" @click="drawer = true">预览</el-button> <el-button type="success" @click="drawer = true">预览</el-button>
</div> </div>
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-tag type="success"> 进行中</el-tag> 反馈时间：2023-06-23 09:00:00~2023-06-24 17:00:00 <el-tag :type="feedbackData.processStatus ? feedbackData.processStatus = 1 ? 'success' : 'info' : 'danger'" >
{{ feedbackData.processStatus ? feedbackData.processStatus
== 1 ? '进行中' : '已结束' : '未开始' }}</el-tag>
反馈时间：{{ feedbackData.timeStart }} ~ {{ feedbackData.timeEnd }}
</div> </div>
<div class="content"> <div class="content">
<div class="cLeft"> <div class="cLeft">
<div> <div>
<span class="cLeftTop" style="margin: 0;" :class="selTitle == 1 ? 'title' : ''" <span class="cLeftTop" style="margin: 0;" :class="selTitle == 1 ? 'title' : ''"
@click="selTitle = 1">全部数据（220）</span> @click="selTitle = 1">全部数据（{{ staffList.total }}）</span>
<span class="cLeftTop" :class="selTitle == 2 ? 'title' : ''" @click="selTitle = 2">已反馈（1）</span> <span class="cLeftTop" :class="selTitle == 2 ? 'title' : ''" @click="selTitle = 2">已反馈（{{
<span class="cLeftTop" :class="selTitle == 3 ? 'title' : ''" staffList.feedBack }}）</span>
@click="selTitle = 3">未反馈（219）</span> <span class="cLeftTop" :class="selTitle == 3 ? 'title' : ''" @click="selTitle = 3">未反馈（{{
staffList.notBack }}）</span>
</div> </div>
<el-button class="m15" type="primary" size="small">导出数据</el-button> <!-- <el-button class="m15" type="primary" size="small">导出数据</el-button> -->
<div class="lBox m15"> <div class="lBox m15">
<div class="treeS"> <el-table ref="multipleTable" :data="staffList.data" tooltip-effect="dark" border
<el-tree :data="treeData" :props="defaultProps" @node-click="treeSub"></el-tree> style="width: 100%;max-height: 450px;background-color: transparent; text-align: center;"
</div> @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }"
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" :cell-style="{ 'text-align': 'center' }">
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column label="日期" width="120"> <!-- <el-table-column label="日期" width="120">
<template slot-scope="scope">{{ scope.row.date }}</template> <template slot-scope="scope">{{ scope.row.date }}</template>
</el-table-column> -->
<el-table-column prop="name" label="姓名">
</el-table-column>
<el-table-column prop="deptName" label="部门">
</el-table-column>
<el-table-column prop="positionName" label="职位">
<template slot-scope="scope">
{{ scope.row.positionName ? scope.row.positionName : '工作人员' }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" width="120"> <el-table-column prop="backStatus" label="是否反馈">
<template slot-scope="scope">
{{ scope.row.backStatus ? '已反馈' : '未反馈' }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="地址" show-overflow-tooltip> <el-table-column prop="backTimeF" label="反馈时间">
<template slot-scope="scope">
{{ scope.row.backTimeF ? scope.row.backTimeF : '--' }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div style="color: #3377ff; cursor: pointer;" @click="check(scope.row)">查看</div>
</template>
</el-table-column>
<!-- <el-table-column prop="address" label="地址" show-overflow-tooltip>
</el-table-column> -->
</el-table> </el-table>
<el-pagination style="margin-top: 20px;" @size-change="handleSizeChange"
@current-change="handleCurrentChange" :current-page.sync="currentPage2"
:page-sizes="[10, 20, 50, 100]" :page-size="staff.size" layout="sizes, prev, pager, next"
:total="staff.total">
</el-pagination>
</div> </div>
</div> </div>
<div class="cRight"> <div class="cRight">
...@@ -50,31 +80,33 @@ ...@@ -50,31 +80,33 @@
题型数据分析 题型数据分析
</div> </div>
<div class="scroll"> <div class="scroll">
<div class="box" v-for="i in 2"> <div class="box m15" v-for="i in questionArr1">
<div style="display: flex;align-items: center;"> <div v-if="i.questionType == 1 || i.questionType == 2">
<el-tag type="primary" effect="plain">单项选择</el-tag> <div style="display: flex;align-items: center;">
<div style="margin-left: 10px;">1.你是男性还是女性</div> <el-tag type="primary" effect="plain">{{ i.typeFormat }}</el-tag>
</div> <div style="margin-left: 10px;">{{ i.question }}</div>
<div class="m15"
style="display: flex;align-items: center;justify-content: space-around; width: 40%;">
<div style="text-align: center;">
<el-progress type="circle" :percentage="45" show-text width="75">男</el-progress>
<div>男</div>
</div> </div>
<div style="text-align: center;"> <div class="m15" style="display: flex;align-items: center; width: 40%;">
<el-progress type="circle" :percentage="45" show-text width="75">男</el-progress> <div style="text-align: center; margin-right: 40px;" v-for="j in i.optionList">
<div>女</div> <el-progress type="circle"
:percentage="(j.optionCount / i.allCount * 100).toFixed(2)" show-text
width="75">男</el-progress>
<div>{{ j.optionContent }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="box m15" v-for="i in 4"> <div class="box m15" v-for="i in feedbackData.feedbackQuestionList">
<div style="display: flex;align-items: center;"> <div v-if="i.questionType == 3 || i.questionType == 4">
<el-tag type="primary" effect="plain">单项选择</el-tag> <div style="display: flex;align-items: center;">
<div style="margin-left: 10px;">1.你是男性还是女性</div> <el-tag type="primary" effect="plain">{{ i.questionType == 3
? '单项填空' : '文本域填空' }}</el-tag>
<div style="margin-left: 10px;">{{ i.content }}</div>
</div>
<el-button class="m15" type="primary" size="small"
@click="getIntData(i)">查看详情答案</el-button>
</div> </div>
<el-button class="m15" type="primary" size="small"
@click="drawerAnswer = 1">查看详情答案</el-button>
</div> </div>
</div> </div>
...@@ -95,17 +127,43 @@ ...@@ -95,17 +127,43 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-drawer :visible.sync="drawerStaff" title="反馈详情" size="40%">
<div class="answerBox">
<div class="aTop">
{{ staffInfo.name }} - <span style="font-size: 14px;">{{ staffInfo.positionName ? staffInfo.positionName
: '工作人员' }}</span>
</div>
<div class="m10" v-for=" i in staffDetails">
<div>问题：{{ i.questionContent }}</div>
<div v-if="i.questionType == 1 || i.questionType == 2">
<div class="m10">答案：
<span v-for="(j, k) in i.feedbackAnswerOptionList" :key="k">
<span v-show="i.feedbackAnswerOptionList.length - k > 0 && k > 0">、</span>{{ j.optionContent
}}
</span>
</div>
</div>
<div v-if="i.questionType == 3 || i.questionType == 4">
<div class="m10">答案：
{{ i.content }}</div>
</div>
<el-divider class="m10"></el-divider>
</div>
</div>
</el-drawer>
<el-drawer :visible.sync="drawerAnswer" title="反馈详情" size="40%"> <el-drawer :visible.sync="drawerAnswer" title="反馈详情" size="40%">
<div class="answerBox"> <div class="answerBox">
<div class="aTop"> <div class="aTop">
问题：你的具体想法？ 问题：{{ drawerAnswerObj.content }}
</div> </div>
<el-table class="m15" :data="tableData" border style="width: 100%;"> <el-table class="m15" :data="drawerAnswerArr" border style="width: 100%;">
<el-table-column prop="date" label="日期" width="180">
</el-table-column>
<el-table-column prop="name" label="姓名" width="180"> <el-table-column prop="name" label="姓名" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="地址"> <el-table-column prop="backTimeF" label="反馈时间" width="180">
</el-table-column>
<el-table-column prop="answer" label="反馈详情">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -116,6 +174,33 @@ ...@@ -116,6 +174,33 @@
<script> <script>
import formCreate from "@form-create/element-ui"; import formCreate from "@form-create/element-ui";
import moment from "moment";
import { timestampToTime } from "@/assets/utils/dateFormat.js"
function formType(val) {
// (1.单项选择,2.多项选择,3.文本框,4.多项文本框,5.文字,6.上传附件)
switch (val) {
case 1:
return '单项选择'
break;
case 2:
return '多项选择'
break;
case 3:
return '文本框'
break;
case 4:
return '多项文本框'
break;
case 5:
return '文字'
break;
case 6:
return '上传附件'
break;
default:
break;
}
}
export default { export default {
data() { data() {
return { return {
...@@ -124,90 +209,116 @@ export default { ...@@ -124,90 +209,116 @@ export default {
Frule: '', Frule: '',
Fopthion: '', Fopthion: '',
drawerAnswer: false, drawerAnswer: false,
drawerAnswerObj: {},
drawerAnswerArr: [],
feedbackData: {}, feedbackData: {},
selTitle: 1, selTitle: 1,
tableData: [{ staff: {
date: '2016-05-02', page: 1,
name: '王小虎', size: 10,
address: '上海市普陀区金沙江路 1518 弄' total: 0,
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
treeData: [{
label: '一级 1',
children: [{
label: '二级 1-1',
children: [{
label: '三级 1-1-1'
}]
}]
}, {
label: '一级 2',
children: [{
label: '二级 2-1',
children: [{
label: '三级 2-1-1'
}]
}, {
label: '二级 2-2',
children: [{
label: '三级 2-2-1'
}]
}]
}, {
label: '一级 3',
children: [{
label: '二级 3-1',
children: [{
label: '三级 3-1-1'
}]
}, {
label: '二级 3-2',
children: [{
label: '三级 3-2-1'
}]
}]
}],
defaultProps: {
children: 'children',
label: 'label'
}, },
staffListS: [],
staffList: [], //人员
staffInfo: {},
drawerStaff: false,
staffDetails: [],
questionArr1: [], //题型分析
} }
}, },
watch: {
'selTitle'(val) {
let arr = []
this.staffList.data = this.staffListS
if (val == 2) {
this.staffList.data.forEach(i => {
if (i.backStatus) {
arr.push(i)
}
})
this.staffList.data = arr
} else if(val == 3) {
this.staffList.data.forEach(i => {
if (!i.backStatus) {
arr.push(i)
}
})
this.staffList.data = arr
}
}
},
mounted() { mounted() {
let id = localStorage.getItem('checkFeedbackId') let id = localStorage.getItem('checkFeedbackId')
this.getInfo(id) this.getInfo(id)
this.getStaffData(id)
}, },
methods: { methods: {
treeSub(data) {
console.log(data)
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
getInfo(id) { getInfo(id) {
//获取表单
this.$get('/feedback/info', { id }).then(res => { this.$get('/feedback/info', { id }).then(res => {
res.data.timeStart = moment(res.data.feedbackTimeStart).format('yyyy-MM-DD HH:mm:ss')
res.data.timeEnd = moment(res.data.feedbackTimeEnd).format('yyyy-MM-DD HH:mm:ss')
this.feedbackData = res.data this.feedbackData = res.data
console.log(this.feedbackData)
this.Frule = formCreate.parseJson(this.feedbackData.formContent) this.Frule = formCreate.parseJson(this.feedbackData.formContent)
this.Fopthion = formCreate.parseJson(this.feedbackData.ruleContent) this.Fopthion = formCreate.parseJson(this.feedbackData.ruleContent)
}) })
//题型分析--单选多选
this.$get('/feedback/getOptionSummaryList', { feedbackId: id }).then(res => { this.$get('/feedback/getOptionSummaryList', { feedbackId: id }).then(res => {
console.log(res) res.data.data.forEach(i => {
i.allCount = 0
i.typeFormat = formType(i.questionType)
i.optionList.forEach(j => {
i.allCount += j.optionCount
})
})
this.questionArr1 = res.data.data
// console.log(this.questionArr1)
}) })
}
},
getStaffData(id) {
//人员数据
this.$post('/feedback/getStaffList', { feedbackId: id, size: this.staff.size, page: this.staff.page }).then(res => {
this.staff.total = res.data.total
res.data.data.forEach(i => {
i.backTimeF = moment(i.backTime).format('YYYY-MM-DD')
})
this.staffList = res.data
this.staffListS = res.data.data
console.log(this.staffList, res)
})
},
//查看人员问卷详情
check(data) {
console.log(data)
this.staffInfo = data
this.drawerStaff = 1
this.$post('/feedback/answer/list', { staffId: data.staffId, feedbackId: data.feedbackId, page: 1, size: -1 }).then(res => {
this.staffDetails = res.data.data
console.log(this.staffDetails)
})
},
//题型分析--输入框
getIntData(data) {
console.log(data)
this.drawerAnswerObj = data
this.drawerAnswer = 1
this.$post('/feedback/getQuestionAnswerList', { questionId: data.id, page: 1, size: -1 }).then(res => {
res.data.data.forEach(i => {
console.log(i)
i.backTimeF = moment(i.backTime).format('YYYY-MM-DD')
})
this.drawerAnswerArr = res.data.data
console.log(this.drawerAnswerArr)
})
},
} }
} }
</script> </script>
...@@ -226,6 +337,10 @@ export default { ...@@ -226,6 +337,10 @@ export default {
margin-top: 15px; margin-top: 15px;
} }
.m10 {
margin-top: 10px;
}
.font { .font {
font-size: 16px; font-size: 16px;
line-height: 1.5; line-height: 1.5;
...@@ -340,12 +455,6 @@ export default { ...@@ -340,12 +455,6 @@ export default {
cursor: pointer; cursor: pointer;
} }
.lBox {
display: flex;
// align-items: center
justify-content: space-between;
}
} }
.cRight { .cRight {
......
attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
View file @ d47fc167
<template> <template>
<!-- 弹出框表单 --> <!-- 弹出框表单 -->
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="userName">
<div class="user-left">
<div class="user-name">
{{ form.staffName }}
</div>
<div class="user-info">
<span class="user-i">工号：{{ form.workNum }}</span>
<span class="user-i">所属部门：{{ form.deptName }}</span>
</div>
</div>
<div class="user-right">
<div class="n">{{form.totalScore}}</div>
<div class="m">{{ form.month }}月得分</div>
</div>
</div>
<div class="userName user-t-item " :class="{t2:item.subAddType == 1,t1:item.subAddType == 2}" v-for="(item) in list" :key="item.id">
<div class="user-left">
<div class="user-name">
{{dictVal('checkType',item.checkType)}}
</div>
<div class="user-info">
<span class="user-i">绩效规则：{{item.ruleName}}</span>
</div>
<div class="user-info">
<span class="user-i">核查时间：{{momentVal(item.checkTime)}}</span>
</div>
</div>
<div class="user-right">
<div class="n">{{item.subAddType==1?'+':'-'}}{{item.score}}</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id"/> <Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id" />
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号" />
<Field label="人员名称" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入人员名称"/> <Field label="人员名称" prop="staffName" v-model="form.staffName" type="textarea" placeholder="请输入人员名称" />
<Field label="部门id号" prop="deptId" v-model="form.deptId" placeholder="请输入部门id号"/> <Field label="部门id号" prop="deptId" v-model="form.deptId" placeholder="请输入部门id号" />
<Field label="部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入部门名称"/> <Field label="部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入部门名称" />
<Field label="考勤绩效指标分数" prop="attendScore" v-model="form.attendScore" placeholder="请输入考勤绩效指标分数"/> <Field label="考勤绩效指标分数" prop="attendScore" v-model="form.attendScore" placeholder="请输入考勤绩效指标分数" />
<Field label="评价绩效指标分数" prop="assessScore" v-model="form.assessScore" placeholder="请输入评价绩效指标分数"/> <Field label="评价绩效指标分数" prop="assessScore" v-model="form.assessScore" placeholder="请输入评价绩效指标分数" />
<Field label="办件绩效分数" prop="workScore" v-model="form.workScore" placeholder="请输入办件绩效分数"/> <Field label="办件绩效分数" prop="workScore" v-model="form.workScore" placeholder="请输入办件绩效分数" />
<Field label="效能绩效分数" prop="effectScore" v-model="form.effectScore" placeholder="请输入效能绩效分数"/> <Field label="效能绩效分数" prop="effectScore" v-model="form.effectScore" placeholder="请输入效能绩效分数" />
<Field label="其它绩效分数" prop="otherScore" v-model="form.otherScore" placeholder="请输入其它绩效分数"/> <Field label="其它绩效分数" prop="otherScore" v-model="form.otherScore" placeholder="请输入其它绩效分数" />
<Field label="累计异常分数" prop="errorScore" v-model="form.errorScore" placeholder="请输入累计异常分数"/> <Field label="累计异常分数" prop="errorScore" v-model="form.errorScore" placeholder="请输入累计异常分数" />
<Field label="当月得分数" prop="totalScore" v-model="form.totalScore" placeholder="请输入当月得分数"/> <Field label="当月得分数" prop="totalScore" v-model="form.totalScore" placeholder="请输入当月得分数" />
<Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注" />
<Field label="年" prop="year" v-model="form.year" placeholder="请输入年"/> <Field label="年" prop="year" v-model="form.year" placeholder="请输入年" />
<Field label="月" prop="month" v-model="form.month" type="select" :enumData="dict.month" placeholder="请选择月"/> <Field label="月" prop="month" v-model="form.month" type="select" :enumData="dict.month"
placeholder="请选择月" />
</el-row> </el-row>
</el-form> </el-form> -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
...@@ -30,103 +62,190 @@ ...@@ -30,103 +62,190 @@
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { import moment from "moment";
mixins: [form], export default {
components: { mixins: [form],
dialogShow , components: {
}, dialogShow,
data() { },
return { data() {
// 遮罩层 return {
loading: true, // 遮罩层
// 弹出层标题 loading: true,
title: "员工绩效统计", // 弹出层标题
// 是否显示弹出层 title: "员工绩效统计",
open: false, // 是否显示弹出层
toString:[ open: false,
"month", toString: [
"month",
],
// 表单校验
rules: {
year: [
{ required: true, message: "请输入年", trigger: "blur" },
], ],
// 表单校验 month: [
rules: { { required: true, message: "请输入月", trigger: "blur" },
year: [ ],
{required: true,message: "请输入年", trigger: "blur" }, },
], list:[],
month: [ dict:{}
{required: true,message: "请输入月", trigger: "blur" }, };
], },
methods: {
// 日期
momentVal(v){
return moment(v).format('YYYY-MM-DD HH:SS')
},
// 字典转换
dictVal(key,val){
return this.dict[key][val]
},
/** 查看汇总 */
checkAll(id) {
this.$post("/check/all/record/list", {checkStatus:2,staffId:id}).then((res) => {
const { code, data, dict } = res
if (code == 1) {
const row = data.data || []
//deductTime申诉时间 checkTime 核查时间 ruleName规则checkType字典 subAddType：1增加2减score
this.list = row
this.dict = dict
console.log(row,dict,"22222222222")
} }
}; });
},
/** 编辑 */
edit(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl = "staff/perform/summary/edit";
this.getData();
this.pageInfo.type = "edit"
this.title = "修改员工绩效统计";
},
/** 新增 */
add(row) {
this.reset()
this.urls.currUrl = "staff/perform/summary/add";
this.getData();
this.pageInfo.type = "add"
this.title = "新增员工绩效统计";
},
/** 查看*/
view(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl = "staff/perform/summary/view";
this.getData();
this.pageInfo.type = "view"
this.title = "员工绩效统计详细";
this.checkAll(row.staffId)
},
/**取消按钮 */
cancel() {
this.open = false;
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
}, },
methods: { afterSubmit(data) {
/** 编辑 */ this.open = false;
edit(row) { this.$emit("ok");
this.reset() },
this.query = { id: row.id };
this.urls.currUrl ="staff/perform/summary/edit";
this.getData();
this.pageInfo.type="edit"
this.title = "修改员工绩效统计";
},
/** 新增 */
add(row) {
this.reset()
this.urls.currUrl = "staff/perform/summary/add";
this.getData();
this.pageInfo.type="add"
this.title = "新增员工绩效统计";
},
/** 查看*/
view(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="staff/perform/summary/view";
this.getData();
this.pageInfo.type="view"
this.title = "员工绩效统计详细";
},
/**取消按钮 */
cancel() {
this.open = false;
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
},
afterSubmit(data) {
this.open = false;
this.$emit("ok");
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
staffId : 0, staffId: 0,
workNum : "", workNum: "",
staffName : "", staffName: "",
deptId : 0, deptId: 0,
deptName : "", deptName: "",
attendScore : null, attendScore: null,
assessScore : null, assessScore: null,
workScore : null, workScore: null,
effectScore : null, effectScore: null,
otherScore : null, otherScore: null,
errorScore : null, errorScore: null,
totalScore : null, totalScore: null,
remark : "", remark: "",
year : null, year: null,
month : null, month: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
resetForm(refName) { resetForm(refName) {
if (this.$refs[refName]) { if (this.$refs[refName]) {
this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
} }
},
}, },
}; },
};
</script> </script>
<style lang="less" scoped>
.userName {
background: rgba(242, 246, 252, 1);
display: flex;
align-items: center;
padding: 15px;
.user-left {
flex: 1;
}
.user-name {
font-size: 18px;
font-weight: bold;
}
.user-info {
margin-top: 10px;
.user-i {
margin-right: 40px;
}
}
.user-right {
text-align: center;
.n {
font-size: 16px;
font-weight: bold;
}
.m {
font-size: 12px;
}
}
}
.user-t-item {
margin-top: 20px;
border-left: 4px solid #FF4242;
}
.t1 {
border-color: #FF4242;
background: rgba(255, 66, 66, 0.07);
.user-name,
.n {
color: #FF4242;
}
}
.t2 {
border-color: rgba(27, 198, 167, 1);
background: rgba(27, 198, 167, 0.07);
.user-name,
.n {
color: rgba(27, 198, 167, 1);
}
}
</style>
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/AppealReq.java
View file @ d47fc167
...@@ -47,5 +47,6 @@ public class AppealReq extends BaseReq { ...@@ -47,5 +47,6 @@ public class AppealReq extends BaseReq {
private List<PerformAttendAppealFilesEntity> performAttendAppealFilesList = new ArrayList<>(); private List<PerformAttendAppealFilesEntity> performAttendAppealFilesList = new ArrayList<>();
; ;
private Long checkRecordId;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java
View file @ d47fc167
...@@ -151,4 +151,7 @@ public class InspectSaveReq extends BaseReq { ...@@ -151,4 +151,7 @@ public class InspectSaveReq extends BaseReq {
*/ */
private String ruleDesc; private String ruleDesc;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java
View file @ d47fc167
...@@ -217,4 +217,8 @@ public class PerformDetailInfo { ...@@ -217,4 +217,8 @@ public class PerformDetailInfo {
private Integer irregularOtherType; private Integer irregularOtherType;
/**
* 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
*/
private Integer appealStatus;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
View file @ d47fc167
...@@ -121,8 +121,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -121,8 +121,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
} }
PageInfo pageInfo = buildPageInfo(appealReq); PageInfo pageInfo = buildPageInfo(appealReq);
PerformAttendAppealQuery query = new PerformAttendAppealQuery(); PerformAttendAppealQuery query = new PerformAttendAppealQuery();
query.setAppealTimeStart(appealReq.getApperalStartDate()); query.setCreateTimeStart(appealReq.getApperalStartDate());
query.setAppealTimeEnd(appealReq.getAppealEndDate()); query.setCreateTimeEnd(appealReq.getAppealEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context); Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context);
...@@ -221,6 +221,10 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -221,6 +221,10 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList()); entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
entity.setProcessStatus(1); entity.setProcessStatus(1);
entity.setAppealDesc(req.getAppealDesc()); entity.setAppealDesc(req.getAppealDesc());
entity.setStaffId(context.getUser().getCustomerId());
entity.setCreateUserId(context.getUser().getId());
entity.setCheckRecordId(req.getId());
PerformAttendAppealEntity saveEntity = appealService.save(entity, context); PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
rest.setData(saveEntity); rest.setData(saveEntity);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
View file @ d47fc167
...@@ -143,7 +143,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -143,7 +143,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
CheckAllRecordQuery query = new CheckAllRecordQuery(); CheckAllRecordQuery query = new CheckAllRecordQuery();
query.setCheckTimeStart(performReq.getPerformStartDate()); query.setCheckTimeStart(performReq.getPerformStartDate());
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setCreateUserId(context.getUser().getId()); query.setCreateUserId(context.getUser().getCustomerId());
if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) { if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query); List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
List<PerformInfo> collect = allCheckRecord.stream().map(item -> { List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
...@@ -217,8 +217,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -217,8 +217,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(req)); log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(req));
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】"); Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
Context context = this.getContext(); Context context = this.getContext();
// req.setStaffId(context.getUser().getCustomerId()); // req.setStaffId(context.getUser().getCustomerId());
try { try {
//根据状态 查询 当前是否已经存在正在进行的申诉 //根据状态 查询 当前是否已经存在正在进行的申诉
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
View file @ d47fc167
...@@ -167,9 +167,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -167,9 +167,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
if(!ObjectUtils.isEmpty(entity)) { if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} }
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -195,8 +197,9 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -195,8 +197,9 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (!ObjectUtils.isEmpty(entity)) { if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} }
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect); model.put(KEY_RESULT_DATA, collect);
...@@ -219,6 +222,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -219,6 +222,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (!ObjectUtils.isEmpty(entity)) { if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} }
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -242,6 +247,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -242,6 +247,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (!ObjectUtils.isEmpty(entity)) { if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} }
return performInfo; return performInfo;
...@@ -262,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -262,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity(); if (!ObjectUtils.isEmpty(entity)) {
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect); model.put(KEY_RESULT_DATA, collect);
...@@ -282,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -282,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect); model.put(KEY_RESULT_DATA, collect);
...@@ -337,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -337,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) { if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context); CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
} else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) { } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context); CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
...@@ -356,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -356,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
throw new AppException("不支持当前绩效类型"); throw new AppException("不支持当前绩效类型");
} }
PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
if (ObjectUtils.isEmpty(appealEntity)) {
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} else {
if (ProcessStatusEnum.未处理.getValue() == appealEntity.getProcessStatus()) {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
} else {
if (AppealResultEnum.通过.getValue() == appealEntity.getProcessStatus()) {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
} else if (AppealResultEnum.不通过.getValue() == appealEntity.getProcessStatus()) {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
}
}
}
rest.setData(performDetailInfo); rest.setData(performDetailInfo);
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @ d47fc167
...@@ -4,6 +4,10 @@ import com.mortals.framework.exception.AppException; ...@@ -4,6 +4,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -53,9 +57,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -53,9 +57,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord", "subAddType")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord", "checkStatus")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord", "subMethod")); this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @ d47fc167
...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -45,9 +49,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -45,9 +49,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckComplainRecord","subMethod"));
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckComplainRecord","checkStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckComplainRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @ d47fc167
...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -46,9 +50,12 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -46,9 +50,12 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType")); this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckEffectRecord","subMethod")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckEffectRecord","subAddType")); this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @ d47fc167
...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -45,9 +49,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -45,9 +49,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckGoworkRecord","subMethod"));
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckGoworkRecord","checkStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckGoworkRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @ d47fc167
...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -46,9 +50,10 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -46,9 +50,10 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType")); this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckOtherRecord","subMethod")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckOtherRecord","subAddType")); this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @ d47fc167
...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.SubAddTypeEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -47,9 +51,12 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -47,9 +51,12 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult")); this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult"));
this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource")); this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckReviewRecord","subMethod"));
this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckReviewRecord","checkStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckReviewRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
View file @ d47fc167
...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -45,9 +46,12 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -45,9 +46,12 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendRecord","subAddType")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendRecord","processStatus")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
View file @ d47fc167
package com.mortals.xhx.module.perform.web; package com.mortals.xhx.module.perform.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.apache.tomcat.jni.Proc;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -42,9 +44,12 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont ...@@ -42,9 +44,12 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformComplainRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformComplainRecord","processStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformComplainRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
View file @ d47fc167
...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -46,9 +47,12 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -46,9 +47,12 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType")); this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformEffectRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformEffectRecord","processStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformEffectRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @ d47fc167
...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -45,9 +46,13 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -45,9 +46,13 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformGoworkRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformGoworkRecord","processStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformGoworkRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
View file @ d47fc167
...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -46,9 +47,13 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl ...@@ -46,9 +47,13 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType")); this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformOtherRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformOtherRecord","processStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformOtherRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
View file @ d47fc167
...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException; ...@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -47,9 +48,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -47,9 +48,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewResult")); this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewResult"));
this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource")); this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource"));
this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformReviewRecord","subMethod")); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformReviewRecord","processStatus")); this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformReviewRecord","subAddType")); this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context); super.init(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