c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2024-08-02 14:33:59 +08:00
parent f8bca9ff88
commit f10e4146be
6 changed files with 322 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/wakershome/controller/review/WakesHomeReviewController.java
+24 -5
View File
@@ -2,8 +2,12 @@ package io.v.nutz.wakershome.controller.review;
import io.v.nutz.annontation.ViReturn;
import io.v.nutz.modules.models.PageForm;
import io.v.nutz.wakershome.model.review.CommentPeo;
import io.v.nutz.wakershome.service.review.CommentZbService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.loader.annotation.Inject;
@@ -30,28 +34,43 @@ public class WakesHomeReviewController {
@At("")
@Ok("beetl:/platform/wakeshome/review/doReview.html")
// @RequiresPermissions("wakeshome.review.doReview")
public void index() {
}
@At
@ViReturn
// @RequiresPermissions("wakeshome.review.doReview")
public Object pageData(PageForm pageForm,
@Param(value = "annual", required = false) String annual,
@Param(value = "assessment", required = false) String assessment){
Sql sql = Sqls.create("SELECT * FROM `comment_zb` $condition");
Sql sql = Sqls.create("""
SELECT
zb.* ,
if((select count(1) from comment_peo peo where peo.zbId = zb.id and peo.userId = @userId) > 0,true,false) as isReview
FROM
`comment_zb` zb
$condition
""").setParam("userId",ShiroUtil.getUserId());
Cnd cnd = Cnd.NEW();
if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) {
cnd.and("annual", "=", annual);
cnd.and("zb.annual", "=", annual);
}
if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) {
cnd.where().andLike("assessment", assessment);
cnd.where().andLike("zb.assessment", assessment);
} else {
cnd.desc("annual");
cnd.desc("zb.annual");
}
sql.setCondition(cnd);
return commentZbService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
}
@At
@ViReturn
// @RequiresPermissions("wakeshome.review.doReview")
public Object getPeoId(String id){
CommentPeo peo = commentZbService.dao().fetch(CommentPeo.class, Cnd.where("zbId", "=", id).and("userId", "=", ShiroUtil.getUserId()));
return peo.getId();
}
}
src/main/resources/static/components/wakeshome/review/ReviewResult.vue
+120
View File
@@ -0,0 +1,120 @@
<template>
<el-form label-width="120px">
<template v-if="viewInfo.zbxx.assessmentMode === 2">
<vi-title title="评议对象选择"></vi-title>
<el-row :gutter="20">
<el-col :span="12" v-if="viewInfo.zbxx.assessmentMode===2">
<el-form-item prop="evaluatedPersonName" label="被测评人姓名">
{{viewInfo.commentPeo.evaluatedPersonName}}
</el-form-item>
</el-col>
<el-col :span="12" v-if="viewInfo.zbxx.assessmentMode===2">
<el-form-item prop="evaluatedPersonName" label="现任职务">
{{viewInfo.commentPeo.evaluatedPersonName}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="evaluatedPersonName" label="测评结果">
{{viewInfo.commentPeo.reviewResult}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="viewInfo.zbxx.assessmentMode===2">
<el-form-item prop="presidentOpinions" label="意见建议">
{{viewInfo.commentPeo.presidentOpinions}}
</el-form-item>
</el-col>
</el-row>
</template>
<vi-title2 title="评议内容"></vi-title2>
<el-form-item label="" label-width="0" v-for="(nr,idx) in viewInfo.zbxx.nrs" :key="nr.id">
<el-row type="flex" align="middle" justify="space-between">
<el-input v-model="nr.content" readonly maxlength="30" style="width: 50%">
<template slot="prepend"><span>{{ idx + 1 }}</span></template>
</el-input>
</el-row>
<el-row style="margin-top: 20px">
<el-table :data="nr.bzs" style="width: 100%" border :show-summary = "viewInfo.zbxx.scoringMode !== 2 ? 'always' : false">
<el-table-column align="center" header-align="center" label="序号"
type="index"
width="100px">
<template scope="{$index,row}">
{{ row.contentNumber = $index + 1 }}
</template>
</el-table-column>
<el-table-column label="主要评比内容" disabled prop="inspection" header-align="center" align="center"></el-table-column>
<template v-if="viewInfo.zbxx.scoringMode === 1">
<el-table-column label="标准分" prop="score" header-align="center" align="center" width="250px"></el-table-column>
<el-table-column label="评议分" prop="resultScore" header-align="center" align="center" width="250px"></el-table-column>
</template>
<template v-if="viewInfo.zbxx.scoringMode === 2">
<el-table-column label="满意度" prop="resultScore" header-align="center" align="center" width="350px">
<template slot-scope="{row}">
<el-radio-group v-model="row.resultScore" size="small">
<el-radio disabled label="满意">满意</el-radio>
<el-radio disabled label="基本满意">基本满意</el-radio>
<el-radio disabled label="不满意">不满意</el-radio>
</el-radio-group>
</template>
</el-table-column>
</template>
</el-table>
</el-row>
<div v-if="viewInfo.zbxx.scoringMode===1">
<el-divider content-position="left">备注</el-divider>
<el-row>
<el-col :span="24">
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit disabled
v-model="nr.bzs[0].options" placeholder="请输入备注"></el-input>
</el-col>
</el-row>
</div>
</el-form-item>
<template v-if="viewInfo.zbxx.scoringMode === 2">
<vi-title title="备注填写"></vi-title>
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit disabled
v-model="viewInfo.commentPeo.presidentOpinions" placeholder="请输入备注"></el-input>
</template>
<template v-if="viewInfo.zbxx.scoringMode === 1 && viewInfo.zbxx.reviewMode === 1">
<vi-title title="职工评家总结"></vi-title>
<file-upload :files.sync="viewInfo.commentPeo.files" view></file-upload>
</template>
</el-form>
</template>
<script>
module.exports = {
props: {
id: {type: String, default: ''}
},
data(){
return{
viewInfo:{
commentPeo: {},
zbxx: []
}
}
},
methods:{
async findOne(peoId){
const resp = await $.get('/platform/wakeshome/review/statistics/getBzById',{peoId:peoId})
if (resp.code === 0) {
this.viewInfo = resp.data
}
}
}
}
</script>
<style>
.el-divider {
background-color: #1867b0;
}
.el-divider__text {
color: #1867b0;
}
</style>
src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue
+1 -1
View File
@@ -162,7 +162,7 @@
<el-row type="flex" align="middle" justify="space-between">
<el-input v-model="nr.content" :disabled="is_view" maxlength="30" style="width: 50%"
placeholder="请填写测评内容">
<template slot="prepend"><span v-model="nr.contentNumber">
<template slot="prepend"><span>
{{ nr.contentNumber = idx + 1 }}</span></template>
</el-input>
<el-button v-if="!is_view" size="medium" :disabled="data.nrs.length<=1" type="danger"
src/main/resources/views/mobile/wakeshome/review/commentator.html
+3 -4
View File
@@ -226,7 +226,7 @@ layout("/mobile/platform.html"){
this.bzList = [];
this.commentatorData.nrs.forEach(v => {
v.bzs.forEach(o => {
if (v.remark){
if (self.commentatorData.assessmentMode === 1 && v.remark){
o.options = v.remark
}
self.bzList.push(o)
@@ -280,11 +280,10 @@ layout("/mobile/platform.html"){
formData.evaluatedPersonType = evaluatedPersonType
formData.files = JSON.stringify(this.commentatorData.files)
console.log(formData)
const resp = await $.post('/mobile/wakeshome/review/appraisal/doSubmit', formData)
if (resp.code === 0) {
// await this.getCommentById();
// window.location.href = '/mobile/wakeshome/review/appraisal/mine'
await this.getCommentById();
window.location.href = '/mobile/wakeshome/review/appraisal/mine'
}
})
},
src/main/resources/views/platform/wakeshome/review/doReview.html
+161 -30
View File
@@ -10,6 +10,14 @@ layout("/layouts/platform.html"){
.el-form {
height: calc(100vh - 100px) !important;
}
.el-divider {
background-color: #1867b0;
}
.el-divider__text {
color: #1867b0;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
@@ -84,9 +92,16 @@ layout("/layouts/platform.html"){
<el-button size="mini" type="primary" @click="openView(scope.row.id)">
查看
</el-button>
<el-button size="mini" type="primary" @click="doReview(scope.row)">
去评测
</el-button>
<template v-if="!scope.row.isReview">
<el-tooltip content="评议页面的提交按钮在右上角哦" placement="top">
<el-button size="mini" type="primary" @click="doReview(scope.row)">
去评议
</el-button>
</el-tooltip>
</template>
<template v-else>
<el-button size="mini" type="primary" @click="openReview(scope.row)">评议结果</el-button>
</template>
</template>
</el-table-column>
</el-table>
@@ -97,17 +112,40 @@ layout("/layouts/platform.html"){
<template #edit_func>
<el-button type="primary" style="float: right;margin-top: 5px;margin-left: 10px;" @click="doSaveOrSubmit('submit')">提交</el-button>
<!-- <el-button type="primary" plain style="float: right;margin-top: 5px" @click="doSaveOrSubmit('save')">保存</el-button>-->
<el-button type="primary" style="float: right;margin-top: 5px;margin-left: 10px;"
@click="doSubmit()">提交
</el-button>
<!-- <el-button type="primary" plain style="float: right;margin-top: 5px" @click="doSaveOrSubmit('save')">保存</el-button>-->
</template>
<template #edit>
<el-form :model="formData" ref="form" label-width="100px"
style="height: calc(100vh - 50px);overflow-y: scroll;padding: 10px 15px">
<template v-if="formData.scoringMode==2">
<vi-title title="评议对象选择"></vi-title>
<el-row>
<el-col :span="12">
<el-form-item prop="president" label-width="0px">
<el-select v-model="formData.president" placeholder="请选择主席/副主席进行评议"
style="width: 100%">
<el-option v-for="o in userList" :key="o.id" :label="o.presidents" :value="o.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div style="margin: 8px 10px">
<span style="color: #ac2925">如已完成该对象的评议，请您手动更换评议对象</span>
</div>
</el-col>
</el-row>
</template>
<vi-title title="评议内容"></vi-title>
<el-form-item label="" label-width="0" v-for="o,idx in formData.nrs" :key="nr.id">
<el-form-item label="" label-width="0" v-for="o,idx in formData.nrs" :key="o.id">
<el-row type="flex" align="middle" justify="space-between">
<el-input v-model="o.content" readonly maxlength="30" style="width: 50%">
@@ -116,13 +154,12 @@ layout("/layouts/platform.html"){
</el-row>
<el-row style="margin-top: 20px">
<el-table :data="o.bzs" style="width: 100%" border show-summary
:summary-method="getSummaries">
<el-table :data="o.bzs" style="width: 100%" border :show-summary = "formData.scoringMode !== 2 ? 'always' : false">
<el-table-column align="center" header-align="center" label="序号" type="index"
width="100px">
</el-table-column>
<el-table-column label="考核标准" disabled prop="inspection" header-align="center"
<el-table-column label="主要评比内容" disabled prop="inspection" header-align="center"
align="center">
<template scope="{row}">
<el-input v-model="row.inspection"
@@ -134,7 +171,7 @@ layout("/layouts/platform.html"){
<el-table-column label="标准分" prop="score" header-align="center" align="center"
width="250px">
<template scope="{row}">
<el-input v-model.number="row.resultScore" readonly></el-input>
<el-input v-model.number="row.score" readonly></el-input>
</template>
</el-table-column>
<el-table-column label="评议分" prop="resultScore" header-align="center"
@@ -148,7 +185,7 @@ layout("/layouts/platform.html"){
<template v-if="formData.scoringMode===2">
<el-table-column label="满意度" prop="resultScore" header-align="center"
align="center" width="250px">
align="center" width="350px">
<template slot-scope="{row}">
<el-radio-group v-model="row.resultScore" size="small">
<el-radio label="满意">满意</el-radio>
@@ -160,25 +197,28 @@ layout("/layouts/platform.html"){
</template>
</el-table>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<div v-if="formData.scoringMode===1">
<el-divider content-position="left">备注填写</el-divider>
<el-row>
<el-col :span="24">
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit
v-model="o.remark" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
</el-form-item>
<template v-if="formData.scoringMode===2">
<el-form-item label="备注">
<vi-title title="备注填写"></vi-title>
<el-form-item prop="options" label-width="0px">
<el-input type="textarea" :rows="2" maxlength="300" show-word-limit
v-model="presidentOpinions" placeholder="请输入备注"></el-input>
</el-form-item>
</template>
<template v-if="formData.reviewMode===1">
<el-form-item label="职工评家总结" prop="files">
<template v-if="formData.reviewMode===1 && formData.scoringMode===1">
<vi-title title="职工评家总结"></vi-title>
<el-form-item prop="files" label-width="0px">
<file-upload :files.sync="formData.files" card :max="3"
:type="['doc','docx','xls','xlsx','pdf', 'jpg', 'png', 'jpeg']">
<template #el-upload__tip>
@@ -197,6 +237,11 @@ layout("/layouts/platform.html"){
<template #view>
<union-comment-zb :data="viewData" :is_view="true"></union-comment-zb>
</template>
<template #public>
<wakes-home-review ref="wakesHomeReview"></wakes-home-review>
</template>
</guava>
</div>
<script>
@@ -229,22 +274,32 @@ layout("/layouts/platform.html"){
}
},
presidentOpinions:'',
id:'',
presidentOpinions: '',
isShowSubmit: true,
isReadOnly: true
isReadOnly: true,
userList: [],
}
},
components: {
'union-comment-zb': httpVueLoader('/components/wakeshome/review/UnionCommentZb.vue?v=' + moment(new Date()).unix()),
'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
},
methods: {
async openReview(row){
const resp = await $.get(loc() + "/getPeoId",{id:row.id})
if (resp.code === 0) {
this.$refs.guava.public()
this.$refs.wakesHomeReview.findOne(resp.data)
}
},
changeScore(row) {
if (Number(row.score) < Number(row.resultScore)) {
row.resultScore = null;
this.$message.warning('评议分不能超过标准分');
}
},
async doReview(o){
async doReview(o) {
//自评模式
if (o.reviewMode == 1 && !o.canJoin) {
this.$message.warning('您不在自评人员范围中');
@@ -263,8 +318,9 @@ layout("/layouts/platform.html"){
return
}
const resp = await $.get('/mobile/wakeshome/review/appraisal/getById',{id:o.id})
const resp = await $.get('/mobile/wakeshome/review/appraisal/getById', {id: o.id})
if (resp.code === 0) {
this.id = o.id
this.formData = resp.data
if (this.formData.assessmentMode === 2) {
this.formData.nrs.forEach(v => {
@@ -274,18 +330,18 @@ layout("/layouts/platform.html"){
})
await this.getPresidents()
}
this.$refs.guava.edit()
}
},
async getPresidents(){
async getPresidents() {
const resp = await $.get('/mobile/wakeshome/review/appraisal/getPresidents')
if (resp.code === 0) {
this.userList = resp.data
this.userList.forEach(v => {
this.presidentList.push({value: v.id, text: v.presidents})
})
}
this.president = this.presidentList[0].value
await this.presidentChange();
if (this.userList && this.userList.length > 0) {
this.president = this.userList[0].id
await this.presidentChange();
}
},
async presidentChange() {
const resp = await $.get('/mobile/wakeshome/review/appraisal/isAssess', {
@@ -307,6 +363,81 @@ layout("/layouts/platform.html"){
}
this.loading = false;
},
async assignment(){
const self = this;
const bzList = [];
this.formData.nrs.forEach(v => {
v.bzs.forEach(o => {
if (self.formData.assessmentMode === 1 && v.remark){
o.options = v.remark
}
bzList.push(o)
})
})
this.formData.bzList = bzList
this.formData.id = this.id
this.formData.president = this.president
this.formData.files = JSON.stringify(this.formData.files)
},
async doSubmit(){
const validate = await this.$refs.form.validate()
if (!validate) {
return
}
this.$confirm('确定要提交该测评结果吗？提交后不可修改,请仔细检查后提交', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
await this.assignment()
if (!this.formData.reviewResult) {
await this.createdReviewResult()
}
const resp = await $.post('/mobile/wakeshome/review/appraisal/doSubmit',this.formData)
if (resp.code === 0) {
this.$message.success('提交成功')
this.$refs.guava.index()
this.formData = {}
this.pageData()
}
})
},
async createdReviewResult(){
if (this.formData.assessmentMode === 1) {
let source = 0; // 标准分
let resultScore = 0; // 评议分
this.formData.bzList.forEach(v => {
source += Number(v.source)
resultScore += Number(v.resultScore)
})
const result = (resultScore / source) * 100
if (result >= 80) {
this.formData.reviewResult = '满意'
} else if (result >= 60 && result <= 79) {
this.formData.reviewResult = '基本满意'
} else {
this.formData.reviewResult = '不满意'
}
} else if (this.formData.assessmentMode === 2) {
const result = this.formData.bzList.filter(v => v.resultScore === '满意' || v.resultScore === '基本满意')
const satisfactionPercentage = (result.length / this.formData.bzList.length) * 100;
if (satisfactionPercentage >= 80) {
this.formData.reviewResult = '满意'
} else if (satisfactionPercentage >= 60 && satisfactionPercentage <= 79) {
this.formData.reviewResult = '基本满意'
} else {
this.formData.reviewResult = '不满意'
}
const user = this.userList.find(v=> v.id === this.president)
this.formData.evaluatedPersonName = user.username
this.formData.evaluatedPersonType = user.evaluatedPersonType
}
this.formData.bzList = JSON.stringify(this.formData.bzList)
},
},
async created() {
this.pageData();
src/main/resources/views/platform/wakeshome/review/statistics.html
+13 -103
View File
@@ -183,108 +183,13 @@ layout("/layouts/platform.html"){
:total="userPageForm.totalCount">
</el-pagination>
</el-row>
</el-card>
</template>
</guava>
<el-drawer
title=""
size="60%"
:visible.sync="userDrawer"
direction="rtl">
<el-form class="el_form" label-width="120px">
<el-row gutter="20">
<el-col :span="12" v-if="zpxx.zbxx.assessmentMode===2">
<el-form-item prop="evaluatedPersonName" label="被测评人姓名">
{{zpxx.commentPeo.evaluatedPersonName}}
</el-form-item>
</el-col>
<el-col :span="12" v-if="zpxx.zbxx.assessmentMode===2">
<el-form-item prop="evaluatedPersonName" label="现任职务">
{{zpxx.commentPeo.evaluatedPersonName}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="evaluatedPersonName" label="测评结果">
{{zpxx.commentPeo.reviewResult}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="zpxx.zbxx.assessmentMode===2">
<el-form-item prop="presidentOpinions" label="意见建议">
{{zpxx.commentPeo.presidentOpinions}}
</el-form-item>
</el-col>
</el-row>
<vi-title2 title="测评内容"></vi-title2>
<el-form-item label="" label-width="0" v-for="(nr,idx) in zpxx.zbxx.nrs">
<el-row type="flex" align="middle" justify="space-between">
<el-input v-model="nr.content" disabled maxlength="30"
style="width: 50%"
placeholder="请填写测评内容">
<template slot="prepend">
<span v-model="nr.contentNumber">{{ nr.contentNumber = idx + 1 }}</span>
</template>
</el-input>
</el-row>
<el-row style="margin-top: 20px">
<el-table :data="nr.bzs" style="width: 100%" border
size="small">
<el-table-column align="center" header-align="center" label="序号"
type="index"
width="100px">
<template scope="{$index,row}">
{{ row.contentNumber = $index + 1 }}
</template>
</el-table-column>
<el-table-column label="测评标准" prop="inspection" header-align="center"
align="center">
</el-table-column>
<el-table-column label="标准分" prop="score" header-align="center"
align="center"
width="100px" v-if="zpxx.zbxx.scoringMode===1">
</el-table-column>
<el-table-column label="评分" prop="resultScore" header-align="center"
align="center"
width="100px">
</el-table-column>
<el-table-column label="意见建议" prop="options" header-align="center"
align="center"
width="100px" v-if="zpxx.zbxx.scoringMode===1">
</el-table-column>
</el-table>
</el-row>
<el-row class="mt10 mb10"
style="border-top: 1px dashed rgb(229, 225, 225)"></el-row>
</el-form-item>
</el-form>
</el-drawer>
<el-dialog title="评议结果" :visible.sync="userDrawer" close-on-press-escape>
<wakes-home-review ref="wakesHomeReview"></wakes-home-review>
</el-dialog>
</div>
@@ -338,7 +243,9 @@ layout("/layouts/platform.html"){
reviewResultData: {}
}
},
components: {},
components: {
'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
},
methods: {
async getReviewResultNum(row) {
const res = await $.post(loc() + "/getReviewResultNum", {
@@ -348,9 +255,12 @@ layout("/layouts/platform.html"){
this.reviewResultData = res.data
},
async openUserView(row) {
const res = await $.post(loc() + "/getBzById", {peoId: row.id})
this.zpxx = res.data
// const res = await $.post(loc() + "/getBzById", {peoId: row.id})
// this.zpxx = res.data
this.userDrawer = true
this.$nextTick(() => {
this.$refs.wakesHomeReview.findOne(row.id)
})
},
doUserSearch() {
this.tableKey = new Date().getTime()
@@ -371,7 +281,7 @@ layout("/layouts/platform.html"){
$.post(loc() + "/getUserPeoByZbIdOrUnionId", this.userPageForm, (data) => {
sublime.closeLoadingbar();
this.tableLoading = false
if (data.code == 0) {
if (data.code === 0) {
this.userTableData = data.data.list;
this.userPageForm.totalCount = data.data.totalCount;
} else {
@@ -389,7 +299,7 @@ layout("/layouts/platform.html"){
},
async getZbList() {
const res = await $.get("/platform/unionComment/Xjkhzb/getZbList", {year: this.pageForm.annual})
const res = await $.get("/platform/wakeshome/review/Xjkhzb/getZbList", {year: this.pageForm.annual})
this.zbList = res.data
if (res.data && res.data.length > 0) {
this.$set(this.pageForm, "zbId", res.data[0].id)