Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 7cfce50e f3ea7cbe
Hide whitespace changes
Inline Side-by-side
Showing with 1062 additions and 41 deletions
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @ bfbd457c
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="绩效规则："> <el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p> <p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else> <div v-else>
<el-col :span="22"> <el-col :span="22">
...@@ -132,10 +132,14 @@ ...@@ -132,10 +132,14 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row v-if="obj.view == '查看'"> <el-row v-if="obj.view == '查看'">
<el-col :span="24">核查人员：{{ obj.checkPerson }}</el-col> <el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row> </el-row>
<el-row v-if="obj.view == '查看'"> <el-row v-if="obj.view == '查看'">
<el-col :span="24">核查时间：{{ obj.checkTime }}</el-col> <el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row> </el-row>
<form-buttons <form-buttons
v-show="obj.view == '核查'" v-show="obj.view == '核查'"
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @ bfbd457c
...@@ -6,7 +6,168 @@ ...@@ -6,7 +6,168 @@
:direction="direction" :direction="direction"
size="50%" size="50%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="dra_content">
<div class="dra_top box">
<div class="title">异常情况</div>
<div class="content">
<el-row>
<el-col :span="12"
>员工：{{ obj.staffName ? obj.staffName : "--" }}</el-col
>
<el-col :span="12"
>所属部门：{{ obj.deptName ? obj.deptName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>窗口编号：{{ obj.windowNum ? obj.windowNum : "--" }}</el-col
>
<el-col :span="12"
>投诉来源：{{
obj.complainSource ? obj.complainSource : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>投诉设备：{{
obj.complainDevice ? obj.complainDevice : "--"
}}</el-col
>
<el-col :span="12"
>投诉时间：{{
obj.complainTime ? obj.complainTime : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>投诉标题：{{
obj.complainTitle ? obj.complainTitle : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="24"
>投诉内容：{{
obj.complainContent ? obj.complainContent : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>真实姓名：{{
obj.complainRealName ? obj.complainRealName : "--"
}}</el-col
>
<el-col :span="12"
>联系电话：{{ obj.contact ? obj.contact : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分方式：{{ obj.subMethod ? obj.subMethod : "--" }}</el-col
>
<el-col :span="12"
>扣分人员：{{
obj.deductPerson ? obj.deductPerson : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分时间：{{ obj.deductTime ? obj.deductTime : "--" }}</el-col
>
<el-col :span="12"
>图片凭证：{{ obj.snapPath ? obj.snapPath : "--" }}</el-col
>
</el-row>
</div>
</div>
<div class="dra_down box">
<div class="title">核查情况</div>
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="核查结果：">
<p v-if="obj.view == '查看'">{{ obj.checkResult }}</p>
<el-radio-group v-model="form.checkResult" v-else>
<el-radio :label="1">扣分</el-radio>
<el-radio :label="2">不扣分</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option
></el-select>
</el-col>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;margin-top: 10px;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option></el-select
></el-col>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="扣除分值：">
<p v-if="obj.view == '查看'">{{ obj.score }}</p>
<p v-else>{{ form.score }}</p>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="说明：">
<p v-if="obj.view == '查看'">{{ obj.checkDesc }}</p>
<el-input
v-else
v-model="form.checkDesc"
type="textarea"
></el-input>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row>
<form-buttons
v-show="obj.view == '核查'"
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field <Field
label="记录ID" label="记录ID"
...@@ -174,7 +335,7 @@ ...@@ -174,7 +335,7 @@
v-if="pageInfo.type != 'view'" v-if="pageInfo.type != 'view'"
noCancelBtn noCancelBtn
/> />
</el-form> </el-form> -->
</el-drawer> </el-drawer>
</template> </template>
...@@ -206,12 +367,14 @@ export default { ...@@ -206,12 +367,14 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
obj: {},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/complain/record/edit"; this.urls.currUrl = "check/complain/record/edit";
...@@ -231,6 +394,7 @@ export default { ...@@ -231,6 +394,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/complain/record/view"; this.urls.currUrl = "check/complain/record/view";
...@@ -292,3 +456,43 @@ export default { ...@@ -292,3 +456,43 @@ export default {
}, },
}; };
</script> </script>
<style lang="less" scoped>
.dra_content {
width: 100%;
height: 100%;
padding: 20px;
.box {
width: 100%;
height: auto;
.title {
color: #1890ff;
font-size: 16px;
padding-left: 10px;
position: relative;
margin-bottom: 30px;
&::after {
content: "";
display: block;
border-left: 3px solid #1890ff;
left: 0;
top: 0;
bottom: 0;
position: absolute;
}
}
.content {
width: 100%;
padding: 10px;
font-family: "微软雅黑", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 14px;
margin-left: 0 auto;
margin-bottom: 30px;
/deep/.el-row {
margin-bottom: 20px;
}
}
}
}
</style>
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ bfbd457c
...@@ -6,7 +6,145 @@ ...@@ -6,7 +6,145 @@
:direction="direction" :direction="direction"
size="50%" size="50%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="dra_content">
<div class="dra_top box">
<div class="title">异常情况</div>
<div class="content">
<el-row>
<el-col :span="12"
>员工：{{ obj.staffName ? obj.staffName : "--" }}</el-col
>
<el-col :span="12"
>所属部门：{{ obj.deptName ? obj.deptName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>窗口编号：{{ obj.windowNum ? obj.windowNum : "--" }}</el-col
>
<el-col :span="12"
>违规类型：{{
obj.irregularType ? obj.irregularType : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>发生时间：{{ obj.happenTime ? obj.happenTime : "--" }}</el-col
>
<el-col :span="12"
>时长：{{ obj.duration ? obj.duration : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>报警时间：{{ obj.alarmTime ? obj.alarmTime : "--" }}</el-col
>
<el-col :span="12"
>扣分方式：{{ obj.subMethod ? obj.subMethod : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分时间：{{ obj.deductTime ? obj.deductTime : "--" }}</el-col
>
<el-col :span="12">
扣分人员：{{ obj.deductPerson ? obj.deductPerson : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="24">
图片凭证：{{ obj.snapPath ? obj.snapPath : "--" }}</el-col
>
</el-row>
</div>
</div>
<div class="dra_down box">
<div class="title">核查情况</div>
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="核查结果：">
<p v-if="obj.view == '查看'">{{ obj.checkResult }}</p>
<el-radio-group v-model="form.checkResult" v-else>
<el-radio :label="1">扣分</el-radio>
<el-radio :label="2">不扣分</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option
></el-select>
</el-col>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;margin-top: 10px;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option></el-select
></el-col>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="扣除分值：">
<p v-if="obj.view == '查看'">{{ obj.score }}</p>
<p v-else>{{ form.score }}</p>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="说明：">
<p v-if="obj.view == '查看'">{{ obj.checkDesc }}</p>
<el-input
v-else
v-model="form.checkDesc"
type="textarea"
></el-input>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row>
<form-buttons
v-show="obj.view == '核查'"
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field <Field
label="记录ID" label="记录ID"
...@@ -168,7 +306,7 @@ ...@@ -168,7 +306,7 @@
v-if="pageInfo.type != 'view'" v-if="pageInfo.type != 'view'"
noCancelBtn noCancelBtn
/> />
</el-form> </el-form> -->
</el-drawer> </el-drawer>
</template> </template>
...@@ -200,12 +338,14 @@ export default { ...@@ -200,12 +338,14 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
obj: {},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/effect/record/edit"; this.urls.currUrl = "check/effect/record/edit";
...@@ -225,6 +365,7 @@ export default { ...@@ -225,6 +365,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/effect/record/view"; this.urls.currUrl = "check/effect/record/view";
...@@ -284,3 +425,44 @@ export default { ...@@ -284,3 +425,44 @@ export default {
}, },
}; };
</script> </script>
<style lang="less" scoped>
.dra_content {
width: 100%;
height: 100%;
padding: 20px;
.box {
width: 100%;
height: auto;
.title {
color: #1890ff;
font-size: 16px;
padding-left: 10px;
position: relative;
margin-bottom: 30px;
&::after {
content: "";
display: block;
border-left: 3px solid #1890ff;
left: 0;
top: 0;
bottom: 0;
position: absolute;
}
}
.content {
width: 100%;
padding: 10px;
font-family: "微软雅黑", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 14px;
margin-left: 0 auto;
margin-bottom: 30px;
/deep/.el-row {
margin-bottom: 20px;
}
}
}
}
</style>
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @ bfbd457c
...@@ -6,7 +6,145 @@ ...@@ -6,7 +6,145 @@
:direction="direction" :direction="direction"
size="50%" size="50%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="dra_content">
<div class="dra_top box">
<div class="title">异常情况</div>
<div class="content">
<el-row>
<el-col :span="12"
>员工：{{ obj.staffName ? obj.staffName : "--" }}</el-col
>
<el-col :span="12"
>所属部门：{{ obj.deptName ? obj.deptName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>窗口编号：{{ obj.windowNum ? obj.windowNum : "--" }}</el-col
>
<el-col :span="12"
>办件编码：{{ obj.goworkCode ? obj.goworkCode : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>办件所属部门：{{
obj.goworkDepts ? obj.goworkDepts : "--"
}}</el-col
>
<el-col :span="12"
>事项名称：{{ obj.matterlName ? obj.matterlName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>办件时间：{{ obj.goworkTime ? obj.goworkTime : "--" }}</el-col
>
<el-col :span="12"
>扣分方式：{{ obj.subMethod ? obj.subMethod : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分时间：{{ obj.deductTime ? obj.deductTime : "--" }}</el-col
>
<el-col :span="12">
扣分人员：{{ obj.deductPerson ? obj.deductPerson : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="24">
图片凭证：{{ obj.snapPath ? obj.snapPath : "--" }}</el-col
>
</el-row>
</div>
</div>
<div class="dra_down box">
<div class="title">核查情况</div>
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="核查结果：">
<p v-if="obj.view == '查看'">{{ obj.checkResult }}</p>
<el-radio-group v-model="form.checkResult" v-else>
<el-radio :label="1">扣分</el-radio>
<el-radio :label="2">不扣分</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option
></el-select>
</el-col>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;margin-top: 10px;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option></el-select
></el-col>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="扣除分值：">
<p v-if="obj.view == '查看'">{{ obj.score }}</p>
<p v-else>{{ form.score }}</p>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="说明：">
<p v-if="obj.view == '查看'">{{ obj.checkDesc }}</p>
<el-input
v-else
v-model="form.checkDesc"
type="textarea"
></el-input>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row>
<form-buttons
v-show="obj.view == '核查'"
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field <Field
label="记录ID" label="记录ID"
...@@ -161,7 +299,7 @@ ...@@ -161,7 +299,7 @@
v-if="pageInfo.type != 'view'" v-if="pageInfo.type != 'view'"
noCancelBtn noCancelBtn
/> />
</el-form> </el-form> -->
</el-drawer> </el-drawer>
</template> </template>
...@@ -193,12 +331,14 @@ export default { ...@@ -193,12 +331,14 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
obj: {},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/gowork/record/edit"; this.urls.currUrl = "check/gowork/record/edit";
...@@ -218,6 +358,7 @@ export default { ...@@ -218,6 +358,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/gowork/record/view"; this.urls.currUrl = "check/gowork/record/view";
...@@ -276,3 +417,44 @@ export default { ...@@ -276,3 +417,44 @@ export default {
}, },
}; };
</script> </script>
<style lang="less" scoped>
.dra_content {
width: 100%;
height: 100%;
padding: 20px;
.box {
width: 100%;
height: auto;
.title {
color: #1890ff;
font-size: 16px;
padding-left: 10px;
position: relative;
margin-bottom: 30px;
&::after {
content: "";
display: block;
border-left: 3px solid #1890ff;
left: 0;
top: 0;
bottom: 0;
position: absolute;
}
}
.content {
width: 100%;
padding: 10px;
font-family: "微软雅黑", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 14px;
margin-left: 0 auto;
margin-bottom: 30px;
/deep/.el-row {
margin-bottom: 20px;
}
}
}
}
</style>
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @ bfbd457c
...@@ -6,7 +6,143 @@ ...@@ -6,7 +6,143 @@
:direction="direction" :direction="direction"
size="50%" size="50%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="dra_content">
<div class="dra_top box">
<div class="title">异常情况</div>
<div class="content">
<el-row>
<el-col :span="12"
>员工：{{ obj.staffName ? obj.staffName : "--" }}</el-col
>
<el-col :span="12"
>所属部门：{{ obj.deptName ? obj.deptName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>窗口编号：{{ obj.windowNum ? obj.windowNum : "--" }}</el-col
>
<el-col :span="12"
>违规类型：{{
obj.irregularOtherType ? obj.irregularOtherType : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="24"
>发生时间：{{ obj.happenTime ? obj.happenTime : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="24"
>评分标准：{{ obj.ruleDesc ? obj.ruleDesc : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分方式：{{ obj.subMethod ? obj.subMethod : "--" }}</el-col
>
<el-col :span="12">
扣分时间：{{ obj.deductTime ? obj.deductTime : "--" }}
</el-col>
</el-row>
<el-row>
<el-col :span="24">
扣分人员：{{ obj.deductPerson ? obj.deductPerson : "--" }}
</el-col>
</el-row>
<el-row>
<el-col :span="24"
>图片凭证：{{ obj.snapPath ? obj.snapPath : "--" }}</el-col
>
</el-row>
</div>
</div>
<div class="dra_down box">
<div class="title">核查情况</div>
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="核查结果：">
<p v-if="obj.view == '查看'">{{ obj.checkResult }}</p>
<el-radio-group v-model="form.checkResult" v-else>
<el-radio :label="1">扣分</el-radio>
<el-radio :label="2">不扣分</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option
></el-select>
</el-col>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;margin-top: 10px;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option></el-select
></el-col>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="扣除分值：">
<p v-if="obj.view == '查看'">{{ obj.score }}</p>
<p v-else>{{ form.score }}</p>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="说明：">
<p v-if="obj.view == '查看'">{{ obj.checkDesc }}</p>
<el-input
v-else
v-model="form.checkDesc"
type="textarea"
></el-input>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row>
<form-buttons
v-show="obj.view == '核查'"
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field <Field
label="记录ID" label="记录ID"
...@@ -162,7 +298,7 @@ ...@@ -162,7 +298,7 @@
v-if="pageInfo.type != 'view'" v-if="pageInfo.type != 'view'"
noCancelBtn noCancelBtn
/> />
</el-form> </el-form> -->
</el-drawer> </el-drawer>
</template> </template>
...@@ -194,12 +330,14 @@ export default { ...@@ -194,12 +330,14 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
obj: {},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/other/record/edit"; this.urls.currUrl = "check/other/record/edit";
...@@ -219,6 +357,7 @@ export default { ...@@ -219,6 +357,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/other/record/view"; this.urls.currUrl = "check/other/record/view";
...@@ -277,3 +416,43 @@ export default { ...@@ -277,3 +416,43 @@ export default {
}, },
}; };
</script> </script>
<style lang="less" scoped>
.dra_content {
width: 100%;
height: 100%;
padding: 20px;
.box {
width: 100%;
height: auto;
.title {
color: #1890ff;
font-size: 16px;
padding-left: 10px;
position: relative;
margin-bottom: 30px;
&::after {
content: "";
display: block;
border-left: 3px solid #1890ff;
left: 0;
top: 0;
bottom: 0;
position: absolute;
}
}
.content {
width: 100%;
padding: 10px;
font-family: "微软雅黑", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 14px;
margin-left: 0 auto;
margin-bottom: 30px;
/deep/.el-row {
margin-bottom: 20px;
}
}
}
}
</style>
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @ bfbd457c
...@@ -6,7 +6,150 @@ ...@@ -6,7 +6,150 @@
:direction="direction" :direction="direction"
size="50%" size="50%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <div class="dra_content">
<div class="dra_top box">
<div class="title">异常情况</div>
<div class="content">
<el-row>
<el-col :span="12"
>员工：{{ obj.staffName ? obj.staffName : "--" }}</el-col
>
<el-col :span="12"
>所属部门：{{ obj.deptName ? obj.deptName : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>窗口编号：{{ obj.windowNum ? obj.windowNum : "--" }}</el-col
>
<el-col :span="12"
>评价结果：{{
obj.reviewResult ? obj.reviewResult : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>评价来源：{{
obj.reviewSource ? obj.reviewSource : "--"
}}</el-col
>
<el-col :span="12"
>评价设备：{{
obj.reviewDevice ? obj.reviewDevice : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>评价时间：{{ obj.reviewTime ? obj.reviewTime : "--" }}</el-col
>
<el-col :span="12"
>扣分方式：{{ obj.subMethod ? obj.subMethod : "--" }}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>扣分时间：{{ obj.deductTime ? obj.deductTime : "--" }}</el-col
>
<el-col :span="12"
>扣分人员：{{
obj.deductPerson ? obj.deductPerson : "--"
}}</el-col
>
</el-row>
<el-row>
<el-col :span="12"
>图片凭证：{{ obj.snapPath ? obj.snapPath : "--" }}</el-col
>
</el-row>
</div>
</div>
<div class="dra_down box">
<div class="title">核查情况</div>
<div class="content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="核查结果：">
<p v-if="obj.view == '查看'">{{ obj.checkResult }}</p>
<el-radio-group v-model="form.checkResult" v-else>
<el-radio :label="1">扣分</el-radio>
<el-radio :label="2">不扣分</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="修改规则：">
<p v-if="obj.view == '查看'">{{ obj.ruleName }}</p>
<div v-else>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option
></el-select>
</el-col>
<el-col :span="22">
<el-select
v-model="form.attendanceGroupId"
style="width: 100%;margin-top: 10px;"
>
<el-option
v-for="item in kaoqinArr"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option></el-select
></el-col>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="扣除分值：">
<p v-if="obj.view == '查看'">{{ obj.score }}</p>
<p v-else>{{ form.score }}</p>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="说明：">
<p v-if="obj.view == '查看'">{{ obj.checkDesc }}</p>
<el-input
v-else
v-model="form.checkDesc"
type="textarea"
></el-input>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查人员：">
<p>{{ obj.checkPerson }}</p>
</el-form-item>
</el-row>
<el-row v-if="obj.view == '查看'">
<el-form-item label="核查时间：">
<p>{{ obj.checkTime }}</p>
</el-form-item>
</el-row>
<form-buttons
v-show="obj.view == '核查'"
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</div>
</div>
</div>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field <Field
label="记录ID" label="记录ID"
...@@ -163,7 +306,7 @@ ...@@ -163,7 +306,7 @@
v-if="pageInfo.type != 'view'" v-if="pageInfo.type != 'view'"
noCancelBtn noCancelBtn
/> />
</el-form> </el-form> -->
</el-drawer> </el-drawer>
</template> </template>
...@@ -195,12 +338,14 @@ export default { ...@@ -195,12 +338,14 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
obj: {},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/review/record/edit"; this.urls.currUrl = "check/review/record/edit";
...@@ -220,6 +365,7 @@ export default { ...@@ -220,6 +365,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.obj = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = "check/review/record/view"; this.urls.currUrl = "check/review/record/view";
...@@ -278,3 +424,43 @@ export default { ...@@ -278,3 +424,43 @@ export default {
}, },
}; };
</script> </script>
<style lang="less" scoped>
.dra_content {
width: 100%;
height: 100%;
padding: 20px;
.box {
width: 100%;
height: auto;
.title {
color: #1890ff;
font-size: 16px;
padding-left: 10px;
position: relative;
margin-bottom: 30px;
&::after {
content: "";
display: block;
border-left: 3px solid #1890ff;
left: 0;
top: 0;
bottom: 0;
position: absolute;
}
}
.content {
width: 100%;
padding: 10px;
font-family: "微软雅黑", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 14px;
margin-left: 0 auto;
margin-bottom: 30px;
/deep/.el-row {
margin-bottom: 20px;
}
}
}
}
</style>
attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
View file @ bfbd457c
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small" <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
@click="issueBtn" round>问卷发布 @click="issueBtn" round>问卷发布
</ElButton> </ElButton>
<ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>H5预览 <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>手机模拟预览
</ElButton> </ElButton>
</template> </template>
</fc-designer> </fc-designer>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-form-item> </el-form-item>
<el-form-item label="反馈期限：" label-width="125px"> <el-form-item label="反馈期限：" label-width="125px">
<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="结束日期"> start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="邀请人员：" label-width="125px"> <el-form-item label="邀请人员：" label-width="125px">
...@@ -65,7 +65,35 @@ ...@@ -65,7 +65,35 @@
<script> <script>
import formCreate from "@form-create/element-ui"; import formCreate from "@form-create/element-ui";
import moment from 'moment'
function formType(val) {
// (1.单项选择,2.多项选择,3.文本框,4.多项文本框,5.文字,6.上传附件)
switch (val) {
case "radio":
return 1
break;
case 'checkbox':
return 2
break;
case 'input':
return 3
break;
case 'span':
return 5
break;
case 'upload':
return 6
break;
default:
break;
}
}
function formatNum(val) {
if (val) return 1
else return 0
}
export default { export default {
data() { data() {
return { return {
tabs: '1', tabs: '1',
...@@ -74,6 +102,8 @@ export default { ...@@ -74,6 +102,8 @@ export default {
Fopthion: '', Fopthion: '',
issueDialog: false, issueDialog: false,
issueForm: { issueForm: {
id: '',
title: '',
cover: [ 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_/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' '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'
...@@ -115,7 +145,15 @@ export default { ...@@ -115,7 +145,15 @@ export default {
this.$refs.designer.removeMenuItem("el-button") this.$refs.designer.removeMenuItem("el-button")
this.$refs.designer.removeMenuItem("el-divider") this.$refs.designer.removeMenuItem("el-divider")
//配置组件生成规则---直接配置显示在页面上 //配置组件生成规则---直接配置显示在页面上
// const rule = [{ "type": "input", "field": "int", "title": "输入框", "info": "", "_fc_drag_tag": "input", "hidden": false, "display": true }] // const rule = [{
// "type": "span",
// "title": "请输入问卷名称",
// "native": false,
// "children": [],
// "_fc_drag_tag": "span",
// "hidden": false,
// "display": true
// }]
// this.$refs.designer.setRule(rule) // this.$refs.designer.setRule(rule)
}, },
methods: { methods: {
...@@ -158,6 +196,33 @@ export default { ...@@ -158,6 +196,33 @@ export default {
}, },
issueFormBtn() { issueFormBtn() {
console.log(this.issueForm) console.log(this.issueForm)
this.Frule.forEach(i => {
i.feedbackId = i.field
i.questionType = formType(i.type)
i.require = formatNum(i.$required)
i.content = i.info
if (formType(i.type) == 1 || formType(i.type) == 2) {
i.options.forEach(j => {
j.content = j.value
j.remark = j.label
})
}
i.feedbackOptionList = {
...i.options
}
})
let sub = {
id: '',
title: '',
feedbackTimeStart: this.issueForm.time[0],
feedbackTimeEnd: this.issueForm.time[1],
inviteNum: '',
formContent: JSON.stringify(this.Frule),
feedbackQuestionList: [
...this.Frule
]
}
console.log(sub)
} }
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java
View file @ bfbd457c
...@@ -10,12 +10,17 @@ public class CheckAllRecordQuery { ...@@ -10,12 +10,17 @@ public class CheckAllRecordQuery {
*/ */
private Integer checkStatus; private Integer checkStatus;
private String createTimeStart; private String checkTimeStart;
private String createTimeEnd; private String checkTimeEnd;
private Long createUserId; private Long createUserId;
/**
* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
*/
private Integer subMethod;
public Long getStaffId() { public Long getStaffId() {
return staffId; return staffId;
} }
...@@ -32,20 +37,20 @@ public class CheckAllRecordQuery { ...@@ -32,20 +37,20 @@ public class CheckAllRecordQuery {
this.checkStatus = checkStatus; this.checkStatus = checkStatus;
} }
public String getCreateTimeStart() { public String getCheckTimeStart() {
return createTimeStart; return checkTimeStart;
} }
public void setCreateTimeStart(String createTimeStart) { public void setCheckTimeStart(String checkTimeStart) {
this.createTimeStart = createTimeStart; this.checkTimeStart = checkTimeStart;
} }
public String getCreateTimeEnd() { public String getCheckTimeEnd() {
return createTimeEnd; return checkTimeEnd;
} }
public void setCreateTimeEnd(String createTimeEnd) { public void setCheckTimeEnd(String checkTimeEnd) {
this.createTimeEnd = createTimeEnd; this.checkTimeEnd = checkTimeEnd;
} }
public Long getCreateUserId() { public Long getCreateUserId() {
...@@ -55,4 +60,12 @@ public class CheckAllRecordQuery { ...@@ -55,4 +60,12 @@ public class CheckAllRecordQuery {
public void setCreateUserId(Long createUserId) { public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId; this.createUserId = createUserId;
} }
public Integer getSubMethod() {
return subMethod;
}
public void setSubMethod(Integer subMethod) {
this.subMethod = subMethod;
}
} }
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAllRecordServiceImpl.java
View file @ bfbd457c
...@@ -22,15 +22,15 @@ public class CheckAllRecordServiceImpl implements CheckAllRecordService { ...@@ -22,15 +22,15 @@ public class CheckAllRecordServiceImpl implements CheckAllRecordService {
@Override @Override
public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) { public List<CheckAllRecordVo> getAllCheckRecord(CheckAllRecordQuery query) {
if(StringUtils.isEmpty(query.getCreateTimeStart())||StringUtils.isEmpty(query.getCreateTimeStart())){ if(StringUtils.isEmpty(query.getCheckTimeStart())||StringUtils.isEmpty(query.getCheckTimeStart())){
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance(); Calendar calendar=Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, 1); calendar.set(Calendar.DAY_OF_MONTH, 1);
String startTime = format.format(calendar.getTime()); String startTime = format.format(calendar.getTime());
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
String endTime = format.format(calendar.getTime()); String endTime = format.format(calendar.getTime());
query.setCreateTimeStart(startTime); query.setCheckTimeStart(startTime);
query.setCreateTimeEnd(endTime); query.setCheckTimeEnd(endTime);
} }
return checkAllRecordDao.getAllCheckRecord(query); return checkAllRecordDao.getAllCheckRecord(query);
} }
......
attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
View file @ bfbd457c
...@@ -6,44 +6,50 @@ ...@@ -6,44 +6,50 @@
<select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo"> <select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
UNION UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
UNION UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
UNION UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
UNION UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
UNION UNION
SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1 SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if> <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if> <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
<if test="createTimeStart != null and createTimeStart!=''"> AND createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if> <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createTimeEnd != null and createTimeEnd!=''"> AND createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{createTimeEnd},' 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>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
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