Commit 6fe81f1f authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 0a0e1e43 050957a7
......@@ -44,7 +44,6 @@
v-model="field"
:maxlength="maxLength"
@change="emit"
:rows="rows"
@input="emit"
v-if="type === 'textarea'"
type="textarea"
......@@ -262,6 +261,7 @@ export default {
},
},
},
data() {
return {
newVal: this.value,
......
......@@ -121,10 +121,13 @@ const router = new Router({
...restBuilder("check/gowork/record", "check/gowork/record"), //办件绩效核查信息
...restBuilder("check/effect/record", "check/effect/record"), //效能绩效核查信息
...restBuilder("check/other/record", "check/other/record"), //其它绩效核查信息
...restBuilder("check/window/perform", "check/window/perform"), //自评绩效核查信息
...restBuilder("perform/attend/appeal", "perform/attend/appeal"), //绩效记录申诉信息
...restBuilder("perform/attend/appeal/files", "perform/attend/appeal/files"), //绩效记录申诉信息附件列表
...restBuilder(
"perform/attend/appeal/files",
"perform/attend/appeal/files"
), //绩效记录申诉信息附件列表
...restBuilder("feedback", "feedback"), //反馈信息
...restBuilder("feedback/file", "feedback/file"), //反馈信息附件
......@@ -138,7 +141,6 @@ const router = new Router({
...restBuilder("staff/perform/summary", "staff/perform/summary"), //员工绩效统计汇总
// 360评估
...restBuilder("homeCharts/record", "homeCharts/record"),
//以下为基础路由配置
......
......@@ -79,17 +79,16 @@
placeholder="请输入请假事由"
:disabled="pageInfo.type == 'view'"
/>
<el-row>
<Field
label="审核结果"
prop="auditResult"
v-model="form.auditResult"
type="radioCol"
:enumData="dict.auditResult"
placeholder="请选择审核结果"
:disabled="pageInfo.type == 'view'"
/>
</el-row>
<Field
label="审核结果"
prop="auditResult"
v-model="form.auditResult"
type="radioCol"
:enumData="dict.auditResult"
placeholder="请选择审核结果"
:disabled="pageInfo.type == 'view'"
style="width: 100%;"
/>
<Field
label="审批负责人"
......@@ -107,29 +106,27 @@
type="datetime"
disabled
/>
<el-row>
<Field
label="审核说明"
prop="auditDesc"
type="textarea"
v-model="form.auditDesc"
placeholder="请输入审核说明"
:disabled="pageInfo.type == 'view'"
style="width: 100%;"
/>
</el-row>
<!-- <Field label="审批负责人" prop="approver" v-model="form.approver" placeholder="请输入审批负责人"/> -->
<!-- <Field label="附件" prop="attachment" v-model="form.attachment" type="textarea" placeholder="请输入附件"/> -->
<Field
label="备注"
prop="remark"
v-model="form.remark"
label="审核说明"
prop="auditDesc"
type="textarea"
placeholder="请输入备注"
v-model="form.auditDesc"
placeholder="请输入审核说明"
:disabled="pageInfo.type == 'view'"
style="width: 100%;"
/>
</el-row>
<!-- <Field label="审批负责人" prop="approver" v-model="form.approver" placeholder="请输入审批负责人"/> -->
<!-- <Field label="附件" prop="attachment" v-model="form.attachment" type="textarea" placeholder="请输入附件"/> -->
<Field
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
:disabled="pageInfo.type == 'view'"
style="width: 100%;"
/>
<el-form-item label="附件路径" prop="attachmentPathList">
<FileUpload
@input="uploadFn"
......@@ -264,7 +261,6 @@ export default {
this.query = { id: row.id };
this.urls.currUrl = "attendance/leave/record/view";
this.getData();
this.pageInfo.type = "view";
this.title = "请假记录信息详细";
},
......@@ -279,6 +275,7 @@ export default {
// url:this.form.attachmentPath
// }
];
this.open = true;
},
afterSubmit(data) {
......
<template>
<!-- 弹出框表单 -->
<el-drawer
:title="title"
:visible.sync="open"
:direction="direction"
:destroy-on-close="true"
size="50%"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<Field
label="记录ID"
prop="recordId"
v-model="form.recordId"
placeholder="请输入记录ID"
/>
<Field
label="考核年度"
prop="year"
v-model="form.year"
placeholder="请输入考核年度"
/>
<Field
label="考核月份"
prop="month"
v-model="form.month"
placeholder="请输入考核月份"
/>
<Field
label="窗口ID"
prop="windowId"
v-model="form.windowId"
placeholder="请输入窗口ID"
/>
<Field
label="窗口名称"
prop="windowName"
v-model="form.windowName"
placeholder="请输入窗口名称"
/>
<Field
label="窗口负责人id"
prop="ownerId"
v-model="form.ownerId"
placeholder="请输入窗口负责人id"
/>
<Field
label="窗口负责人名称"
prop="ownerName"
v-model="form.ownerName"
placeholder="请输入窗口负责人名称"
/>
<Field
label="所属部门id"
prop="deptId"
v-model="form.deptId"
placeholder="请输入所属部门id"
/>
<Field
label="所属部门名称"
prop="deptName"
v-model="form.deptName"
type="textarea"
placeholder="请输入所属部门名称"
/>
<Field
label="所属大厅"
prop="salaId"
v-model="form.salaId"
placeholder="请输入所属大厅"
/>
<Field
label="所属大厅名称"
prop="salaName"
v-model="form.salaName"
placeholder="请输入所属大厅名称"
/>
<Field
label="考核表单名称"
prop="fromName"
v-model="form.fromName"
placeholder="请输入考核表单名称"
/>
<Field
label="合计得分"
prop="sumScore"
v-model="form.sumScore"
placeholder="请输入合计得分"
/>
<Field
label="提交时间"
prop="submitDate"
v-model="form.submitDate"
type="date"
/>
<Field
label="管理组核查人员"
prop="manageCheckPerson"
v-model="form.manageCheckPerson"
placeholder="请输入管理组核查人员"
/>
<Field
label="管理组核查时间"
prop="manageCheckTime"
v-model="form.manageCheckTime"
type="date"
/>
<Field
label="管理组核查说明"
prop="manageCheckDesc"
v-model="form.manageCheckDesc"
type="textarea"
placeholder="请输入管理组核查说明"
/>
<Field
label="管理组核查结果"
prop="manageCheckResult"
v-model="form.manageCheckResult"
type="radio"
:enumData="dict.manageCheckResult"
/>
<Field
label="领导组核查人员"
prop="leaderCheckPerson"
v-model="form.leaderCheckPerson"
placeholder="请输入领导组核查人员"
/>
<Field
label="领导组核查时间"
prop="leaderCheckTime"
v-model="form.leaderCheckTime"
type="date"
/>
<Field
label="领导组核查说明"
prop="leaderCheckDesc"
v-model="form.leaderCheckDesc"
type="textarea"
placeholder="请输入领导组核查说明"
/>
<Field
label="领导组核查结果"
prop="leaderCheckResult"
v-model="form.leaderCheckResult"
type="radio"
:enumData="dict.leaderCheckResult"
/>
<Field
label="处理状态"
prop="checkStatus"
v-model="form.checkStatus"
type="select"
:enumData="dict.checkStatus"
placeholder="请选择处理状态"
/>
<Field
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
/>
</el-row>
<form-buttons
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form>
</el-drawer>
</template>
<script>
import form from "@/assets/mixins/formdialog";
export default {
name: "CheckWindowPerformDetail",
mixins: [form],
components: {},
created() {
this.changePath("check/window/perform");
},
data() {
return {
// 遮罩层
loading: true,
// 弹出层标题
title: "窗口考核核查",
// 是否显示弹出层
open: false,
direction: "rtl",
toString: ["checkStatus"],
toDate: ["submitDate", "manageCheckTime", "leaderCheckTime"],
// 表单校验
rules: {},
};
},
methods: {
/** 编辑 */
edit(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "check/window/perform/edit";
this.getData();
this.pageInfo.type = "edit";
this.title = "修改窗口考核核查";
},
/** 新增 */
add(row) {
this.reset();
this.urls.currUrl = "check/window/perform/add";
this.getData();
this.pageInfo.type = "add";
this.title = "新增窗口考核核查";
},
/** 查看*/
view(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "check/window/perform/view";
this.getData();
this.pageInfo.type = "view";
this.title = "窗口考核核查详细";
},
/**取消按钮 */
cancel() {
this.open = false;
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
},
afterSubmit(data) {
this.open = false;
this.$emit("ok");
},
// 表单重置
reset() {
this.form = {
recordId: null,
year: null,
month: null,
windowId: null,
windowName: "",
ownerId: null,
ownerName: "",
deptId: null,
deptName: "",
salaId: null,
salaName: "",
fromName: "",
sumScore: 0,
submitDate: null,
manageCheckPerson: "",
manageCheckTime: null,
manageCheckDesc: "",
manageCheckResult: "",
leaderCheckPerson: "",
leaderCheckTime: null,
leaderCheckDesc: "",
leaderCheckResult: "",
checkStatus: 1,
remark: "",
};
this.resetForm("form");
},
resetForm(refName) {
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
},
},
};
</script>
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table";
export default {
name: "CheckWindowPerformList",
components: {
drawerShow,
},
mixins: [table],
created() {},
methods: {
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
this.$refs.drawerform.view(row);
},
},
data() {
return {
config: {
search: [
{
name: "year",
type: "text",
label: "考核年度",
fuzzy: true,
},
{
name: "windowId",
type: "text",
label: "窗口ID",
fuzzy: true,
},
{
name: "ownerId",
type: "text",
label: "窗口负责人id",
fuzzy: true,
},
],
columns: [
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{
label: "管理组核查时间",
prop: "manageCheckTime",
formatter: this.formatterDate,
},
{ label: "管理组核查说明", prop: "manageCheckDesc" },
{ label: "管理组核查结果", prop: "manageCheckResult" },
{
label: "领导组核查时间",
prop: "leaderCheckTime",
formatter: this.formatterDate,
},
{ label: "领导组核查说明", prop: "leaderCheckDesc" },
{ label: "领导组核查结果", prop: "leaderCheckResult" },
{ label: "处理状态", prop: "checkStatus", formatter: this.formatter },
{
label: "操作",
width: 240,
formatter: (row) => {
return (
<table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
],
},
};
},
};
</script>
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="记录ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.recordId}}
</el-descriptions-item>
<el-descriptions-item label="考核年度" label-class-name="labelClass" content-class-name="contentClass">
{{form.year}}
</el-descriptions-item>
<el-descriptions-item label="考核月份" label-class-name="labelClass" content-class-name="contentClass">
{{form.month}}
</el-descriptions-item>
<el-descriptions-item label="窗口ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowId}}
</el-descriptions-item>
<el-descriptions-item label="窗口名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowName}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人id" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerId}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerName}}
</el-descriptions-item>
<el-descriptions-item label="所属部门id" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaId}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaName}}
</el-descriptions-item>
<el-descriptions-item label="考核表单名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.fromName}}
</el-descriptions-item>
<el-descriptions-item label="合计得分" label-class-name="labelClass" content-class-name="contentClass">
{{form.sumScore}}
</el-descriptions-item>
<el-descriptions-item label="提交时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.submitDate)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.manageCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("manageCheckResult", form.manageCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="领导组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.leaderCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.leaderCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.leaderCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("leaderCheckResult", form.leaderCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="处理状态" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("checkStatus", form.checkStatus) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
export default {
mixins: [view],
components: {
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
"checkStatus",
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
<template>
<!-- 弹出框表单 -->
<el-drawer
:title="title"
:visible.sync="open"
:direction="direction"
:destroy-on-close="true"
size="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<Field label="记录ID" prop="recordId" v-model="form.recordId" placeholder="请输入记录ID"/>
<Field label="考核年度" prop="year" v-model="form.year" placeholder="请输入考核年度"/>
<Field label="考核月份" prop="month" v-model="form.month" placeholder="请输入考核月份"/>
<Field label="窗口ID" prop="windowId" v-model="form.windowId" placeholder="请输入窗口ID"/>
<Field label="窗口名称" prop="windowName" v-model="form.windowName" placeholder="请输入窗口名称"/>
<Field label="窗口负责人id" prop="ownerId" v-model="form.ownerId" placeholder="请输入窗口负责人id"/>
<Field label="窗口负责人名称" prop="ownerName" v-model="form.ownerName" placeholder="请输入窗口负责人名称"/>
<Field label="所属部门id" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门id"/>
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入所属部门名称"/>
<Field label="所属大厅" prop="salaId" v-model="form.salaId" placeholder="请输入所属大厅"/>
<Field label="所属大厅名称" prop="salaName" v-model="form.salaName" placeholder="请输入所属大厅名称"/>
<Field label="考核表单名称" prop="fromName" v-model="form.fromName" placeholder="请输入考核表单名称"/>
<Field label="提交时间" prop="submitDate" v-model="form.submitDate" type="date" />
<Field label="管理组核查人员" prop="manageCheckPerson" v-model="form.manageCheckPerson" placeholder="请输入管理组核查人员"/>
<Field label="管理组核查时间" prop="manageCheckTime" v-model="form.manageCheckTime" type="date" />
<Field label="管理组核查说明" prop="manageCheckDesc" v-model="form.manageCheckDesc" type="textarea" placeholder="请输入管理组核查说明"/>
<Field label="管理组核查结果" prop="manageCheckResult" v-model="form.manageCheckResult" type="radio" :enumData="dict.manageCheckResult" />
<Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-row>
<form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
</el-form>
</el-drawer>
</template>
<script>
import form from "@/assets/mixins/formdialog";
export default {
name: "CheckWindowWorkmanPerformDetail",
mixins: [form],
components: {
},
created() {
this.changePath("check/window/workman/perform")
},
data() {
return {
// 遮罩层
loading: true,
// 弹出层标题
title: "窗口人员考核汇总核查",
// 是否显示弹出层
open: false,
direction:"rtl",
toString:[
],
toDate:[
"submitDate",
"manageCheckTime",
],
// 表单校验
rules: {
}
};
},
methods: {
/** 编辑 */
edit(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="check/window/workman/perform/edit";
this.getData();
this.pageInfo.type="edit"
this.title = "修改窗口人员考核汇总核查";
},
/** 新增 */
add(row) {
this.reset()
this.urls.currUrl = "check/window/workman/perform/add";
this.getData();
this.pageInfo.type="add"
this.title = "新增窗口人员考核汇总核查";
},
/** 查看*/
view(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="check/window/workman/perform/view";
this.getData();
this.pageInfo.type="view"
this.title = "窗口人员考核汇总核查详细";
},
/**取消按钮 */
cancel() {
this.open = false;
},
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
},
afterSubmit(data) {
this.open = false;
this.$emit("ok");
},
// 表单重置
reset() {
this.form = {
recordId : null,
year : null,
month : null,
windowId : null,
windowName : "",
ownerId : null,
ownerName : "",
deptId : null,
deptName : "",
salaId : null,
salaName : "",
fromName : "",
submitDate : null,
manageCheckPerson : "",
manageCheckTime : null,
manageCheckDesc : "",
manageCheckResult : "",
remark : "",
};
this.resetForm("form");
},
resetForm(refName) {
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
},
},
};
</script>
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig">
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table";
export default {
name: "CheckWindowWorkmanPerformList",
components: {
drawerShow
},
mixins: [table],
created() {
},
methods: {
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
this.$refs.drawerform.view(row);
},
},
data() {
return {
config: {
search: [
{
name: "year",
type: "text",
label: "考核年度",
fuzzy: true
},
],
columns: [
{type: "selection", width: 60},
{type: "index",label: "序号",width: 50},
{label: "管理组核查时间", prop: "manageCheckTime", formatter: this.formatterDate},
{label: "管理组核查说明", prop: "manageCheckDesc"},
{label: "管理组核查结果", prop: "manageCheckResult"},
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
);
}
}
]
}
};
}
};
</script>
\ No newline at end of file
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="记录ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.recordId}}
</el-descriptions-item>
<el-descriptions-item label="考核年度" label-class-name="labelClass" content-class-name="contentClass">
{{form.year}}
</el-descriptions-item>
<el-descriptions-item label="考核月份" label-class-name="labelClass" content-class-name="contentClass">
{{form.month}}
</el-descriptions-item>
<el-descriptions-item label="窗口ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowId}}
</el-descriptions-item>
<el-descriptions-item label="窗口名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowName}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人id" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerId}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerName}}
</el-descriptions-item>
<el-descriptions-item label="所属部门id" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaId}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaName}}
</el-descriptions-item>
<el-descriptions-item label="考核表单名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.fromName}}
</el-descriptions-item>
<el-descriptions-item label="提交时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.submitDate)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.manageCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("manageCheckResult", form.manageCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
export default {
mixins: [view],
components: {
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 考核等级
*/
public enum ExamineLevelEnum {
(1, "通过"),
较好(2, "不通过"),
一般(3, "通过"),
较差(4, "不通过");
private Integer value;
private String desc;
ExamineLevelEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static ExamineLevelEnum getByValue(Integer value) {
for (ExamineLevelEnum ExamineLevelEnum : ExamineLevelEnum.values()) {
if (ExamineLevelEnum.getValue() == value) {
return ExamineLevelEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (ExamineLevelEnum item : ExamineLevelEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 窗口考核存储状态
*/
public enum FillStatusEnum {
暂存(0, "暂存"),
提交(1, "提交");
private Integer value;
private String desc;
FillStatusEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static SelfLevelEnum getByValue(Integer value) {
for (SelfLevelEnum SelfLevelEnum : SelfLevelEnum.values()) {
if (SelfLevelEnum.getValue() == value) {
return SelfLevelEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (SelfLevelEnum item : SelfLevelEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 自评等级
*/
public enum SelfLevelEnum {
红旗窗(1, "红旗窗"),
黑旗窗(2, "黑旗窗");
private Integer value;
private String desc;
SelfLevelEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static SelfLevelEnum getByValue(Integer value) {
for (SelfLevelEnum SelfLevelEnum : SelfLevelEnum.values()) {
if (SelfLevelEnum.getValue() == value) {
return SelfLevelEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (SelfLevelEnum item : SelfLevelEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 窗口考核审查结果
*/
public enum WindowCheckResultEnum {
通过(1, "通过"),
不通过(2, "不通过");
private Integer value;
private String desc;
WindowCheckResultEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static WindowCheckResultEnum getByValue(Integer value) {
for (WindowCheckResultEnum WindowCheckResultEnum : WindowCheckResultEnum.values()) {
if (WindowCheckResultEnum.getValue() == value) {
return WindowCheckResultEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (WindowCheckResultEnum item : WindowCheckResultEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
package com.mortals.xhx.module.check.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import java.util.List;
/**
* 窗口考核核查Dao
* 窗口考核核查 DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface CheckWindowPerformDao extends ICRUDDao<CheckWindowPerformEntity,Long>{
}
package com.mortals.xhx.module.check.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import java.util.List;
/**
* 窗口人员考核汇总核查Dao
* 窗口人员考核汇总核查 DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface CheckWindowWorkmanPerformDao extends ICRUDDao<CheckWindowWorkmanPerformEntity,Long>{
}
package com.mortals.xhx.module.check.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.check.dao.CheckWindowPerformDao;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 窗口考核核查DaoImpl DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
@Repository("checkWindowPerformDao")
public class CheckWindowPerformDaoImpl extends BaseCRUDDaoMybatis<CheckWindowPerformEntity,Long> implements CheckWindowPerformDao {
}
package com.mortals.xhx.module.check.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.check.dao.CheckWindowWorkmanPerformDao;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 窗口人员考核汇总核查DaoImpl DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
@Repository("checkWindowWorkmanPerformDao")
public class CheckWindowWorkmanPerformDaoImpl extends BaseCRUDDaoMybatis<CheckWindowWorkmanPerformEntity,Long> implements CheckWindowWorkmanPerformDao {
}
package com.mortals.xhx.module.check.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckWindowPerformVo;
import lombok.Data;
/**
* 窗口考核核查实体对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class CheckWindowPerformEntity extends CheckWindowPerformVo {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
private Long recordId;
/**
* 考核年度
*/
private Integer year;
/**
* 考核月份
*/
private Integer month;
/**
* 窗口ID
*/
private Long windowId;
/**
* 窗口名称
*/
private String windowName;
/**
* 窗口负责人id
*/
private Long ownerId;
/**
* 窗口负责人名称
*/
private String ownerName;
/**
* 所属部门id
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
/**
* 考核表单名称
*/
private String fromName;
/**
* 合计得分
*/
private BigDecimal sumScore;
/**
* 提交时间
*/
private Date submitDate;
/**
* 管理组核查人员
*/
@Excel(name = "管理组核查人员")
private String manageCheckPerson;
/**
* 管理组核查时间
*/
private Date manageCheckTime;
/**
* 管理组核查说明
*/
@Excel(name = "管理组核查说明")
private String manageCheckDesc;
/**
* 管理组核查结果(1.通过,2.不通过)
*/
@Excel(name = "管理组核查结果", readConverterExp = "1=通过,2=不通过")
private String manageCheckResult;
/**
* 领导组核查人员
*/
@Excel(name = "领导组核查人员")
private String leaderCheckPerson;
/**
* 领导组核查时间
*/
private Date leaderCheckTime;
/**
* 领导组核查说明
*/
@Excel(name = "领导组核查说明")
private String leaderCheckDesc;
/**
* 领导组核查结果(1.通过,2.不通过)
*/
@Excel(name = "领导组核查结果", readConverterExp = "1=通过,2=不通过")
private String leaderCheckResult;
/**
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
/**
* 备注
*/
private String remark;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof CheckWindowPerformEntity) {
CheckWindowPerformEntity tmp = (CheckWindowPerformEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.recordId = null;
this.year = DateUtil.year(new Date());
this.month = DateUtil.month(new Date())+1;
this.windowId = null;
this.windowName = "";
this.ownerId = null;
this.ownerName = "";
this.deptId = null;
this.deptName = "";
this.salaId = null;
this.salaName = "";
this.fromName = "";
this.sumScore = BigDecimal.ZERO;
this.submitDate = new Date();
this.manageCheckPerson = "";
this.manageCheckTime = new Date();
this.manageCheckDesc = "";
this.manageCheckResult = "";
this.leaderCheckPerson = "";
this.leaderCheckTime = new Date();
this.leaderCheckDesc = "";
this.leaderCheckResult = "";
this.checkStatus = 1;
this.remark = "";
}
}
\ No newline at end of file
package com.mortals.xhx.module.check.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.vo.CheckWindowWorkmanPerformVo;
import lombok.Data;
/**
* 窗口人员考核汇总核查实体对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class CheckWindowWorkmanPerformEntity extends CheckWindowWorkmanPerformVo {
private static final long serialVersionUID = 1L;
/**
* 记录ID
*/
private Long recordId;
/**
* 考核年度
*/
private Integer year;
/**
* 考核月份
*/
private Integer month;
/**
* 窗口ID
*/
private Long windowId;
/**
* 窗口名称
*/
private String windowName;
/**
* 窗口负责人id
*/
private Long ownerId;
/**
* 窗口负责人名称
*/
private String ownerName;
/**
* 所属部门id
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
/**
* 考核表单名称
*/
private String fromName;
/**
* 提交时间
*/
private Date submitDate;
/**
* 管理组核查人员
*/
@Excel(name = "管理组核查人员")
private String manageCheckPerson;
/**
* 管理组核查时间
*/
private Date manageCheckTime;
/**
* 管理组核查说明
*/
@Excel(name = "管理组核查说明")
private String manageCheckDesc;
/**
* 管理组核查结果(1.通过,2.不通过)
*/
@Excel(name = "管理组核查结果", readConverterExp = "1=通过,2=不通过")
private String manageCheckResult;
/**
* 备注
*/
private String remark;
/**
* 处理状态(1.未处理,2.已处理)
*/
private Integer checkStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof CheckWindowWorkmanPerformEntity) {
CheckWindowWorkmanPerformEntity tmp = (CheckWindowWorkmanPerformEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.recordId = null;
this.year = DateUtil.year(new Date());
this.month = DateUtil.month(new Date())+1;
this.windowId = null;
this.windowName = "";
this.ownerId = null;
this.ownerName = "";
this.deptId = null;
this.deptName = "";
this.salaId = null;
this.salaName = "";
this.fromName = "";
this.submitDate = new Date();
this.manageCheckPerson = "";
this.manageCheckTime = new Date();
this.manageCheckDesc = "";
this.manageCheckResult = "";
this.remark = "";
this.checkStatus = 1;
}
}
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 窗口考核核查视图对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class CheckWindowPerformVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
package com.mortals.xhx.module.check.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 窗口人员考核汇总核查视图对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class CheckWindowWorkmanPerformVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
package com.mortals.xhx.module.check.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import com.mortals.xhx.module.check.dao.CheckWindowPerformDao;
/**
* CheckWindowPerformService
*
* 窗口考核核查 service接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface CheckWindowPerformService extends ICRUDService<CheckWindowPerformEntity,Long>{
CheckWindowPerformDao getDao();
}
\ No newline at end of file
package com.mortals.xhx.module.check.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import com.mortals.xhx.module.check.dao.CheckWindowWorkmanPerformDao;
/**
* CheckWindowWorkmanPerformService
*
* 窗口人员考核汇总核查 service接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface CheckWindowWorkmanPerformService extends ICRUDService<CheckWindowWorkmanPerformEntity,Long>{
CheckWindowWorkmanPerformDao getDao();
}
\ No newline at end of file
package com.mortals.xhx.module.check.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.check.dao.CheckWindowPerformDao;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import com.mortals.xhx.module.check.service.CheckWindowPerformService;
import lombok.extern.slf4j.Slf4j;
/**
* CheckWindowPerformService
* 窗口考核核查 service实现
*
* @author zxfei
* @date 2024-01-17
*/
@Service("checkWindowPerformService")
@Slf4j
public class CheckWindowPerformServiceImpl extends AbstractCRUDServiceImpl<CheckWindowPerformDao, CheckWindowPerformEntity, Long> implements CheckWindowPerformService {
}
\ No newline at end of file
package com.mortals.xhx.module.check.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.check.dao.CheckWindowWorkmanPerformDao;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import com.mortals.xhx.module.check.service.CheckWindowWorkmanPerformService;
import lombok.extern.slf4j.Slf4j;
/**
* CheckWindowWorkmanPerformService
* 窗口人员考核汇总核查 service实现
*
* @author zxfei
* @date 2024-01-17
*/
@Service("checkWindowWorkmanPerformService")
@Slf4j
public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<CheckWindowWorkmanPerformDao, CheckWindowWorkmanPerformEntity, Long> implements CheckWindowWorkmanPerformService {
}
\ No newline at end of file
package com.mortals.xhx.module.check.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
import com.mortals.xhx.module.check.service.CheckWindowPerformService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
import com.mortals.xhx.common.code.*;
/**
*
* 窗口考核核查
*
* @author zxfei
* @date 2024-01-17
*/
@RestController
@RequestMapping("check/window/perform")
public class CheckWindowPerformController extends BaseCRUDJsonBodyMappingController<CheckWindowPerformService,CheckWindowPerformEntity,Long> {
@Autowired
private ParamService paramService;
public CheckWindowPerformController(){
super.setModuleDesc( "窗口考核核查");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "manageCheckResult", WindowCheckResultEnum.getEnumMap());
this.addDict(model, "leaderCheckResult", WindowCheckResultEnum.getEnumMap());
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
super.init(model, context);
}
}
\ No newline at end of file
package com.mortals.xhx.module.check.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.check.model.CheckWindowWorkmanPerformEntity;
import com.mortals.xhx.module.check.service.CheckWindowWorkmanPerformService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
import com.mortals.xhx.common.code.*;
/**
*
* 窗口人员考核汇总核查
*
* @author zxfei
* @date 2024-01-17
*/
@RestController
@RequestMapping("check/window/workman/perform")
public class CheckWindowWorkmanPerformController extends BaseCRUDJsonBodyMappingController<CheckWindowWorkmanPerformService,CheckWindowWorkmanPerformEntity,Long> {
@Autowired
private ParamService paramService;
public CheckWindowWorkmanPerformController(){
super.setModuleDesc( "窗口人员考核汇总核查");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "manageCheckResult", WindowCheckResultEnum.getEnumMap());
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
super.init(model, context);
}
}
\ No newline at end of file
......@@ -278,7 +278,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
@Override
public List<DeptEntity> getDeptBySalaId(Long salaId) throws AppException {
DeptQuery query = new DeptQuery();
if(salaId == null){
if(salaId == null || salaId == -1l){
List<DeptEntity> allSala = dao.getList(new DeptQuery().parentId(71l));
List<Long> salaList = new ArrayList<>();
for(DeptEntity item:allSala){
......
package com.mortals.xhx.module.dept.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
......@@ -142,11 +145,60 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
return super.doListAfter(query, model, context);
}
/**
* 查询大厅列表
* @return
*/
@GetMapping({"getSalaList"})
public Rest<Object> getAllSala() {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询大厅列表";
int code = 1;
try {
List<DeptEntity> allSala = this.getService().getAllSala();
model.put("data", allSala);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
/**
* 查询大厅列表
* @return
*/
@GetMapping({"getDeptBySalaId"})
public Rest<Object> getDeptBySalaId(Long salaId) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询大厅对应的部门列表";
int code = 1;
try {
List<DeptEntity> allDept = this.getService().getDeptBySalaId(salaId);
model.put("data", allDept);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
}
\ No newline at end of file
package com.mortals.xhx.module.window.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.window.model.WindowPerformEntity;
import java.util.List;
/**
* 大厅窗口信息Dao
* 大厅窗口信息 DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface WindowPerformDao extends ICRUDDao<WindowPerformEntity,Long>{
}
package com.mortals.xhx.module.window.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
import java.util.List;
/**
* 窗口人员考核汇总登记Dao
* 窗口人员考核汇总登记 DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface WindowWorkmanPerformDao extends ICRUDDao<WindowWorkmanPerformEntity,Long>{
}
package com.mortals.xhx.module.window.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
import java.util.List;
/**
* 窗口人员考核汇总明细Dao
* 窗口人员考核汇总明细 DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
public interface WindowWorkmanPerformDetailDao extends ICRUDDao<WindowWorkmanPerformDetailEntity,Long>{
}
package com.mortals.xhx.module.window.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.window.dao.WindowPerformDao;
import com.mortals.xhx.module.window.model.WindowPerformEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 大厅窗口信息DaoImpl DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
@Repository("windowPerformDao")
public class WindowPerformDaoImpl extends BaseCRUDDaoMybatis<WindowPerformEntity,Long> implements WindowPerformDao {
}
package com.mortals.xhx.module.window.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.window.dao.WindowWorkmanPerformDao;
import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 窗口人员考核汇总登记DaoImpl DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
@Repository("windowWorkmanPerformDao")
public class WindowWorkmanPerformDaoImpl extends BaseCRUDDaoMybatis<WindowWorkmanPerformEntity,Long> implements WindowWorkmanPerformDao {
}
package com.mortals.xhx.module.window.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.window.dao.WindowWorkmanPerformDetailDao;
import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 窗口人员考核汇总明细DaoImpl DAO接口
*
* @author zxfei
* @date 2024-01-17
*/
@Repository("windowWorkmanPerformDetailDao")
public class WindowWorkmanPerformDetailDaoImpl extends BaseCRUDDaoMybatis<WindowWorkmanPerformDetailEntity,Long> implements WindowWorkmanPerformDetailDao {
}
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.vo.WindowOwnerDetailVo;
import lombok.Data;
/**
* 窗口负责人详细实体对象
*
* @author zxfei
* @date 2023-07-12
*/
* 窗口负责人详细实体对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class WindowOwnerDetailEntity extends WindowOwnerDetailVo {
private static final long serialVersionUID = 1L;
/**
* 负责人Id
*/
* 负责人Id
*/
private Long ownerId;
/**
* 员工id号
*/
private Long staffId;
* 窗口id
*/
private Long windowId;
/**
* 备注
*/
* 窗口名称
*/
private String windowName;
/**
* 备注
*/
private String remark;
/**
* 窗口编号
*/
private String windowCode;
/**
* 所属楼栋
*/
private Integer building;
/**
* 所属楼层
*/
private Integer level;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -38,18 +57,19 @@ public class WindowOwnerDetailEntity extends WindowOwnerDetailVo {
if (obj instanceof WindowOwnerDetailEntity) {
WindowOwnerDetailEntity tmp = (WindowOwnerDetailEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
}
public void initAttrValue(){
this.ownerId = 0L;
this.staffId = 0L;
this.remark = "";
this.ownerId = null;
this.windowId = null;
this.windowName = "";
this.remark = "";
this.windowCode = "";
this.building = 1;
this.level = 1;
}
}
\ No newline at end of file
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.vo.WindowOwnerVo;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import lombok.Data;
/**
* 窗口负责人实体对象
*
* @author zxfei
* @date 2023-07-12
*/
* 窗口负责人实体对象
*
* @author zxfei
* @date 2024-01-17
*/
@Data
public class WindowOwnerEntity extends WindowOwnerVo {
private static final long serialVersionUID = 1L;
/**
* 部门id号
*/
* 部门id号
*/
private Long deptId;
/**
* 部门名称
*/
* 部门名称
*/
private String deptName;
/**
* 姓名
*/
private String name;
* 所属大厅
*/
private Long salaId;
/**
* 所属大厅名称
*/
private String salaName;
/**
* 窗口负责人id
*/
private Long staffId;
/**
* 窗口负责人名称
*/
private String staffName;
/**
* 工号
*/
* 工号
*/
private String number;
/**
* 电话号码
*/
* 电话号码
*/
private String phone;
/**
* 负责窗口数量
*/
* 负责窗口数量
*/
private Integer windowCount;
/**
* 备注
*/
* 备注
*/
private String remark;
/**
* 窗口负责人详细信息
*/
* 窗口负责人详细信息
*/
private List<WindowOwnerDetailEntity> windowOwnerDetailList=new ArrayList<>();;
public List<WindowOwnerDetailEntity> getWindowOwnerDetailList(){
return windowOwnerDetailList;
return windowOwnerDetailList;
}
public void setWindowOwnerDetailList(List<WindowOwnerDetailEntity> windowOwnerDetailList){
this.windowOwnerDetailList = windowOwnerDetailList;
}
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -67,26 +82,22 @@ public class WindowOwnerEntity extends WindowOwnerVo {
if (obj instanceof WindowOwnerEntity) {
WindowOwnerEntity tmp = (WindowOwnerEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
}
public void initAttrValue(){
this.deptId = 0L;
this.deptName = "";
this.name = "";
this.number = "";
this.phone = "";
this.windowCount = 0;
this.remark = "";
this.deptId = null;
this.deptName = "";
this.salaId = null;
this.salaName = "";
this.staffId = null;
this.staffName = "";
this.number = "";
this.phone = "";
this.windowCount = 0;
this.remark = "";
}
}
\ No newline at end of file
This diff is collapsed.
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