Skip to content

A
attendance-performance-platform
Commit a39156d0 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

parents b7d775c5 5b17c343
Hide whitespace changes
Inline Side-by-side
Showing with 474 additions and 309 deletions
attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
View file @ a39156d0
...@@ -34,18 +34,6 @@ ...@@ -34,18 +34,6 @@
</template> </template>
</fc-designer> </fc-designer>
</div> </div>
<!-- <div class="tool">
<el-row>
<el-button icon="el-icon-download" type="primary" size="small" @click="getFormJson()"
round>生成表单JSON</el-button>
<el-button icon="el-icon-download" type="success" size="small" @click="getFormOption()"
round>生成表单配置</el-button>
<el-button icon="el-icon-upload" type="primary" size="small" @click="showDrawer"
round>移动端预览</el-button>
</el-row>
</div> -->
<el-drawer :visible.sync="drawer" title="预览"> <el-drawer :visible.sync="drawer" title="预览">
<div class="showPhone"> <div class="showPhone">
<div class="phone"> <div class="phone">
...@@ -59,14 +47,20 @@ ...@@ -59,14 +47,20 @@
<el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh"> <el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh">
<el-form :model="issueForm" :rules="issueRules" ref="issueForm"> <el-form :model="issueForm" :rules="issueRules" ref="issueForm">
<!-- <el-form-item label="问卷封面：" label-width="125px"> <el-form-item label="问卷封面：" label-width="125px">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<img style="width:80px; height: 50px; margin-right: 10px;cursor: pointer;" <img style="width:80px; height: 80px; margin-right: 10px;cursor: pointer;"
v-for="(i, j) in issueForm.cover" :key="j" :src="i" alt="" v-for="(i, j) in coverImg" :key="j" :src="ImgUrl + '/' + i.url" alt=""
:class="selImg == j ? 'selImg' : ''" @click="selImg = j"> :class="selImg == j ? 'selImg' : ''" @click="selImg = j">
<el-upload v-show="coverImg.length < 4" :action="ImgUrl + '/attendance/file/commonupload'"
accept="image/jpeg,image/png,image/jpg" list-type="picture-card" class="upload"
auto-upload="false" :show-file-list="false" :before-upload="beforeAvatarUploada"
:on-success="handleUploadSuccess" :on-error="handleUploadError">
<i class="el-icon-plus"></i>
</el-upload>
</div> </div>
<el-input v-model="issueForm.cover" autocomplete="off"></el-input>
</el-form-item> --> </el-form-item>
<el-form-item label="反馈期限：" label-width="125px" prop="time"> <el-form-item label="反馈期限：" label-width="125px" prop="time">
<el-date-picker v-model="issueForm.time" type="datetimerange" range-separator="至" <el-date-picker v-model="issueForm.time" type="datetimerange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"> start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
...@@ -74,7 +68,6 @@ ...@@ -74,7 +68,6 @@
</el-form-item> </el-form-item>
<el-form-item label="邀请人员：" label-width="125px"> <el-form-item label="邀请人员：" label-width="125px">
<el-button size="small" type="success" @click="treeDialog = 1">选择人员</el-button> <el-button size="small" type="success" @click="treeDialog = 1">选择人员</el-button>
</el-form-item> </el-form-item>
<div style="text-align: center;"> <div style="text-align: center;">
<el-button size="small" @click="issueDialog = false">取消</el-button> <el-button size="small" @click="issueDialog = false">取消</el-button>
...@@ -161,11 +154,6 @@ export default { ...@@ -161,11 +154,6 @@ export default {
issueForm: { issueForm: {
id: '', id: '',
title: '', title: '',
cover: [
'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26101.svg',
'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26102.svg',
],
}, },
issueRules: { issueRules: {
time: [ time: [
...@@ -184,14 +172,17 @@ export default { ...@@ -184,14 +172,17 @@ export default {
checkedUser: [], checkedUser: [],
checkAll: false, checkAll: false,
checkAllArr: [], checkAllArr: [],
editStyle: false, editStyle: false,
loadingstate: false,
ImgUrl: process.env.VUE_APP_API_BASE_URL,
coverImg: []
} }
}, },
mounted() { mounted() {
console.log(process.env.VUE_APP_API_BASE_URL)
this.getDeptData() this.getDeptData()
let query = this.$route let query = this.$route
console.log(query) // console.log(query)
if (query.query.id) { if (query.query.id) {
this.editStyle = true this.editStyle = true
this.feedbackId = query.query.id this.feedbackId = query.query.id
...@@ -205,8 +196,74 @@ export default { ...@@ -205,8 +196,74 @@ export default {
this.$refs.designer.setRule(this.Frule) this.$refs.designer.setRule(this.Frule)
this.$refs.designer.setOption(this.Fopthion) this.$refs.designer.setOption(this.Fopthion)
} }
this.getFile()
}, },
methods: { methods: {
handleUploadSuccess(res) {
console.log(res)
this.coverImg.push(res)
console.log(this.coverImg)
this.$post('/feedback/file/save', {
feedbackFileName: res.fileName,
feedbackFilePath: res.url
}).then(res => {
console.log(res)
})
},
handleUploadError() {
this.$message({
type: "error",
message: "上传失败",
});
},
// 文件格式验证
beforeAvatarUploada(file) {
this.loadingstate = true;
let index = file.name.lastIndexOf(".");
let extension = file.name.substr(index + 1);
let extensionList = [
"png",
"PNG",
"jpg",
"JPG",
"jpeg",
"JPEG",
"bmp",
];
const isLt2M = file.size / 1024 / 1024 < 10;
if (!isLt2M) {
this.$message({
message: "封面不可超出10M",
type: "warning",
center: true,
});
return false;
} else if (extensionList.indexOf(extension) < 0) {
this.$message({
message: "当前文件格式不支持",
type: "error",
center: true,
});
return false;
} else {
console.log(file)
}
},
//获取问卷封面
getFile() {
this.$post('/feedback/file/list', { page: 1, size: 3 }).then(res => {
console.log(res)
res.data.data.forEach(i => {
i.url = i.feedbackFilePath
})
console.log(res.data.data)
this.coverImg = res.data.data
console.log(this.coverImg)
})
},
//提交选择的人员
subUser() { subUser() {
console.log(this.checkedUser) console.log(this.checkedUser)
if (this.checkedUser.length > 0) { if (this.checkedUser.length > 0) {
...@@ -324,6 +381,7 @@ export default { ...@@ -324,6 +381,7 @@ export default {
}) })
let sub = { let sub = {
staffList: this.checkedUser, staffList: this.checkedUser,
id: this.feedbackId, id: this.feedbackId,
...this.titleForm, ...this.titleForm,
...@@ -334,7 +392,8 @@ export default { ...@@ -334,7 +392,8 @@ export default {
ruleContent: JSON.stringify(this.Fopthion), ruleContent: JSON.stringify(this.Fopthion),
feedbackQuestionList: [ feedbackQuestionList: [
...this.Frule ...this.Frule
] ],
feedbackFilePath: this.coverImg[this.selImg].url
} }
console.log(sub) console.log(sub)
this.$post('/feedback/save', sub).then(res => { this.$post('/feedback/save', sub).then(res => {
...@@ -392,7 +451,7 @@ export default { ...@@ -392,7 +451,7 @@ export default {
"children": [this.titleForm.remark], "children": [this.titleForm.remark],
"_fc_drag_tag": "span", "_fc_drag_tag": "span",
"hidden": false, "hidden": false,
"display": true "display": true,
}] }]
this.$refs.designer.setRule(rule) this.$refs.designer.setRule(rule)
} }
...@@ -403,6 +462,29 @@ export default { ...@@ -403,6 +462,29 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.upload {
width: 80px;
line-height: 80px;
display: flex;
align-items: center;
justify-content: center;
font-size: 20px;
// border: 1px dashed #CCCCCC;
// color: #CCCCCC;
cursor: pointer;
}
// .upload:hover{
// border: 1px dashed #1a7af8;
// color: #1a7af8;
// }
/deep/.el-upload--picture-card {
width: 80px;
height: 80px;
line-height: 80px;
}
.treeDialog { .treeDialog {
// border: 1px solid; // border: 1px solid;
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ a39156d0
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div style="text-align: center; margin-right: 40px;" v-for="j in i.optionList"> <div style="text-align: center; margin-right: 40px;" v-for="j in i.optionList">
<el-progress type="circle" <el-progress type="circle"
:percentage="(j.optionCount / i.allCount * 100).toFixed(2)" show-text :percentage="(j.optionCount / i.allCount * 100).toFixed(2)" show-text
width="75">男</el-progress> width="75"></el-progress>
<div>{{ j.optionContent }}</div> <div>{{ j.optionContent }}</div>
</div> </div>
</div> </div>
......
attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue
View file @ a39156d0
<template> <template>
<div> <div>
<!-- 弹出框表单 --> <!-- 弹出框表单 -->
<el-drawer <el-drawer :title="title" :visible.sync="open" :direction="direction" size="50%">
:title="title" <div class="tips">此功能为快速添加员工入口,如需为员工办理完整的入职手续,请使用[员工关系-入职管理]功能</div>
:visible.sync="open"
:direction="direction"
size="50%">
<div class="tips">此功能为快速添加员工入口,如需为员工办理完整的入职手续,请使用[员工关系-入职管理]功能</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<!-- <Field label="性别" prop="gender" v-model="form.gender" type="select" :enumData="dict.gender" placeholder="请选择性别"/> --> <!-- <Field label="性别" prop="gender" v-model="form.gender" type="select" :enumData="dict.gender" placeholder="请选择性别"/> -->
<!-- <Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" /> --> <!-- <Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" /> -->
<!-- <Field label="照片" prop="photoPath" v-model="form.photoPath" type="textarea" placeholder="请输入照片"/> --> <!-- <Field label="照片" prop="photoPath" v-model="form.photoPath" type="textarea" placeholder="请输入照片"/> -->
<!-- <Field label="身份证号码" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号码"/> --> <!-- <Field label="身份证号码" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号码"/> -->
<!-- <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> --> <!-- <Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> -->
<!-- <Field label="政治面貌 " prop="politicalstatus" v-model="form.politicalstatus" type="select" :enumData="dict.politicalstatus" placeholder="请选择政治面貌 "/> --> <!-- <Field label="政治面貌 " prop="politicalstatus" v-model="form.politicalstatus" type="select" :enumData="dict.politicalstatus" placeholder="请选择政治面貌 "/> -->
<!-- <Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> --> <!-- <Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> -->
<Field label="员工姓名" :maxLength="10" prop="name" v-model="form.name" placeholder="请输入员工姓名"/> <Field
label="员工姓名"
:maxLength="10"
prop="name"
v-model="form.name"
placeholder="请输入员工姓名"
/>
<Field label="手机号码" :maxLength="11" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/> <Field
label="手机号码"
:maxLength="11"
prop="phoneNumber"
v-model="form.phoneNumber"
placeholder="请输入联系电话"
/>
<!-- <Field label="所属部门" :maxLength="10" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/> <!-- <Field label="所属部门" :maxLength="10" prop="deptName" v-model="form.deptName" placeholder="请选择所属部门" @focus="ishowBumen = true"/>
--> -->
<Field label="所属部门" prop="deptId" v-model="form.deptId" :enumData="dict.deptId" type="select" placeholder="请选择所属部门" /> <Field
label="所属部门"
prop="deptId"
v-model="form.deptId"
:enumData="dict.deptId"
type="select"
placeholder="请选择所属部门"
/>
<Field
label="职位"
prop="positionId"
v-model="form.positionId"
:enumData="dict.positionId"
type="select"
placeholder="请选择职位"
/>
<Field label="职位" prop="positionId" v-model="form.positionId" :enumData="dict.positionId" type="select" placeholder="请选择职位" /> <Field
label="工号"
:maxLength="15"
prop="workNum"
v-model="form.workNum"
placeholder="请输入工号"
/>
<Field label="工号" :maxLength="15" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> <!-- <Field label="是否在政务大厅" prop="positionId" v-model="form.positionId" placeholder="请选择" type="select"/> -->
<!-- <Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/> -->
<!-- <Field label="员工类型" prop="staffType" v-model="form.staffType" type="select" :enumData="dict.staffType" placeholder="请选择员工类型"/> -->
<!-- <Field label="员工状态" prop="status" v-model="form.status" type="select" :enumData="dict.status" placeholder="请选择员工状态"/> -->
<!-- <Field label="入职登记表" prop="registerPath" v-model="form.registerPath" type="textarea" placeholder="请输入入职登记表"/> -->
<!-- <Field label="入职时间" prop="entryDate" v-model="form.entryDate" type="date" /> -->
<!-- <Field label="转正时间" prop="regularDate" v-model="form.regularDate" type="date" /> -->
<!-- <Field label="离职时间" prop="leaveDate" v-model="form.leaveDate" type="date" /> -->
<!-- <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> -->
</el-row>
<!-- <Field label="是否在政务大厅" prop="positionId" v-model="form.positionId" placeholder="请选择" type="select"/> --> <form-buttons @submit="submitForm" noCancelBtn />
<!-- <Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/> --> </el-form>
<!-- <Field label="员工类型" prop="staffType" v-model="form.staffType" type="select" :enumData="dict.staffType" placeholder="请选择员工类型"/> --> </el-drawer>
<!-- <Field label="员工状态" prop="status" v-model="form.status" type="select" :enumData="dict.status" placeholder="请选择员工状态"/> --> <!-- 部门选择 -->
<!-- <Field label="入职登记表" prop="registerPath" v-model="form.registerPath" type="textarea" placeholder="请输入入职登记表"/> --> <el-dialog :visible.sync="ishowBumen" width="70%">
<!-- <Field label="入职时间" prop="entryDate" v-model="form.entryDate" type="date" /> --> <el-row type="flex" :gutter="20" style="height:40vh">
<!-- <Field label="转正时间" prop="regularDate" v-model="form.regularDate" type="date" /> --> <el-col :span="12">
<!-- <Field label="离职时间" prop="leaveDate" v-model="form.leaveDate" type="date" /> --> <el-scrollbar style="height: 100%">
<!-- <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> --> <el-tree
</el-row> size="mini"
ref="siteTree"
<form-buttons @submit='submitForm' noCancelBtn /> :data="bumentree"
</el-form> id="el-tree"
</el-drawer> node-key="id"
<!-- 部门选择 --> indent="4"
<el-dialog :visible.sync="ishowBumen" width="70%"> :props="treeProps"
<el-row type="flex" :gutter="20" style="height:40vh"> :load="loadNode"
<el-col :span="12"> highlight-current
<el-scrollbar style="height: 100%"> default-expand-all
<el-tree :expand-on-click-node="false"
size="mini" :render-content="renderContent"
ref="siteTree" @node-click="handleNodeClick"
:data="bumentree" ></el-tree>
id="el-tree" </el-scrollbar>
node-key="id" </el-col>
indent="4" <el-col :span="12">
:props="treeProps" <div class="titles">已选部门</div>
:load="loadNode" <div
highlight-current class="el-tag flex flex-pack-justify mt10"
default-expand-all v-if="deptnode.label"
:expand-on-click-node="false" style="max-width:80%"
:render-content="renderContent" >
@node-click="handleNodeClick" <div>{{deptnode.label}}</div>
> <div @click="cancledept()">
</el-tree> <i class="el-icon-close"></i>
</el-scrollbar>
</el-col>
<el-col :span="12">
<div class="titles">已选部门</div>
<div class="el-tag flex flex-pack-justify mt10" v-if="deptnode.label" style="max-width:80%">
<div>{{deptnode.label}}</div>
<div @click="cancledept()">
<i class="el-icon-close"></i>
</div>
</div>
</el-col>
</el-row>
<div class="mt20">
<el-button type="primary" size="mini" @click="comfirmbument">确定</el-button>
<el-button size="mini" @click="ishowBumen = false">取消</el-button>
</div> </div>
</el-dialog> </div>
</div> </el-col>
</el-row>
<div class="mt20">
<el-button type="primary" size="mini" @click="comfirmbument">确定</el-button>
<el-button size="mini" @click="ishowBumen = false">取消</el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
export default { export default {
name: "StaffDetail", name: "StaffDetail",
mixins: [form], mixins: [form],
props:{ props: {
bumentree:{ bumentree: {
type:Array, type: Array,
default:[] default: []
} },
}, currentNode:{
components: { type:Object,
default:{}
}
},
components: {},
watch: {
open(newval) {
if (newval) {
console.log(newval, this.currentNode, this.form.deptId,this.dict.deptId);
if(this.currentNode && this.currentNode.id){
this.form.deptId = JSON.stringify(this.currentNode.id)
this.form.deptName = this.currentNode.label
}
console.log(newval, this.currentNode, this.form.deptId);
}, }
created() { }
this.changePath("staff") },
}, created() {
data() { this.changePath("staff");
return { },
// 遮罩层 data() {
loading: true, return {
// 弹出层标题 // 遮罩层
title: "个人主页", loading: true,
// 是否显示弹出层 // 弹出层标题
open: false, title: "个人主页",
direction:"rtl", // 是否显示弹出层
toString:[ open: false,
"gender", direction: "rtl",
"politicalstatus", toString: ["gender", "politicalstatus", "staffType", "status"],
"staffType", toDate: ["birthday", "entryDate", "regularDate", "leaveDate"],
"status", // 表单校验
], rules: {
toDate:[ name: [
"birthday", { required: true, message: "请输入员工姓名", trigger: "blur" },
"entryDate", { max: 64, message: "最多只能录入64个字符", trigger: "blur" }
"regularDate", ],
"leaveDate", phoneNumber: [
], { required: true, message: "请输入员工手机号码", trigger: "blur" },
// 表单校验 { max: 11, message: "最多只能录入11个字符", trigger: "blur" }
rules: { ],
name: [ deptName: [
{required: true,message: "请输入员工姓名", trigger: "blur" }, { required: true, message: "请选择所属部门", trigger: "change" }
{max: 64,message: "最多只能录入64个字符",trigger: "blur",}, ],
], positionId: [
phoneNumber: [ { required: true, message: "请选择职位", trigger: "blur" }
{required: true,message: "请输入员工手机号码", trigger: "blur" }, ],
{max: 11,message: "最多只能录入11个字符",trigger: "blur",}, workNum: [{ required: true, message: "请输入工号" }]
], },
deptName: [ treeProps: {
{required: true,message: "请选择所属部门", trigger: "change" }, id: "id",
], label: "label",
positionId: [ areaCode: "areaCode",
{required: true,message: "请选择职位", trigger: "blur" } type: "type",
], isLeaf: "isLeaf",
workNum: [ children: "children",
{required: true,message: "请输入工号" }, icon: "icon"
], },
}, ishowBumen: false,
treeProps: { deptnode: {}
id: "id", };
label: "label", },
areaCode:"areaCode",
type: "type",
isLeaf: "isLeaf",
children: "children",
icon: "icon",
},
ishowBumen:false,
deptnode:{}
}
},
methods: { methods: {
renderContent: function (h, { node, data, store }) { renderContent: function(h, { node, data, store }) {
return ( return (
<span> <span>
<i style="font-size:16px;color:#409EFF" class={data.icon}></i> <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
<span style="padding-left: 2px;font-size:14px">{node.label}</span> <span style="padding-left: 2px;font-size:14px">{node.label}</span>
</span> </span>
) );
}, },
async loadNode(node, resolve) { async loadNode(node, resolve) {
if (node.level === 0) { if (node.level === 0) {
return; return;
} }
resolve(data.result); resolve(data.result);
}, },
// 点击 // 点击
handleNodeClick(node) { handleNodeClick(node) {
this.deptnode = node this.deptnode = node;
}, },
comfirmbument(){ comfirmbument() {
this.form.deptId = this.deptnode.id this.form.deptId = this.deptnode.id;
this.form.deptName = this.deptnode.label this.form.deptName = this.deptnode.label;
this.ishowBumen = false this.ishowBumen = false;
}, },
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/edit"; this.urls.currUrl = "staff/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改员工基本信息"; this.title = "修改员工基本信息";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.urls.currUrl = "staff/add"; this.urls.currUrl = "staff/add";
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增员工基本信息"; this.title = "新增员工基本信息";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/view"; this.urls.currUrl = "staff/view";
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "员工基本信息详细"; this.title = "员工基本信息详细";
}, },
/**取消按钮 */ /**取消按钮 */
cancel() { cancel() {
this.open = false; this.open = false;
}, },
/**获取数据后弹框 */ /**获取数据后弹框 */
afterRender(data) { afterRender(data) {
this.open = true; this.open = true;
}, },
afterSubmit(data) { afterSubmit(data) {
this.open = false; this.open = false;
this.$emit("ok"); this.$emit("ok");
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
name : "", name: "",
gender : 1, gender: 1,
birthday : null, birthday: null,
photoPath : "", photoPath: "",
phoneNumber : "", phoneNumber: "",
idCard : "", idCard: "",
workNum : "", workNum: "",
politicalstatus : 1, politicalstatus: 1,
deptId : null, deptId: null,
deptName : "", deptName: "",
positionId : null, positionId: null,
positionName : "", positionName: "",
staffType : 1, staffType: 1,
status : 1, status: 1,
registerPath : "", registerPath: "",
entryDate : null, entryDate: null,
regularDate : null, regularDate: null,
leaveDate : null, leaveDate: null,
remark : "", remark: ""
}; };
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();
} }
}, },
cancledept(){ cancledept() {
this.deptnode = {} this.deptnode = {};
}
}
} }
}
};
</script> </script>
<style scoped> <style scoped>
.tips{ .tips {
margin-left: 120px; margin-left: 120px;
margin-bottom: 20px; margin-bottom: 20px;
color: #999; color: #999;
font-size: 15px; font-size: 15px;
} }
.titles{ .titles {
color: #409EFF; color: #409eff;
font-size: 16px; font-size: 16px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.titles::before{ .titles::before {
content: ''; content: "";
width:6px; width: 6px;
height: 16px; height: 16px;
background-color: #409EFF; background-color: #409eff;
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
......
attendance-performance-manager-ui/admin/src/views/staff/list.vue
View file @ a39156d0
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</div> </div>
</el-dialog> </el-dialog>
<drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" /> <drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" :currentNode="currentNode"/>
</div> </div>
</template> </template>
...@@ -248,6 +248,7 @@ export default { ...@@ -248,6 +248,7 @@ export default {
}, },
handleNodeClick(node) { handleNodeClick(node) {
console.log(node,123123);
this.currentNode = node; this.currentNode = node;
this.query = { deptId: node.id }; this.query = { deptId: node.id };
this.getData(); this.getData();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java
View file @ a39156d0
...@@ -27,4 +27,9 @@ public class EffectSaveReq extends BaseReq { ...@@ -27,4 +27,9 @@ public class EffectSaveReq extends BaseReq {
* 报警时间 * 报警时间
*/ */
private Date alarmTime; private Date alarmTime;
/**
* 窗口编号
*/
private String windowNum;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/ReviewSaveReq.java
View file @ a39156d0
...@@ -28,6 +28,9 @@ public class ReviewSaveReq extends BaseReq { ...@@ -28,6 +28,9 @@ public class ReviewSaveReq extends BaseReq {
*/ */
private String reviewDevice; private String reviewDevice;
/**
* 窗口编号
*/
private String windowNum;
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
View file @ a39156d0
...@@ -219,7 +219,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -219,7 +219,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setRuleName(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L); recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date()); recordEntity.setCreateTime(new Date());
...@@ -254,11 +254,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -254,11 +254,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setRuleName(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L); recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date()); recordEntity.setCreateTime(new Date());
recordEntity.setWorkNum(staffEntity.getWorkNum()); recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setWindowNum(req.getWindowNum());
PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId()); PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
recordEntity.setCategoryName(categoryEntity == null ? "" : categoryEntity.getName()); recordEntity.setCategoryName(categoryEntity == null ? "" : categoryEntity.getName());
PerformReviewRecordEntity save = reviewRecordService.save(recordEntity); PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
...@@ -285,7 +286,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -285,7 +286,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setRuleName(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setWorkNum(staffEntity.getWorkNum()); recordEntity.setWorkNum(staffEntity.getWorkNum());
...@@ -317,7 +318,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -317,7 +318,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setRuleName(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setWorkNum(staffEntity.getWorkNum()); recordEntity.setWorkNum(staffEntity.getWorkNum());
...@@ -350,10 +351,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -350,10 +351,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setRuleName(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setWorkNum(staffEntity.getWorkNum()); recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setWindowNum(req.getWindowNum());
recordEntity.setCreateUserId(1L); recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date()); recordEntity.setCreateTime(new Date());
PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId()); PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
...@@ -384,7 +387,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -384,7 +387,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setWorkNum(staffEntity.getWorkNum()); recordEntity.setWorkNum(staffEntity.getWorkNum());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("系统管理员");
recordEntity.setDeductTime(new Date()); recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L); recordEntity.setCreateUserId(1L);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java
View file @ a39156d0
...@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.h5.req.AppealReq; import com.mortals.xhx.busiz.h5.req.AppealReq;
...@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestBody;
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;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -131,6 +133,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> { ...@@ -131,6 +133,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
query.setCreateTimeStart(appealReq.getApperalStartDate()); query.setCreateTimeStart(appealReq.getApperalStartDate());
query.setCreateTimeEnd(appealReq.getAppealEndDate()); query.setCreateTimeEnd(appealReq.getAppealEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context); Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context);
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
View file @ a39156d0
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.h5.req.FeedbackReq; import com.mortals.xhx.busiz.h5.req.FeedbackReq;
...@@ -93,6 +94,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -93,6 +94,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
feedbackQuery.setIdList(feedbackIdList); feedbackQuery.setIdList(feedbackIdList);
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate()); feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate()); feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
...@@ -113,6 +116,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -113,6 +116,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate()); feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate()); feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
...@@ -136,6 +140,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -136,6 +140,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
feedbackQuery.setIdList(unfinFeedbackList); feedbackQuery.setIdList(unfinFeedbackList);
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate()); feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate()); feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java
View file @ a39156d0
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.h5.req.InspectSaveReq; import com.mortals.xhx.busiz.h5.req.InspectSaveReq;
...@@ -164,6 +165,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -164,6 +165,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
query.setCreateTimeEnd(performReq.getPerformEndDate()); query.setCreateTimeEnd(performReq.getPerformEndDate());
query.setCreateUserId(context.getUser().getId()); query.setCreateUserId(context.getUser().getId());
query.setSubMethod(SubMethodEnum.大厅巡查.getValue()); query.setSubMethod(SubMethodEnum.大厅巡查.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
log.info("inspect query:{}",JSONObject.toJSONString(query)); log.info("inspect query:{}",JSONObject.toJSONString(query));
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
View file @ a39156d0
...@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.h5.req.PerformReq; import com.mortals.xhx.busiz.h5.req.PerformReq;
...@@ -36,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -36,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
...@@ -182,6 +180,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -182,6 +180,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo); Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo);
List<CheckAllRecordVo> allCheckRecord = result.getList(); List<CheckAllRecordVo> allCheckRecord = result.getList();
...@@ -202,6 +201,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -202,6 +201,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckAttendRecordEntity> result = checkAttendRecordService.find(query, pageInfo, context); Result<CheckAttendRecordEntity> result = checkAttendRecordService.find(query, pageInfo, context);
List<PerformInfo> collect = result.getList().stream().map(item -> { List<PerformInfo> collect = result.getList().stream().map(item -> {
PerformInfo performInfo = new PerformInfo(); PerformInfo performInfo = new PerformInfo();
...@@ -222,6 +223,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -222,6 +223,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckReviewRecordEntity> result = checkReviewRecordService.find(query, pageInfo, context); Result<CheckReviewRecordEntity> result = checkReviewRecordService.find(query, pageInfo, context);
List<PerformInfo> collect = result.getList().stream().map(item -> { List<PerformInfo> collect = result.getList().stream().map(item -> {
PerformInfo performInfo = new PerformInfo(); PerformInfo performInfo = new PerformInfo();
...@@ -242,6 +245,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -242,6 +245,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckComplainRecordEntity> result = checkComplainRecordService.find(query, pageInfo, context); Result<CheckComplainRecordEntity> result = checkComplainRecordService.find(query, pageInfo, context);
List<PerformInfo> collect = result.getList().stream().map(item -> { List<PerformInfo> collect = result.getList().stream().map(item -> {
PerformInfo performInfo = new PerformInfo(); PerformInfo performInfo = new PerformInfo();
...@@ -262,6 +267,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -262,6 +267,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckGoworkRecordEntity> result = checkGoworkRecordService.find(query, pageInfo, context); Result<CheckGoworkRecordEntity> result = checkGoworkRecordService.find(query, pageInfo, context);
List<PerformInfo> collect = result.getList().stream().map(item -> { List<PerformInfo> collect = result.getList().stream().map(item -> {
PerformInfo performInfo = new PerformInfo(); PerformInfo performInfo = new PerformInfo();
...@@ -282,6 +289,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -282,6 +289,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
query.setCheckTimeEnd(performReq.getPerformEndDate()); query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId()); query.setStaffId(context.getUser().getCustomerId());
query.setCheckStatus(CheckStatusEnum.已处理.getValue()); query.setCheckStatus(CheckStatusEnum.已处理.getValue());
query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
Result<CheckEffectRecordEntity> result = checkEffectRecordService.find(query, pageInfo, context); Result<CheckEffectRecordEntity> result = checkEffectRecordService.find(query, pageInfo, context);
List<PerformInfo> collect = result.getList().stream().map(item -> { List<PerformInfo> collect = result.getList().stream().map(item -> {
PerformInfo performInfo = new PerformInfo(); PerformInfo performInfo = new PerformInfo();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java
View file @ a39156d0
package com.mortals.xhx.module.check.model; package com.mortals.xhx.module.check.model;
import com.mortals.framework.model.OrderCol;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data @Data
public class CheckAllRecordQuery { public class CheckAllRecordQuery {
/** /**
...@@ -34,5 +38,6 @@ public class CheckAllRecordQuery { ...@@ -34,5 +38,6 @@ public class CheckAllRecordQuery {
*/ */
private Integer subAddType; private Integer subAddType;
private transient List<OrderCol> orderColList = new ArrayList();
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @ a39156d0
...@@ -91,7 +91,7 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -91,7 +91,7 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @ a39156d0
...@@ -84,7 +84,7 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -84,7 +84,7 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @ a39156d0
...@@ -95,7 +95,7 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -95,7 +95,7 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @ a39156d0
...@@ -82,7 +82,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -82,7 +82,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @ a39156d0
...@@ -83,7 +83,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -83,7 +83,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @ a39156d0
...@@ -96,7 +96,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -96,7 +96,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
View file @ a39156d0
...@@ -120,7 +120,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID ...@@ -120,7 +120,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config(); com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
config.protocol = "https"; config.protocol = "https";
config.regionId = "central"; config.regionId = "central";
config.endpoint = domain; config.endpoint = domain.replace("http://","");
return new com.aliyun.dingtalkworkflow_1_0.Client(config); return new com.aliyun.dingtalkworkflow_1_0.Client(config);
} }
...@@ -130,9 +130,16 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID ...@@ -130,9 +130,16 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
com.aliyun.dingtalkworkflow_1_0.Client client = createClient(); com.aliyun.dingtalkworkflow_1_0.Client client = createClient();
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders(); com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken(); getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
getProcessInstanceHeaders.getCommonHeaders().put("host","172.15.28.113");
getProcessInstanceHeaders.getCommonHeaders().put("port","8918");
getProcessInstanceHeaders.getCommonHeaders().put("protocol","http");
com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest() com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
.setProcessInstanceId(processInstanceId); .setProcessInstanceId(processInstanceId);
GetProcessInstanceResponse rsp = client.getProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new com.aliyun.teautil.models.RuntimeOptions()); GetProcessInstanceResponse rsp = client.getProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new com.aliyun.teautil.models.RuntimeOptions());
return Rest.ok("成功", rsp.getBody().getResult()); return Rest.ok("成功", rsp.getBody().getResult());
} catch (Exception e) { } catch (Exception e) {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
View file @ a39156d0
...@@ -98,7 +98,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro ...@@ -98,7 +98,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
View file @ a39156d0
...@@ -81,7 +81,7 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -81,7 +81,7 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
View file @ a39156d0
...@@ -73,7 +73,7 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont ...@@ -73,7 +73,7 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
View file @ a39156d0
...@@ -80,7 +80,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -80,7 +80,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @ a39156d0
...@@ -80,7 +80,7 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -80,7 +80,7 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
View file @ a39156d0
...@@ -81,7 +81,7 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl ...@@ -81,7 +81,7 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
View file @ a39156d0
...@@ -84,7 +84,7 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -84,7 +84,7 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime())); query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @ a39156d0
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
<property name="enableExecutorTime" value="true" /> <property name="enableExecutorTime" value="true" />
<property name="showSql" value="false" /> <property name="showSql" value="true" />
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
View file @ a39156d0
...@@ -74,6 +74,15 @@ ...@@ -74,6 +74,15 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if> <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
) AS a ) AS a
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
</select> </select>
<select id="getListCount" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="int"> <select id="getListCount" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="int">
......
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