Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 22665150 75d04a79
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5792 additions and 3351 deletions
attendance-performance-manager-ui/admin/src/components/DataTable.vue
View file @ edc352c9
......@@ -113,8 +113,6 @@ export default {
},
},
mounted() {
console.log(this.tableData);
console.log(this.loading);
},
watch: {
tableData(val) {
......
attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue
View file @ edc352c9
......@@ -22,9 +22,11 @@
<span>&nbsp;</span>
<el-switch
v-if="switchBtn"
v-model="row.check"
@change="$emit('view', row)"
title="核查"
v-model="row.check"
:active-value="true"
:inactive-value="false"
></el-switch>
<span>&nbsp;</span>
<el-button
......
attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
View file @ edc352c9
......@@ -66,6 +66,7 @@
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
</LayoutTable>
......@@ -107,6 +108,7 @@
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
</LayoutTable>
......@@ -148,6 +150,7 @@
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
</LayoutTable>
......@@ -189,6 +192,7 @@
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
</LayoutTable>
......@@ -230,6 +234,7 @@
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
</LayoutTable>
......@@ -310,7 +315,7 @@ export default {
mixins: [form, table],
components: {},
created() {
this.changePath("perform/dept/conf");
this.changePath("perform//staff/conf");
// 获取部门列表
this.$post("/dept/list", { page: 1, size: -1 }).then((res) => {
if (res.code == 1) {
......@@ -319,6 +324,7 @@ export default {
this.deptArr = [];
}
});
this.checkArr = [];
// this.getKaoQin();
},
data() {
......@@ -333,30 +339,17 @@ export default {
direction: "rtl",
toString: [],
toDate: [],
tableData: [
{
core: "-0.5",
name: "迟到",
simple: "迟到5分钟以内（包含5分钟）",
check: false,
},
],
tableData: [],
// 表单校验
rules: {},
activeName: "1",
options: [
{
value: "1",
label: "工作纪律",
},
{
value: "2",
label: "工作效能",
},
],
options: [],
type: "",
keywords: "",
deptArr: [],
urls: {
saveUrl: "/perform/dept/conf/save",
},
config: {
isshowTabPane: false,
search: [],
......@@ -373,36 +366,39 @@ export default {
label: "操作",
width: 100,
formatter: (row) => {
return (
<table-buttons
noAdd
noView
noEdit
noDel
switchBtn
row={row}
onEdit={this.eddRules}
onDel={this.toDelRules}
onView={this.switchChange}
/>
);
if (row.check) {
return <span>不选择</span>;
} else {
return <span style="cursor:pointer">选择</span>;
}
},
},
],
},
cateObj: {},
dataArr: [],
checkArr: [],
};
},
// watch: {
// query: {
// deep,
// handler(val) {
// console.log(val);
// },
// },
// },
methods: {
handleRowClick(val) {
val.check = !val.check;
val.check
? this.checkArr.push(val)
: (this.checkArr = this.checkArr.filter((v) => v.id !== val.id));
this.checkArr.length > 0
? this.checkArr.forEach((val) => {
val.ruleId = val.id;
val.ruleName = val.name;
this.tableData.data.forEach((v) => {
val.id == v.id ? (v.check = val.check) : "";
});
})
: "";
this.form.deptConfDetail = this.checkArr;
this.tableData.data = [...this.tableData.data];
this.$forceUpdate(this.tableData.data);
},
typeSelect(val) {
this.getKaoQin(val);
},
......@@ -423,29 +419,56 @@ export default {
categoryId,
type: this.activeName,
page: this.query.page,
size: -1,
orderColList: this.typeArr,
name: this.searchValue,
}).then((res) => {
if (res.code == 1) {
this.tableData = res.data;
this.checkArr.length > 0
? this.checkArr.forEach((val) => {
this.tableData.data.forEach((v) => {
val.id == v.id ? (v.check = val.check) : "";
});
})
: this.tableData.data.forEach((v) => {
v.check = false;
});
this.tableData.data = [...this.tableData.data];
this.$forceUpdate(this.tableData);
} else {
this.tableData = {};
}
});
},
switchChange(val) {},
handleClick(val) {
this.getData();
this.cateObj = {};
this.type = "";
},
/** 编辑 */
edit(row) {
this.reset();
this.query = { id: row.id };
// this.urls.currUrl = "perform/dept/conf/edit";
this.checkArr = [];
this.type = "";
this.activeName = "1";
this.$get("/perform/dept/conf/info", { id: row.id }).then((res) => {
if (res.code == 1) {
this.form = res.data;
this.checkArr = res.data.deptConfDetail;
res.data.deptConfDetail.length > 0
? res.data.deptConfDetail.forEach((val) => {
val.check = true;
val.id = val.ruleId;
this.tableData.data.forEach((v) => {
v.check = false;
val.ruleId == v.id ? (v.check = true) : "";
});
})
: "";
this.tableData.data = [...this.tableData.data];
this.$forceUpdate(this.tableData);
} else {
this.form = {};
}
......@@ -459,14 +482,18 @@ export default {
/** 新增 */
add(row) {
this.reset();
// this.urls.currUrl = "perform/dept/conf/add";
this.getData();
this.open = true;
this.checkArr = [];
this.type = "";
this.activeName = "1";
this.pageInfo.type = "add";
this.title = "新增部门自动考核信息";
},
/** 查看*/
view(row) {
console.log(123);
return;
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "perform/dept/conf/view";
......
attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
View file @ edc352c9
......@@ -17,7 +17,7 @@
<div class="goal_title">
<img src="../../../../assets/images/u17641.svg" alt="" />
<span>
{{ val.deptName ? val.deptName : "--" }}
{{ val.deptName ? val.deptName : val.staffNames }}
</span>
</div>
<p class="goal_txt">
......@@ -25,19 +25,19 @@
</p>
<p>
<el-tag style="margin: 0 5px 5px 0"
>考勤绩效指标/工作纪律：{{ val.attendCount }}</el-tag
>考勤绩效指标：{{ val.attendCount }}</el-tag
>
<el-tag style="margin: 0 5px 5px 0"
>评价绩效指标/工作纪律：{{ val.assessCount }}</el-tag
>评价绩效指标：{{ val.assessCount }}</el-tag
>
<el-tag style="margin: 0 5px 5px 0"
>办件绩效指标/工作效能：{{ val.workCount }}</el-tag
>办件绩效指标：{{ val.workCount }}</el-tag
>
<el-tag style="margin: 0 5px 5px 0"
>效能绩效指标/工作纪律：{{ val.effectCount }}</el-tag
>效能绩效指标：{{ val.effectCount }}</el-tag
>
<el-tag style="margin: 0 5px 5px 0"
>其他绩效指标/工作纪律：{{ val.otherCount }}</el-tag
>其他绩效指标：{{ val.otherCount }}</el-tag
>
</p>
<p class="goal_txt">
......@@ -68,7 +68,7 @@
</el-tab-pane>
<el-tab-pane label="窗口负责人管理" name="2">
<div class="content">
<LayoutTable :data="tableData" notSearch :config="tableConfig">
<LayoutTable :data="tableData" notSearch notDel :config="tableConfig">
</LayoutTable>
</div>
</el-tab-pane>
......@@ -99,7 +99,6 @@ export default {
},
mixins: [table],
created() {
console.log(this.tableData);
sessionStorage.removeItem("type");
sessionStorage.setItem("type", this.type);
},
......@@ -168,6 +167,13 @@ export default {
})
: "";
},
// 窗口负责人删除方法
toDel(row) {
this.$get("/window/owner/delete", { id: row }).then((res) => {
this.$message.success(res.msg);
this.getData();
});
},
},
data() {
return {
......@@ -182,13 +188,11 @@ export default {
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{ label: "部门名称", prop: "deptName" },
{ label: "姓名", prop: "name" },
{ label: "负责人姓名", prop: "name" },
{ label: "工号", prop: "number" },
{ label: "所属部门", prop: "deptName" },
{ label: "电话号码", prop: "phone" },
{ label: "联系电话", prop: "phone" },
{
label: "负责窗口数量",
......@@ -197,10 +201,17 @@ export default {
},
{
label: "创建时间",
prop: "createTime",
label: "更新时间",
prop: "updateTime",
formatter: this.formatterDate,
},
{
label: "更新人员",
prop: "updateUserId",
formatter: this.formatter,
},
{
label: "操作",
width: 240,
......@@ -208,6 +219,7 @@ export default {
return (
<table-buttons
noAdd
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
......@@ -319,6 +331,9 @@ export default {
margin-right: 10px;
}
}
/deep/.el-tag {
width: 114px !important;
}
.goal_txt {
font-family: "微软雅黑", sans-serif;
font-weight: 400;
......
attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue
View file @ edc352c9
......@@ -23,18 +23,22 @@
<Field
label="联系电话："
prop="phone"
maxLength="11"
v-model="form.phone"
placeholder="请输入联系电话"
/>
<el-col style="width: 100%;" :span="24">
<Field
label="选择部门："
prop="deptId"
v-model="form.deptId"
placeholder="选择部门"
:enumData="deptGroup"
type="select"
/>
<el-col style="width: 100%;" :span="12">
<el-form-item label="选择部门">
<el-select v-model="form.deptId" style="width: 100%;">
<el-option
v-for="item in deptArr"
:key="item.id"
:label="item.deptName"
:value="item.id"
>
</el-option
></el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
......@@ -42,48 +46,33 @@
<div class="content_top">
<span>请选择窗口工作人员：</span>
<div class="search_box">
<el-select v-model="type" placeholder="请选择部门">
<el-select v-model="deptValue" style="width: 100%;">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
style="width: 200px;"
v-for="item in deptArr"
:key="item.id"
:label="item.deptName"
:value="item.id"
>
</el-option>
</el-select>
</el-option
></el-select>
<el-input
v-model="keywords"
placeholder="请输入姓名关键字搜索"
style="width: 200px;margin: 0 10px;"
></el-input>
<el-button type="primary"> 搜索 </el-button>
<el-button type="primary" @click="handleSearch"> 搜索 </el-button>
</div>
</div>
<div class="table_box">
<el-table
<LayoutTable
:data="tableData"
border
style="width: 100%"
height="520"
@selection-change="handleSelectionChange"
notAdd
notDel
notSearch
notPagination
:config="tableConfig"
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" label="序号" width="50">
</el-table-column>
<el-table-column prop="name" label="姓名" width="180">
</el-table-column>
<el-table-column prop="id" label="工号"> </el-table-column>
<el-table-column prop="deptaName" label="部门"> </el-table-column>
<el-table-column prop="zhiwei" label="职位"> </el-table-column>
<el-table-column prop="status" label="状态"> </el-table-column>
<el-table-column prop="phone" label="手机号"> </el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span>{{ scope.row.check ? "已选择" : "选择" }}</span>
</template>
</el-table-column>
</el-table>
</LayoutTable>
</div>
</div>
</el-row>
......@@ -143,12 +132,23 @@
<script>
import form from "@/assets/mixins/formdialog";
import table from "@/assets/mixins/table";
export default {
name: "WindowOwnerDetail",
mixins: [form],
mixins: [form, table],
components: {},
created() {
this.changePath("window/owner");
// 获取部门列表
this.$post("/dept/list", { page: 1, size: -1 }).then((res) => {
if (res.code == 1) {
this.deptArr = res.data.data;
} else {
this.deptArr = [];
}
});
// this.getData();
},
data() {
return {
......@@ -159,68 +159,144 @@ export default {
// 是否显示弹出层
open: false,
direction: "rtl",
deptValue: "",
toString: [],
toDate: [],
deptArr: [],
// 表单校验
rules: {},
deptGroup: { 1: "部门1", 2: "部门2", 3: "部门3", 4: "部门4", 5: "部门5" },
options: [
{
value: "1",
label: "部门1",
},
{
value: "2",
label: "部门2",
},
],
type: "",
keywords: "",
tableData: [
{
id: "123456",
name: "xxx",
deptName: "部门1",
zhiwei: "工作人员",
status: "正式",
phone: "130****8888",
check: false,
checkArr: [],
urls: {
saveUrl: "/window/owner/save",
},
config: {
isshowTabPane: false,
search: [],
columns: [
{ type: "index", label: "序号", width: 50 },
{ label: "姓名", prop: "name" },
{ label: "工号", prop: "workNum" },
{ label: "部门", prop: "deptName" },
{ label: "职位", prop: "positionName" },
{ label: "员工状态", prop: "status", formatter: this.formatter },
{ label: "手机号码", prop: "phoneNumber" },
{
id: "123456",
name: "xxx",
deptName: "部门1",
zhiwei: "工作人员",
status: "正式",
phone: "130****8888",
check: false,
label: "操作",
width: 100,
formatter: (row) => {
if (row.check) {
return <span>不选择</span>;
} else {
return <span style="cursor:pointer">选择</span>;
}
},
},
],
},
};
},
methods: {
handleSelectionChange(val) {
console.log(val);
this.tableData.forEach((v) => (v.check = false));
val.forEach((v) => {
v.check = true;
handleSearch() {
this.getData();
},
getData() {
this.$post("/staff/list", {
page: 1,
size: -1,
deptId: this.deptValue,
name: this.keywords,
}).then((res) => {
if (res.code == 1) {
this.tableData = res.data;
this.checkArr.length > 0
? this.checkArr.forEach((val) => {
this.tableData.data.forEach((v) => {
val.id == v.id ? (v.check = val.check) : "";
});
})
: this.tableData.data.forEach((v) => {
v.check = false;
});
this.tableData.data = [...this.tableData.data];
this.$forceUpdate(this.tableData);
} else {
this.deptArr = [];
}
});
},
handleRowClick(val) {
val.check = !val.check;
val.check
? this.checkArr.push(val)
: (this.checkArr = this.checkArr.filter((v) => v.id !== val.id));
this.checkArr.length > 0
? this.checkArr.forEach((val) => {
val.staffId = val.id;
this.tableData.data.forEach((v) => {
val.id == v.id ? (v.check = val.check) : "";
});
})
: "";
this.tableData.data = [...this.tableData.data];
this.form.windowOwnerDetailList = this.checkArr;
this.$forceUpdate(this.tableData.data);
},
/** 编辑 */
edit(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "window/owner/edit";
this.deptValue = "";
this.keywords = "";
this.checkArr = [];
this.$get("/window/owner/info", { id: row.id }).then((res) => {
if (res.code == 1) {
this.form = res.data;
this.checkArr = res.data.windowOwnerDetailList;
res.data.windowOwnerDetailList.length > 0
? res.data.windowOwnerDetailList.forEach((val) => {
val.check = true;
val.id = val.staffId;
this.tableData.data.forEach((v) => {
v.check = false;
val.staffId == v.id ? (v.check = true) : "";
});
})
: "";
this.tableData.data = [...this.tableData.data];
this.$forceUpdate(this.tableData);
} else {
this.form = {};
}
this.open = true;
});
this.getData();
// this.urls.currUrl = "window/owner/edit";
// this.getData();
this.pageInfo.type = "edit";
this.title = "修改窗口负责人";
},
/** 新增 */
add(row) {
this.reset();
this.urls.currUrl = "window/owner/add";
// this.urls.currUrl = "window/owner/add";
// this.getData();
this.deptValue = "";
this.checkArr = [];
this.keywords = "";
this.getData();
this.open = true;
this.pageInfo.type = "add";
this.title = "新增窗口负责人";
},
......@@ -228,8 +304,8 @@ export default {
view(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "window/owner/view";
this.getData();
// this.urls.currUrl = "window/owner/view";
// this.getData();
this.pageInfo.type = "view";
this.title = "窗口负责人详细";
},
......@@ -250,7 +326,7 @@ export default {
// 表单重置
reset() {
this.form = {
deptId: 0,
deptId: "",
deptName: "",
name: "",
number: "",
......@@ -275,7 +351,7 @@ export default {
padding: 0 20px;
.bottom_content {
width: 100%;
height: 600px;
height: 680px;
background-color: rgba(242, 246, 252, 1);
box-sizing: border-box;
border-width: 1px;
......
attendance-performance-manager-ui/admin/src/views/staff/perform/stat/components/LineCharts.vue
View file @ edc352c9
......@@ -23,23 +23,50 @@ export default {
type: Object,
default: () => {},
},
parameter: {
type: Object,
default: () => {}
}
},
data() {
return {};
return {
myChart: null
};
},
watch: {
title(val) {
console.log(val);
this.myChart && this.myChart.setOption({title:{text:val}})
},
parameter: {
handler: function (v) {
this.drawLine(v)
},
deep: true
}
},
mounted() {
this.drawLine();
},
methods: {
drawLine() {
drawLine(obj) {
if (obj && this.myChart) {
// 更新
this.myChart.setOption({
xAxis: {
data: obj.x
},
series: [
{
data: obj.y,
},
]
})
return
}
// 基于dom，初始化echarts实例
let myChart = this.$echarts.init(document.getElementById(this.id));
this.myChart = myChart
// 绘制图表
myChart.setOption({
title: { text: this.title },
......@@ -59,7 +86,7 @@ export default {
color:'#6e98ed',
xAxis: {
type: "category",
data: ["部门1", "部门2", "部门3", "部门4", "部门5", "部门6"],
data: [],
},
grid: {
left: "3%",
......@@ -72,7 +99,7 @@ export default {
{
name: this.legendName,
type: "line",
data: [10, 20, 30, 90, 100, 100, 120],
data: [],
smooth: true,
// itemStyle: {
// lineStyle: {
......
attendance-performance-manager-ui/admin/src/views/staff/perform/stat/components/PieCharts.vue
View file @ edc352c9
......@@ -23,23 +23,47 @@ export default {
type: Object,
default: () => {},
},
parameter: {
type: Array,
default: () => []
}
},
data() {
return {};
return {
myChart: null
};
},
watch: {
title(val) {
console.log(val);
this.myChart && this.myChart.setOption({title:{text:val}})
},
parameter: {
handler: function (v) {
this.drawLine(v)
},
deep: true
}
},
mounted() {
this.drawLine();
},
methods: {
drawLine() {
drawLine(obj) {
if (obj && this.myChart) {
// 更新
this.myChart.setOption({
series: [
{
data: obj,
},
]
})
return
}
// 基于dom，初始化echarts实例
let myChart = this.$echarts.init(document.getElementById(this.id));
this.myChart = myChart
// 绘制图表
myChart.setOption({
title: { text: this.title },
......@@ -70,13 +94,7 @@ export default {
name: this.legendName,
type: "pie",
radius: "65%",
data: [
{ value: 1048, name: "部门1" },
{ value: 735, name: "部门2" },
{ value: 580, name: "部门3" },
{ value: 484, name: "部门4" },
{ value: 300, name: "部门5" },
],
data: this.parameter,
emphasis: {
itemStyle: {
shadowBlur: 10,
......
attendance-performance-manager-ui/admin/src/views/staff/perform/stat/dialogshow.vue
View file @ edc352c9
......@@ -18,7 +18,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="周期" prop="year">
<el-date-picker style="width: 100%;" v-model="form.year" type="year" placeholder="选择年">
<el-date-picker style="width: 100%;" format="yyyy" value-format="yyyy" v-model="form.year" type="year"
placeholder="选择年">
</el-date-picker>
</el-form-item>
......@@ -29,12 +30,12 @@
:enumData="dict.periodType" placeholder="请选择周期类型" />
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<Field label="考核范围" :span="24" prop="assessmentScope" v-model="form.assessmentScope" type="select"
:enumData="dict.assessmentScope" placeholder="请选择考核范围" />
</el-col>
</el-row>
</el-row> -->
<el-row v-if="form.assessmentScope == 1">
<el-col :span="8">
<el-form-item label="选择部门">
......@@ -65,7 +66,7 @@
<el-input v-model="item.ownerName" placeholder="请输入姓名"></el-input>
</el-col>
<el-col :span="12" style="padding:0 10px">
<el-input v-model="form.leaderMobiles" placeholder="请输入电话"></el-input>
<el-input v-model="item.leaderMobiles" placeholder="请输入电话"></el-input>
</el-col>
<el-col :span="2">
<el-button type="primary" icon="el-icon-plus" circle v-if="index == 0" @click="addOwner"></el-button>
......@@ -146,10 +147,10 @@ export default {
ownerList: [
{ ownerId: "", ownerName: "", leaderMobiles: "" }
],
deptArr:[],//部门下拉
staffArr:[],//人员下拉
deptId:[],//部门选中
staffId:[],//人员选中数据
deptArr: [],//部门下拉
staffArr: [],//人员下拉
deptId: [],//部门选中
staffId: [],//人员选中数据
};
},
created() {
......@@ -157,20 +158,46 @@ export default {
this.staffList()
},
methods: {
beforeSubmit(form) {
// 个人/部门
const perposeStaffList = []//选中人员
const perposeDeptList = []//选中部门
this.deptId.forEach(element => {
perposeDeptList.push({ deptId: element })
});
this.staffId.forEach(element => {
perposeStaffList.push({ staffId: element })
});
form.perposeStaffList = perposeStaffList
form.perposeDeptList = perposeDeptList
// 负责人
const leaders = []//名
const leaderMobiles = []//电话
this.ownerList.forEach(element => {
leaders.push(element.ownerName)
leaderMobiles.push(element.leaderMobiles)
});
form.leaders = leaders.length > 0 ? leaders.join(",") : ""
form.leaderMobiles = leaderMobiles.length > 0 ? leaderMobiles.join(',') : ""
console.log(form, "入参")
return form
},
// 查询部门列表
deptList(){
this.$post("/dept/list", {page:1,size:-1}).then((res) => {
const {code,data,dict} = res
if(code == 1){
deptList() {
this.$post("/dept/list", { page: 1, size: -1 }).then((res) => {
const { code, data, dict } = res
if (code == 1) {
this.deptArr = data.data
console.log(data.data, "部门")
}
});
},
// 查询部门列表
staffList(){
this.$post("/staff/list", {page:1,size:-1}).then((res) => {
const {code,data,dict} = res
if(code == 1){
staffList() {
this.$post("/staff/list", { page: 1, size: -1 }).then((res) => {
const { code, data, dict } = res
if (code == 1) {
this.staffArr = data.data
}
});
......@@ -194,9 +221,9 @@ export default {
},
/** 新增 */
add(row) {
this.reset();
this.urls.currUrl = "perform/perpose/add";
this.getData();
this.reset();
this.pageInfo.type = "add";
this.title = "新增考核目标";
},
......@@ -216,6 +243,33 @@ export default {
/**获取数据后弹框 */
afterRender(data) {
this.open = true;
if (this.pageInfo.type == "add") {
// 新增
this.reset()
this.form.assessmentScope = this.$parent.query.assessmentScope + ''
}else{
// 编辑
this.form.year = this.form.year+''
const leaderMobiles = this.form.leaderMobiles.split(',')
// 回显负责人
const ownerList = []
this.form.leaders.split(',').forEach((v,i)=>{
ownerList.push({ ownerId: "", ownerName: v, leaderMobiles: leaderMobiles[i] || '' })
})
this.ownerList = ownerList
// 回显选中人员
const staffId = []
this.form.perposeStaffList && this.form.perposeStaffList.forEach(v=>{
staffId.push(v.staffId)
})
this.staffId = staffId
// 回显选中部门
const deptId = []
this.form.perposeDeptList && this.form.perposeDeptList.forEach(v=>{
deptId.push(v.deptId)
})
this.deptId = deptId
}
},
afterSubmit(data) {
......@@ -229,20 +283,26 @@ export default {
ownerId: null,
ownerName: "",
staffId: null,
assessmentType: null,
assessmentScope: 1,
compareScope: 1,
assessmentType: '1',
assessmentScope: '1',
compareScope: '1',
ratio: 0.0,
periodType: 1,
year: null,
month: null,
halfYear: 1,
halfYear: 1,
quarter: 1,
periodType: '1',
year: "",
// month: null,
// halfYear: 1,
// quarter: 1,
leaders: "",
leaderMobiles: "",
remark: "",
perposeStaffList: [],
perposeDeptList: []
};
this.ownerList = [
{ ownerId: "", ownerName: "", leaderMobiles: "" }
]
this.deptId = []
this.staffId = []
this.resetForm("form");
},
resetForm(refName) {
......
attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue
View file @ edc352c9
......@@ -40,6 +40,7 @@
<line-charts
:title="'绩效平均分排名'"
:id="'jixiaopingjunfen'"
:parameter="depStatObj.averageScore"
:legendName="'绩效平均分'"
:styleObj="{ width: '100%', height: '300px' }"
/>
......@@ -50,7 +51,7 @@
<bar-charts
:title="'部门加分排名TOP10'"
:id="'top_10'"
:parameter="depStatObj.attendScoreAdd"
:parameter="depStatObj.totalAddScore"
:legendName="'部门加分分值'"
:styleObj="{ width: '100%', height: '300px' }"
/>
......@@ -59,6 +60,7 @@
<pie-charts
:title="'部门加分整体分布'"
:id="'jiafen'"
:parameter="depStatObj.pieAddScore"
:legendName="'部门加分'"
:styleObj="{ width: '100%', height: '300px' }"
/>
......@@ -67,16 +69,18 @@
<bar-charts
:title="'部门扣分排名TOP10'"
:id="'koufen_10'"
:parameter="depStatObj.totalSubScore"
:legendName="'部门扣分分值'"
:styleObj="{ width: '100%', height: '300px' }"
/>
</div>
<div class="koufen box">
<pie-charts
:parameter="depStatObj.pieSubScore"
:title="'部门扣分整体分布'"
:id="'koufen'"
:legendName="'部门扣分'"
:styleObj="{ width: '100%', height: '300px' }"
:styleObj="{ onAssessmentScope2width: '100%', height: '300px' }"
/>
</div>
</div>
......@@ -131,7 +135,7 @@
<el-tab-pane label="目标管理" name="3">
<div class="content">
<div class="top">
<el-radio-group v-model="type2">
<el-radio-group v-model="type2" @change="onAssessmentScope2">
<el-radio-button :label="1">按部门</el-radio-button>
<el-radio-button :label="2">按个人</el-radio-button>
</el-radio-group>
......@@ -144,17 +148,17 @@
<div class="goal_title">
<img src="../../../../assets/images/u17641.svg" alt="" />
<span>
旷工率不高于10%
{{dictString('assessmentType',val.assessmentType)}}{{dictString('compareScope',val.compareScope)}}{{val.ratio}}%
</span>
</div>
<p class="goal_txt">
<span>{{ type2 == 1 ? "目标部门：" : "目标个人：" }}</span
><span>{{
type2 == 1 ? "全部部门" : "张三、李四、王武、陈真"
type2 == 1 ? val.deptPerpose : val.staffPerpose
}}</span>
</p>
<p class="goal_txt">
<span>周期：</span><span>{{val.periodType}}</span>
<span>周期：</span><span>{{val.year}} {{dictString('periodType',val.periodType)}}</span>
</p>
<p class="goal_txt">
<span>负责人：</span><span>{{val.leaders}}</span>
......@@ -162,7 +166,7 @@
<p class="goal_txt">
<span>最近更新：</span><span>{{val.updateTime}}</span>
</p>
<p class="goal_txt"><span>更新人员：</span><span>{{val.updateUserId}}</span></p>
<p class="goal_txt"><span>更新人员：</span><span>{{dictString('updateUserId',val.updateUserId)}}</span></p>
<div class="button_box">
<el-button
type="primary"
......@@ -254,17 +258,22 @@ export default {
// this.statArr = row
const x = []
const y = []
const xTop10 = []
const averageScore = [] //平均分数
row.forEach(element => {
x.push(element.deptName)
y.push(element.totalScore)
averageScore.push(element.averageScore)
});
this.depStatObj.totalScore.x = x
this.depStatObj.totalScore.y = y
// 平均值
this.depStatObj.averageScore.x = x
this.depStatObj.averageScore.y = averageScore
}
});
// 加分top10
const top10 = {...this.boardQuery,size:10}
const top10 = {...this.boardQuery,size:10,orderColList:[{colName:'totalAddScore',sortKind:'desc'}]}
this.$post("/staff/perform/stat/list", top10).then((res) => {
const {code,data,dict} = res
if(code == 1){
......@@ -274,11 +283,28 @@ export default {
const y = []
row.forEach(element => {
x.push(element.deptName)
y.push(element.attendScoreAdd)
y.push(element.totalAddScore)
});
this.depStatObj.attendScoreAdd.x = x
this.depStatObj.attendScoreAdd.y = y
console.log(this.depStatObj.attendScoreAdd,"`````",data)
this.depStatObj.totalAddScore.x = x
this.depStatObj.totalAddScore.y = y
}
});
// 减分
const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
const {code,data,dict} = res
if(code == 1){
const row = data.data || []
// this.statArr = row
const x = []
const y = []
row.forEach(element => {
x.push(element.deptName)
y.push(element.totalSubScore)
});
this.depStatObj.totalSubScore.x = x
this.depStatObj.totalSubScore.y = y
}
});
},
......@@ -332,16 +358,24 @@ export default {
this.getData();
});
},
// 目标管理
getData() {
this.$post("/perform/perpose/list",this.query).then((res) => {
console.log(res);
if (res.code == 1) {
this.dataList = res.data.data;
console.log(res,"@@@@@@@@@@@@");
const {code,data,dict} = res
this.dict = dict || {}
if (code == 1) {
this.dataList = data.data;
} else {
this.dataList = [];
}
});
},
// 字典转换
dictString(key,id){
const keyName = this.dict[key]
return keyName?keyName[id]:""
},
// TAB个人/法人
onAssessmentScope(v){
if(v == 1){
......@@ -357,6 +391,15 @@ export default {
}else{
this.staffList()
}
},
onAssessmentScope2(v){
if(v == 1){
this.query.assessmentScope = 1
}else{
this.query.assessmentScope = 2
}
this.getData()
}
},
computed: {
......@@ -471,15 +514,15 @@ export default {
x:[],
y:[]
},//绩效总分排名
totalAverage:{
averageScore:{
x:[],
y:[]
},//绩效平均排名
attendScoreAdd:{
totalAddScore:{
x:[],
y:[]
},//加分
attendScoreSub:{
totalSubScore:{
x:[],
y:[]
},//减分
......@@ -487,19 +530,34 @@ export default {
x:[],
y:[]
},//目标对齐
pieAddScore:[
{value:0,name:'考勤绩效'},
{value:0,name:'评价绩效'},
{value:0,name:'办件绩效'},
{value:0,name:'效能绩效'},
{value:0,name:'投诉绩效'},
{value:0,name:'其它绩效'},
],//部门加分分布
pieSubScore:[
{value:0,name:'考勤绩效'},
{value:0,name:'评价绩效'},
{value:0,name:'办件绩效'},
{value:0,name:'效能绩效'},
{value:0,name:'投诉绩效'},
{value:0,name:'其它绩效'},
]//部门减分分布
},//按部门
month:"",//月份
boardQuery:{
page:1,
size:-1,
// year:parseInt(moment().format('YYYY')),
// month:parseInt(moment().format('MM')),
year:parseInt(moment().format('YYYY')),
month:parseInt(moment().format('MM')),
},//看板查询条件
query:{
page:1,
size:-1,
// assessmentScope:1//考核范围(1.部门,2.个人)
size:8,
assessmentScope:1//考核范围(1.部门,2.个人)
},//目标管理查询条件
StatQuery:{
page:1,
......@@ -507,6 +565,7 @@ export default {
year:parseInt(moment().format('YYYY')),
month:parseInt(moment().format('MM')),
},//对齐方式入参
dict:{}//字典
};
},
};
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java
View file @ edc352c9
......@@ -60,5 +60,10 @@ public class PerformInfo {
*/
private String performType;
/**
* 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
*/
private Integer appealStatus;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
View file @ edc352c9
......@@ -16,13 +16,20 @@ import com.mortals.xhx.busiz.req.PerformReq;
import com.mortals.xhx.busiz.rsp.PerformDetailInfo;
import com.mortals.xhx.busiz.rsp.PerformInfo;
import com.mortals.xhx.busiz.rsp.PerformStatInfo;
import com.mortals.xhx.common.code.AppealResultEnum;
import com.mortals.xhx.common.code.AppealStatusEnum;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.ProcessStatusEnum;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
import com.mortals.xhx.module.attendance.model.AttendanceRecordQuery;
import com.mortals.xhx.module.attendance.service.AttendanceRecordService;
import com.mortals.xhx.module.check.model.*;
import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.*;
import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
......@@ -65,6 +72,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
private CheckGoworkRecordService checkGoworkRecordService;
@Autowired
private CheckOtherRecordService checkOtherRecordService;
@Autowired
private CheckAllRecordService checkAllRecordService;
@Autowired
private PerformAttendAppealService appealService;
/**
......@@ -119,6 +131,24 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PageInfo pageInfo = buildPageInfo(performReq);
//todo 查询全部扣分绩效
if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
CheckAllRecordQuery query = new CheckAllRecordQuery();
query.setCheckTimeStart(performReq.getPerformStartDate());
query.setCheckTimeEnd(performReq.getPerformEndDate());
query.setStaffId(context.getUser().getCustomerId());
List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
PageInfo pageAllInfo = new PageInfo();
pageAllInfo.setTotalResult(collect.size());
pageAllInfo.setCurrPage(1);
pageAllInfo.setPrePageResult(-1);
model.put(PAGEINFO_KEY, pageAllInfo);
parsePageInfo(model, pageAllInfo);
} else if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
CheckAttendRecordQuery query = new CheckAttendRecordQuery();
......@@ -131,8 +161,15 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
model.put(PAGEINFO_KEY, result.getPageInfo());
parsePageInfo(model, result.getPageInfo());
......@@ -147,6 +184,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
......@@ -163,6 +205,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.评价投诉绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
......@@ -179,6 +226,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
......@@ -195,6 +246,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
......@@ -211,6 +266,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
PerformInfo performInfo = new PerformInfo();
BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
//判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
......@@ -221,7 +280,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
}
rest.setData(model);
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error(busiDesc, e);
......@@ -230,6 +288,22 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
return rest;
}
private static void updateAppealStatus(PerformInfo performInfo, Boolean bool, Integer processStatus, Integer appealResult) {
if (!bool) {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} else {
if (ProcessStatusEnum.未处理.getValue() == processStatus) {
performInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
} else {
if (AppealResultEnum.通过.getValue() == appealResult) {
performInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
} else if (AppealResultEnum.不通过.getValue() == appealResult) {
performInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
}
}
}
}
/**
* 详细
......@@ -278,7 +352,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
}
public static void main(String[] args) {
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AppealStatusEnum.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
*
* @author zxfei
*/
public enum AppealStatusEnum {
未申诉(0, "未申诉"),
申诉中(1, "申诉中"),
申诉拒绝(2, "申诉拒绝"),
申诉通过(3, "申诉通过");
private Integer value;
private String desc;
AppealStatusEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static AppealStatusEnum getByValue(Integer value) {
for (AppealStatusEnum deviceStatusEnum : AppealStatusEnum.values()) {
if (deviceStatusEnum.getValue() == value) {
return deviceStatusEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (AppealStatusEnum item : AppealStatusEnum.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;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeDeptEntity.java
View file @ edc352c9
......@@ -7,11 +7,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.vo.PerformPerposeDeptVo;
import lombok.Data;
/**
* 部门考核目标详细信息实体对象
*
* @author zxfei
* @date 2023-05-16
*/
* 部门考核目标详细信息实体对象
*
* @author zxfei
* @date 2023-07-12
*/
@Data
public class PerformPerposeDeptEntity extends PerformPerposeDeptVo {
private static final long serialVersionUID = 1L;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeDeptQuery.java
View file @ edc352c9
......@@ -3,26 +3,26 @@ package com.mortals.xhx.module.perform.model;
import java.util.List;
import com.mortals.xhx.module.perform.model.PerformPerposeDeptEntity;
/**
* 部门考核目标详细信息查询对象
*
* @author zxfei
* @date 2023-05-16
*/
* 部门考核目标详细信息查询对象
*
* @author zxfei
* @date 2023-07-12
*/
public class PerformPerposeDeptQuery extends PerformPerposeDeptEntity {
/** 开始 序号，主键，自增长 */
private Long IdStart;
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long IdEnd;
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long IdIncrement;
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> IdList;
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> IdNotList;
private List <Long> idNotList;
/** 开始 考核目标id */
private Long purposeConfIdStart;
......@@ -116,82 +116,82 @@ public class PerformPerposeDeptQuery extends PerformPerposeDeptEntity {
/**
* 获取 开始 序号，主键，自增长
* @return IdStart
* @return idStart
*/
public Long getIdStart(){
return this.IdStart;
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* @param idStart
*/
public void setIdStart(Long IdStart){
this.IdStart = IdStart;
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $IdEnd
* @return $idEnd
*/
public Long getIdEnd(){
return this.IdEnd;
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* @param idEnd
*/
public void setIdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return IdIncrement
* @return idIncrement
*/
public Long getIdIncrement(){
return this.IdIncrement;
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* @param idIncrement
*/
public void setIdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return IdList
* @return idList
*/
public List<Long> getIdList(){
return this.IdList;
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* @param idList
*/
public void setIdList(List<Long> IdList){
this.IdList = IdList;
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return IdNotList
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.IdNotList;
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* @param idNotList
*/
public void setIdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
......@@ -649,55 +649,55 @@ public class PerformPerposeDeptQuery extends PerformPerposeDeptEntity {
/**
* 设置 序号，主键，自增长
* @param Id
* @param id
*/
public PerformPerposeDeptQuery Id(Long Id){
setId(Id);
public PerformPerposeDeptQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* @param idStart
*/
public PerformPerposeDeptQuery IdStart(Long IdStart){
this.IdStart = IdStart;
public PerformPerposeDeptQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* @param idEnd
*/
public PerformPerposeDeptQuery IdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public PerformPerposeDeptQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* @param idIncrement
*/
public PerformPerposeDeptQuery IdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public PerformPerposeDeptQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* @param idList
*/
public PerformPerposeDeptQuery IdList(List<Long> IdList){
this.IdList = IdList;
public PerformPerposeDeptQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* @param idNotList
*/
public PerformPerposeDeptQuery IdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public PerformPerposeDeptQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeDeptStatEntity.java
View file @ edc352c9
package com.mortals.xhx.module.perform.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.vo.PerformPerposeDeptStatVo;
import lombok.Data;
/**
* 部门目标统计实体对象
*
* @author zxfei
* @date 2023-05-16
*/
* 部门目标统计实体对象
*
* @author zxfei
* @date 2023-07-12
*/
@Data
public class PerformPerposeDeptStatEntity extends PerformPerposeDeptStatVo {
private static final long serialVersionUID = 1L;
......@@ -125,10 +128,10 @@ public class PerformPerposeDeptStatEntity extends PerformPerposeDeptStatVo {
this.remark = "";
this.year = -1;
this.year = DateUtil.year(new Date());
this.month = -1;
this.month = DateUtil.month(new Date())+1;
this.day = -1;
this.day = DateUtil.dayOfMonth(new Date());
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeDeptStatQuery.java
View file @ edc352c9
......@@ -4,11 +4,11 @@ import java.math.BigDecimal;
import java.util.List;
import com.mortals.xhx.module.perform.model.PerformPerposeDeptStatEntity;
/**
* 部门目标统计查询对象
*
* @author zxfei
* @date 2023-05-16
*/
* 部门目标统计查询对象
*
* @author zxfei
* @date 2023-07-12
*/
public class PerformPerposeDeptStatQuery extends PerformPerposeDeptStatEntity {
/** 开始 主键ID，主键，自增长 */
private Long idStart;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeEntity.java
View file @ edc352c9
package com.mortals.xhx.module.perform.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -111,9 +114,9 @@ public class PerformPerposeEntity extends PerformPerposeVo {
this.periodType = 1;
this.year = -1;
this.year = DateUtil.year(new Date());
this.month = -1;
this.month =DateUtil.month(new Date())+1;
this.halfYear = 1;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffEntity.java
View file @ edc352c9
......@@ -7,11 +7,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.vo.PerformPerposeStaffVo;
import lombok.Data;
/**
* 员工考核目标详细信息实体对象
*
* @author zxfei
* @date 2023-05-16
*/
* 员工考核目标详细信息实体对象
*
* @author zxfei
* @date 2023-07-12
*/
@Data
public class PerformPerposeStaffEntity extends PerformPerposeStaffVo {
private static final long serialVersionUID = 1L;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffQuery.java
View file @ edc352c9
......@@ -3,26 +3,26 @@ package com.mortals.xhx.module.perform.model;
import java.util.List;
import com.mortals.xhx.module.perform.model.PerformPerposeStaffEntity;
/**
* 员工考核目标详细信息查询对象
*
* @author zxfei
* @date 2023-05-16
*/
* 员工考核目标详细信息查询对象
*
* @author zxfei
* @date 2023-07-12
*/
public class PerformPerposeStaffQuery extends PerformPerposeStaffEntity {
/** 开始 序号，主键，自增长 */
private Long IdStart;
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long IdEnd;
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long IdIncrement;
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> IdList;
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> IdNotList;
private List <Long> idNotList;
/** 开始 考核目标id */
private Long purposeConfIdStart;
......@@ -121,82 +121,82 @@ public class PerformPerposeStaffQuery extends PerformPerposeStaffEntity {
/**
* 获取 开始 序号，主键，自增长
* @return IdStart
* @return idStart
*/
public Long getIdStart(){
return this.IdStart;
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* @param idStart
*/
public void setIdStart(Long IdStart){
this.IdStart = IdStart;
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $IdEnd
* @return $idEnd
*/
public Long getIdEnd(){
return this.IdEnd;
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* @param idEnd
*/
public void setIdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return IdIncrement
* @return idIncrement
*/
public Long getIdIncrement(){
return this.IdIncrement;
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* @param idIncrement
*/
public void setIdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return IdList
* @return idList
*/
public List<Long> getIdList(){
return this.IdList;
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* @param idList
*/
public void setIdList(List<Long> IdList){
this.IdList = IdList;
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return IdNotList
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.IdNotList;
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* @param idNotList
*/
public void setIdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
......@@ -686,55 +686,55 @@ public class PerformPerposeStaffQuery extends PerformPerposeStaffEntity {
/**
* 设置 序号，主键，自增长
* @param Id
* @param id
*/
public PerformPerposeStaffQuery Id(Long Id){
setId(Id);
public PerformPerposeStaffQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* @param idStart
*/
public PerformPerposeStaffQuery IdStart(Long IdStart){
this.IdStart = IdStart;
public PerformPerposeStaffQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* @param idEnd
*/
public PerformPerposeStaffQuery IdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public PerformPerposeStaffQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* @param idIncrement
*/
public PerformPerposeStaffQuery IdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public PerformPerposeStaffQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* @param idList
*/
public PerformPerposeStaffQuery IdList(List<Long> IdList){
this.IdList = IdList;
public PerformPerposeStaffQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* @param idNotList
*/
public PerformPerposeStaffQuery IdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public PerformPerposeStaffQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffStatEntity.java
View file @ edc352c9
package com.mortals.xhx.module.perform.model;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -11,7 +14,7 @@ import lombok.Data;
* 员工目标统计实体对象
*
* @author zxfei
* @date 2023-07-11
* @date 2023-07-12
*/
@Data
public class PerformPerposeStaffStatEntity extends PerformPerposeStaffStatVo {
......@@ -131,10 +134,10 @@ public class PerformPerposeStaffStatEntity extends PerformPerposeStaffStatVo {
this.remark = "";
this.year = -1;
this.year = DateUtil.year(new Date());
this.month = -1;
this.month = DateUtil.month(new Date())+1;
this.day = -1;
this.day = DateUtil.dayOfMonth(new Date());
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffStatQuery.java
View file @ edc352c9
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
* 员工目标统计查询对象
*
* @author zxfei
* @date 2023-07-11
* @date 2023-07-12
*/
public class PerformPerposeStaffStatQuery extends PerformPerposeStaffStatEntity {
/** 开始 主键ID，主键，自增长 */
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformPerposeDeptStatVo.java
View file @ edc352c9
......@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformPerposeDeptStatEntity;
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 2023-05-16
* @date 2023-07-12
*/
@Data
public class PerformPerposeDeptStatVo extends BaseEntityLong {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformPerposeStaffStatVo.java
View file @ edc352c9
......@@ -11,7 +11,7 @@ import java.util.Date;
* 员工目标统计视图对象
*
* @author zxfei
* @date 2023-07-11
* @date 2023-07-12
*/
@Data
public class PerformPerposeStaffStatVo extends BaseEntityLong {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformPerposeController.java
View file @ edc352c9
package com.mortals.xhx.module.perform.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.AssessmentScopeEnum;
import com.mortals.xhx.module.perform.model.*;
import com.mortals.xhx.module.perform.service.PerformPerposeDeptService;
import com.mortals.xhx.module.perform.service.PerformPerposeStaffService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -9,7 +16,6 @@ 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.perform.model.PerformPerposeEntity;
import com.mortals.xhx.module.perform.service.PerformPerposeService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
......@@ -35,6 +41,13 @@ public class PerformPerposeController extends BaseCRUDJsonBodyMappingController<
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
@Autowired
private PerformPerposeStaffService perposeStaffService;
@Autowired
private PerformPerposeDeptService perposeDeptService;
public PerformPerposeController(){
super.setModuleDesc( "考核目标");
......@@ -50,8 +63,28 @@ public class PerformPerposeController extends BaseCRUDJsonBodyMappingController<
this.addDict(model, "halfYear", paramService.getParamBySecondOrganize("PerformPerpose","halfYear"));
this.addDict(model, "halfYear", paramService.getParamBySecondOrganize("PerformPerpose","halfYear"));
this.addDict(model, "quarter", paramService.getParamBySecondOrganize("PerformPerpose","quarter"));
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "updateUserId", collect);
super.init(model, context);
}
@Override
protected int editAfter(Long id, Map<String, Object> model, PerformPerposeEntity entity, Context context) throws AppException {
if(AssessmentScopeEnum.个人.getValue()==entity.getAssessmentScope()){
List<PerformPerposeStaffEntity> staffEntities = perposeStaffService.find(new PerformPerposeStaffQuery().purposeConfId(entity.getId()));
entity.setPerposeStaffList(staffEntities);
}else if(AssessmentScopeEnum.部门.getValue()==entity.getAssessmentScope()){
List<PerformPerposeDeptEntity> deptEntities = perposeDeptService.find(new PerformPerposeDeptQuery().purposeConfId(entity.getId()));
entity.setPerposeDeptList(deptEntities);
}
return super.editAfter(id, model, entity, context);
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/dao/WindowOwnerDao.java
View file @ edc352c9
......@@ -8,7 +8,7 @@ import java.util.List;
* 窗口负责人 DAO接口
*
* @author zxfei
* @date 2023-05-16
* @date 2023-07-12
*/
public interface WindowOwnerDao extends ICRUDDao<WindowOwnerEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/dao/WindowOwnerDetailDao.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import java.util.List;
/**
* 窗口负责人详细Dao
* 窗口负责人详细 DAO接口
*
* @author zxfei
* @date 2023-07-12
*/
public interface WindowOwnerDetailDao extends ICRUDDao<WindowOwnerDetailEntity,Long>{
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/dao/ibatis/WindowOwnerDaoImpl.java
View file @ edc352c9
......@@ -11,7 +11,7 @@ import java.util.List;
* 窗口负责人DaoImpl DAO接口
*
* @author zxfei
* @date 2023-05-16
* @date 2023-07-12
*/
@Repository("windowOwnerDao")
public class WindowOwnerDaoImpl extends BaseCRUDDaoMybatis<WindowOwnerEntity,Long> implements WindowOwnerDao {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/dao/ibatis/WindowOwnerDetailDaoImpl.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.window.dao.WindowOwnerDetailDao;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 窗口负责人详细DaoImpl DAO接口
*
* @author zxfei
* @date 2023-07-12
*/
@Repository("windowOwnerDetailDao")
public class WindowOwnerDetailDaoImpl extends BaseCRUDDaoMybatis<WindowOwnerDetailEntity,Long> implements WindowOwnerDetailDao {
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowOwnerDetailEntity.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.ArrayList;
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
*/
@Data
public class WindowOwnerDetailEntity extends WindowOwnerDetailVo {
private static final long serialVersionUID = 1L;
/**
* 负责人Id
*/
private Long ownerId;
/**
* 员工id号
*/
private Long staffId;
/**
* 备注
*/
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 WindowOwnerDetailEntity) {
WindowOwnerDetailEntity tmp = (WindowOwnerDetailEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.ownerId = 0L;
this.staffId = 0L;
this.remark = "";
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowOwnerEntity.java
View file @ edc352c9
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.List;
import java.util.ArrayList;
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-05-16
* @date 2023-07-12
*/
@Data
public class WindowOwnerEntity extends WindowOwnerVo {
......@@ -44,6 +46,17 @@ public class WindowOwnerEntity extends WindowOwnerVo {
* 备注
*/
private String remark;
/**
* 窗口负责人详细信息
*/
private List<WindowOwnerDetailEntity> windowOwnerDetailList=new ArrayList<>();;
public List<WindowOwnerDetailEntity> getWindowOwnerDetailList(){
return windowOwnerDetailList;
}
public void setWindowOwnerDetailList(List<WindowOwnerDetailEntity> windowOwnerDetailList){
this.windowOwnerDetailList = windowOwnerDetailList;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowOwnerQuery.java
View file @ edc352c9
package com.mortals.xhx.module.window.model;
import java.util.List;
import java.util.List;
import com.mortals.xhx.module.window.model.WindowOwnerEntity;
/**
* 窗口负责人查询对象
*
* @author zxfei
* @date 2023-05-16
* @date 2023-07-12
*/
public class WindowOwnerQuery extends WindowOwnerEntity {
/** 开始 序号，主键，自增长 */
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowOwnerDetailVo.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
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 2023-07-12
*/
@Data
public class WindowOwnerDetailVo extends BaseEntityLong {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowOwnerVo.java
View file @ edc352c9
......@@ -4,15 +4,16 @@ import com.mortals.xhx.module.window.model.WindowOwnerEntity;
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 2023-05-16
* @date 2023-07-12
*/
@Data
public class WindowOwnerVo extends BaseEntityLong {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/WindowOwnerDetailService.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import com.mortals.xhx.module.window.dao.WindowOwnerDetailDao;
/**
* WindowOwnerDetailService
*
* 窗口负责人详细 service接口
*
* @author zxfei
* @date 2023-07-12
*/
public interface WindowOwnerDetailService extends ICRUDService<WindowOwnerDetailEntity,Long>{
WindowOwnerDetailDao getDao();
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/WindowOwnerService.java
View file @ edc352c9
......@@ -8,7 +8,7 @@ import com.mortals.xhx.module.window.dao.WindowOwnerDao;
* 窗口负责人 service接口
*
* @author zxfei
* @date 2023-05-16
* @date 2023-07-12
*/
public interface WindowOwnerService extends ICRUDService<WindowOwnerEntity,Long>{
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerDetailServiceImpl.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.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.window.dao.WindowOwnerDetailDao;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
import lombok.extern.slf4j.Slf4j;
/**
* WindowOwnerDetailService
* 窗口负责人详细 service实现
*
* @author zxfei
* @date 2023-07-12
*/
@Service("windowOwnerDetailService")
@Slf4j
public class WindowOwnerDetailServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerDetailDao, WindowOwnerDetailEntity, Long> implements WindowOwnerDetailService {
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
View file @ edc352c9
package com.mortals.xhx.module.window.service.impl;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.service.DeptService;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
......@@ -6,16 +8,69 @@ import com.mortals.framework.model.Context;
import com.mortals.xhx.module.window.dao.WindowOwnerDao;
import com.mortals.xhx.module.window.model.WindowOwnerEntity;
import com.mortals.xhx.module.window.service.WindowOwnerService;
import org.springframework.beans.factory.annotation.Autowired;
import com.mortals.xhx.module.window.model.WindowOwnerDetailEntity;
import com.mortals.xhx.module.window.model.WindowOwnerDetailQuery;
import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.Arrays;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
/**
* WindowOwnerService
* 窗口负责人 service实现
*
* @author zxfei
* @date 2023-05-16
* @date 2023-07-12
*/
@Service("windowOwnerService")
@Slf4j
public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerDao, WindowOwnerEntity, Long> implements WindowOwnerService {
@Autowired
private WindowOwnerDetailService windowOwnerDetailService;
@Autowired
private DeptService deptService;
@Override
protected void saveAfter(WindowOwnerEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getWindowOwnerDetailList())){
entity.getWindowOwnerDetailList().stream().peek(item->{
item.setOwnerId(entity.getId());
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
}).count();
DeptEntity deptEntity = deptService.get(entity.getId());
entity.setDeptName(deptEntity==null?"":deptEntity.getDeptName());
entity.setNumber(entity.getWindowOwnerDetailList().size()+"");
windowOwnerDetailService.save(entity.getWindowOwnerDetailList());
}
super.saveAfter(entity, context);
}
@Override
protected void updateAfter(WindowOwnerEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getWindowOwnerDetailList())){
Long[] windowOwnerDetailIds = windowOwnerDetailService.find(new WindowOwnerDetailQuery().ownerId(entity.getId())).stream().map(WindowOwnerDetailEntity::getId).toArray(Long[]::new);
windowOwnerDetailService.remove(windowOwnerDetailIds,context);
entity.getWindowOwnerDetailList().stream().peek(item ->{
item.setOwnerId(entity.getId());
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
item.setUpdateUserId(this.getContextUserId(context));
item.setUpdateTime(new Date());
}).count();
entity.setNumber(entity.getWindowOwnerDetailList().size()+"");
windowOwnerDetailService.save(entity.getWindowOwnerDetailList());
}
super.updateAfter(entity, context);
}
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<WindowOwnerDetailEntity> windowOwnerDetaillist = windowOwnerDetailService.find(new WindowOwnerDetailQuery().ownerIdList(Arrays.asList(ids)));
windowOwnerDetailService.removeList(windowOwnerDetaillist,context);
super.removeAfter(ids, context, result);
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java
View file @ edc352c9
package com.mortals.xhx.module.window.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
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.window.model.WindowOwnerEntity;
import com.mortals.xhx.module.window.service.WindowOwnerService;
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.*;
/**
*
* 窗口负责人
*
* @author zxfei
* @date 2023-05-16
*/
* 窗口负责人
*
* @author zxfei
* @date 2023-07-12
*/
@RestController
@RequestMapping("window/owner")
public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<WindowOwnerService,WindowOwnerEntity,Long> {
public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<WindowOwnerService, WindowOwnerEntity, Long> {
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public WindowOwnerController(){
super.setModuleDesc( "窗口负责人");
public WindowOwnerController() {
super.setModuleDesc("窗口负责人");
}
@Override
protected void init(Map<String, Object> model, Context context) {
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "updateUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerDetailController.java 0 → 100644
View file @ edc352c9
package com.mortals.xhx.module.window.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.window.model.WindowOwnerDetailEntity;
import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
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.*;
/**
*
* 窗口负责人详细
*
* @author zxfei
* @date 2023-07-12
*/
@RestController
@RequestMapping("window/owner/detail")
public class WindowOwnerDetailController extends BaseCRUDJsonBodyMappingController<WindowOwnerDetailService,WindowOwnerDetailEntity,Long> {
@Autowired
private ParamService paramService;
public WindowOwnerDetailController(){
super.setModuleDesc( "窗口负责人详细");
}
@Override
protected void init(Map<String, Object> model, Context context) {
super.init(model, context);
}
}
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowOwnerMapper.xml
View file @ edc352c9
......@@ -17,7 +17,17 @@
<result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<collection property="windowOwnerDetailList" column="id" ofType="WindowOwnerDetailEntity" javaType="ArrayList" select="getWindowOwnerDetailByOwnerId"></collection>
</resultMap>
<resultMap type="WindowOwnerDetailEntity" id="WindowOwnerDetailEntity-Map">
<result property="id" column="id" />
<result property="ownerId" column="ownerId" />
<result property="staffId" column="staffId" />
<result property="remark" column="remark" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
......@@ -62,6 +72,12 @@
</if>
</trim>
</sql>
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.ownerId,b.staffId,b.remark,b.createTime,b.createUserId,b.updateUserId,b.updateTime,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WindowOwnerEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_window_owner
......@@ -300,6 +316,14 @@
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取子列表 -->
<select id="getWindowOwnerDetailByOwnerId" parameterType="java.lang.Long" resultMap="WindowOwnerDetailEntity-Map">
select <include refid="_columns_sub"/>
from mortals_xhx_window_owner_detail as b
<trim suffixOverrides="where" suffix="">
where b.ownerId = #{id}
</trim>
</select>
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/window/WindowOwnerController.http
View file @ edc352c9
......@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
###窗口负责人列表
POST {{baseUrl}}/window/owner/list
Authorization: {{authToken}}
Content-Type: application/json
{
......@@ -31,12 +30,12 @@ Content-Type: application/json
{
"deptId":0,
"deptName":"idn5ru",
"name":"5kk6au",
"number":"xgrmfn",
"phone":"qjnd6f",
"windowCount":338,
"remark":"gobsbz",
"deptName":"b2vbef",
"name":"wjrhid",
"number":"10uobg",
"phone":"cywvqa",
"windowCount":32,
"remark":"7dryt2",
}
> {%
......@@ -45,12 +44,10 @@ client.global.set("WindowOwner_id", JSON.parse(response.body).data.id);
###窗口负责人查看
GET {{baseUrl}}/window/owner/info?id={{WindowOwner_id}}
Authorization: {{authToken}}
Accept: application/json
###窗口负责人编辑
GET {{baseUrl}}/window/owner/edit?id={{WindowOwner_id}}
Authorization: {{authToken}}
Accept: application/json
......
attendance-performance-manager/src/test/java/com/mortals/httpclient/window/WindowOwnerDetailController.http 0 → 100644
View file @ edc352c9
###登录
POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin",
"securityCode":"8888"
}
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###窗口负责人详细列表
POST {{baseUrl}}/window/owner/detail/list
Content-Type: application/json
{
"page":1,
"size":10
}
###窗口负责人详细更新与保存
POST {{baseUrl}}/window/owner/detail/save
Authorization: {{authToken}}
Content-Type: application/json
{
"ownerId":0,
"staffId":0,
"remark":"14lr1t",
}
> {%
client.global.set("WindowOwnerDetail_id", JSON.parse(response.body).data.id);
%}
###窗口负责人详细查看
GET {{baseUrl}}/window/owner/detail/info?id={{WindowOwnerDetail_id}}
Accept: application/json
###窗口负责人详细编辑
GET {{baseUrl}}/window/owner/detail/edit?id={{WindowOwnerDetail_id}}
Accept: application/json
###窗口负责人详细删除
GET {{baseUrl}}/window/owner/detail/delete?id={{WindowOwnerDetail_id}}
Authorization: {{authToken}}
Accept: application/json
db/add.sql
View file @ edc352c9
......@@ -485,3 +485,21 @@ CREATE TABLE mortals_xhx_perform_attend_appeal(
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效记录申诉信息';
-- ----------------------------
-- 窗口负责人详细表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_window_owner_detail`;
CREATE TABLE mortals_xhx_window_owner_detail(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`ownerId` bigint(20) DEFAULT '0' COMMENT '负责人Id',
`staffId` bigint(20) DEFAULT '0' COMMENT '员工id号',
`remark` varchar(255) COMMENT '备注',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口负责人详细';
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