From 42bf0ea0e53fdd835ef5648c2e7206432a79f723 Mon Sep 17 00:00:00 2001 From: Paidax Date: Mon, 23 Sep 2024 14:15:43 +0800 Subject: [PATCH] commit --- .../java/io/v/nutz/base/utils/MsgApi.java | 4 +- .../review/StatisticsZpController.java | 7 +-- .../impl/review/CommentPeoServiceImpl.java | 2 +- src/main/resources/docTemplate/WakesHome.docx | Bin 11811 -> 11823 bytes .../static/assets/platform/css/elmain.css | 4 +- .../wakeshome/review/ReviewResult.vue | 13 ++--- .../wakeshome/review/UnionCommentZb.vue | 8 +-- .../mobile/wakeshome/review/commentator.html | 30 +++++++---- .../platform/wakeshome/review/doReview.html | 36 +++++++++---- .../views/platform/wakeshome/review/khzb.html | 15 ++++-- .../platform/wakeshome/review/statistics.html | 43 +++++++-------- .../views/platform/zgfw/lxy/HdMange.html | 50 +++++++++--------- 12 files changed, 126 insertions(+), 86 deletions(-) diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 37890a8..5087e3d 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -70,7 +70,7 @@ public class MsgApi { * @param receivers 接收人工号/手机号 */ public void sendMsg(String msgContent, List receivers) { - Assert.notBlank(msgContent); + /*Assert.notBlank(msgContent); Assert.notEmpty(receivers); List> tousers = receivers.stream().map(v -> Map.of("touser", v)).collect(Collectors.toList()); @@ -101,7 +101,7 @@ public class MsgApi { } else { log.error("短信发送失败,发送内容" + Json.toJson(bodyMap)); throw new RuntimeException("短信发送失败"); - } + }*/ } /** diff --git a/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java b/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java index 5f8a098..d83273e 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/review/StatisticsZpController.java @@ -162,9 +162,10 @@ public class StatisticsZpController { @Param(value = "unionId", required = false) String unionId) { NutMap mapList = commentPeoService.fetch(Sqls.create(""" SELECT - SUM( CASE WHEN cp.reviewResult = '不满意' THEN 1 ELSE 0 END ) AS bmy, - SUM( CASE WHEN cp.reviewResult = '基本满意' THEN 1 ELSE 0 END ) AS jbmy, - SUM( CASE WHEN cp.reviewResult = '满意' THEN 1 ELSE 0 END ) AS my + SUM( CASE WHEN cp.reviewResult = '非常满意' THEN 1 ELSE 0 END ) AS fcmy, + SUM( CASE WHEN cp.reviewResult = '满意' THEN 1 ELSE 0 END ) AS my, + SUM( CASE WHEN cp.reviewResult = '良好' THEN 1 ELSE 0 END ) AS lh, + SUM( CASE WHEN cp.reviewResult = '一般' THEN 1 ELSE 0 END ) AS yb FROM comment_peo cp LEFT JOIN `user` u ON u.id = cp.userId diff --git a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentPeoServiceImpl.java b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentPeoServiceImpl.java index 226852b..060f112 100644 --- a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentPeoServiceImpl.java +++ b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentPeoServiceImpl.java @@ -51,7 +51,7 @@ public class CommentPeoServiceImpl extends ViServiceImpl implements //赋值测评结果 CommentResult result = commentResultMap.get(o.getId()); if (Lang.isNotEmpty(result)){ - o.setOptions(StrUtil.isNotBlank(result.getRecommendation()) ? result.getRecommendation() : "未填写备注"); + o.setOptions(StrUtil.isNotBlank(result.getRecommendation()) ? result.getRecommendation() : "未填写此项"); o.setResultScore(result.getAssessResult()); } }); diff --git a/src/main/resources/docTemplate/WakesHome.docx b/src/main/resources/docTemplate/WakesHome.docx index 537073bcb2dca100b78500b16ba99bbb60a17751..df157abeb9b641940cc3b9af111fed19965d3849 100644 GIT binary patch delta 3993 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 diff --git a/src/main/resources/static/assets/platform/css/elmain.css b/src/main/resources/static/assets/platform/css/elmain.css index c40c20c..2f5fd01 100644 --- a/src/main/resources/static/assets/platform/css/elmain.css +++ b/src/main/resources/static/assets/platform/css/elmain.css @@ -105,7 +105,7 @@ a .expanded { } .el-table__body-wrapper { - scrollbar-width: none; /* firefox */ + /*scrollbar-width: none; !* firefox *!*/ -ms-overflow-style: none; /* IE 10+ */ overflow-x: hidden; overflow-y: auto; @@ -135,4 +135,4 @@ a .expanded { height: 40px; line-height: 40px; /*display: none !important;*/ -} \ No newline at end of file +} diff --git a/src/main/resources/static/components/wakeshome/review/ReviewResult.vue b/src/main/resources/static/components/wakeshome/review/ReviewResult.vue index 4d66c39..815f74d 100644 --- a/src/main/resources/static/components/wakeshome/review/ReviewResult.vue +++ b/src/main/resources/static/components/wakeshome/review/ReviewResult.vue @@ -52,9 +52,10 @@ @@ -63,20 +64,20 @@
- 备注 + 简述工作情况 + v-model="nr.bzs[0].options" placeholder="请简述工作情况">
--> - - + --> diff --git a/src/main/resources/views/mobile/wakeshome/review/commentator.html b/src/main/resources/views/mobile/wakeshome/review/commentator.html index fecd31f..51c2edc 100644 --- a/src/main/resources/views/mobile/wakeshome/review/commentator.html +++ b/src/main/resources/views/mobile/wakeshome/review/commentator.html @@ -327,12 +327,14 @@ layout("/mobile/platform.html"){ }) const result = (resultScore / source) * 100 - if (result >= 80) { + if (result > 95) { + this.reviewResult = '非常满意' + } else if (result > 80 && result <= 94) { this.reviewResult = '满意' - } else if (result >= 60 && result <= 79) { - this.reviewResult = '基本满意' + } else if (result > 60 && result <= 79) { + this.reviewResult = '良好' } else { - this.reviewResult = '不满意' + this.reviewResult = '一般' } /*this.bzList.forEach(v => { @@ -345,8 +347,6 @@ layout("/mobile/platform.html"){ } else { this.reviewResult = '不满意' }*/ - console.log(source) - console.log(resultScore) console.log(this.reviewResult) vant.Dialog.alert({ title: '测评结果', @@ -354,14 +354,26 @@ layout("/mobile/platform.html"){ confirmButtonColor: '#1867b0' }) } else if (this.commentatorData.assessmentMode === 2) { - const result = this.bzList.filter(v => v.resultScore === '满意' || v.resultScore === '基本满意') - if (result.length >= 8) { + const result = this.bzList.filter(v => v.resultScore === '满意') + const satisfactionPercentage = (result.length / this.bzList.length) * 100; + + if (satisfactionPercentage > 95) { + this.reviewResult = '非常满意' + } else if (satisfactionPercentage > 80 && satisfactionPercentage <= 94) { + this.reviewResult = '满意' + } else if (satisfactionPercentage > 60 && satisfactionPercentage <= 79) { + this.reviewResult = '良好' + } else { + this.reviewResult = '一般' + } + + /*if (result.length >= 8) { this.reviewResult = '满意' } else if (result.length >= 6 && result.length <= 7) { this.reviewResult = '基本满意' } else { this.reviewResult = '不满意' - } + }*/ console.log(result) console.log(this.reviewResult) vant.Dialog.alert({ diff --git a/src/main/resources/views/platform/wakeshome/review/doReview.html b/src/main/resources/views/platform/wakeshome/review/doReview.html index 210e5c8..4941b6f 100644 --- a/src/main/resources/views/platform/wakeshome/review/doReview.html +++ b/src/main/resources/views/platform/wakeshome/review/doReview.html @@ -200,21 +200,21 @@ layout("/layouts/platform.html"){
- 备注填写 + 简述工作情况 + v-model="o.remark" placeholder="请简述工作情况">
@@ -408,7 +408,6 @@ layout("/layouts/platform.html"){ this.$message.warning(resp.msg) } }) - }, async createdReviewResult(){ if (this.formData.assessmentMode === 1) { @@ -419,24 +418,43 @@ layout("/layouts/platform.html"){ resultScore += Number(v.resultScore) }) const result = (resultScore / source) * 100 - if (result >= 80) { + + if (result > 95) { + this.formData.reviewResult = '非常满意' + } else if (result > 80 && result <= 94) { + this.formData.reviewResult = '满意' + } else if (result > 60 && result <= 79) { + this.formData.reviewResult = '良好' + } else { + this.formData.reviewResult = '一般' + } + /*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) { + if (satisfactionPercentage > 95) { + this.formData.reviewResult = '非常满意' + } else if (satisfactionPercentage > 80 && satisfactionPercentage <= 94) { + this.formData.reviewResult = '满意' + } else if (satisfactionPercentage > 60 && satisfactionPercentage <= 79) { + this.formData.reviewResult = '良好' + } else { + this.formData.reviewResult = '一般' + } + /*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 diff --git a/src/main/resources/views/platform/wakeshome/review/khzb.html b/src/main/resources/views/platform/wakeshome/review/khzb.html index 5294974..1e99c1c 100644 --- a/src/main/resources/views/platform/wakeshome/review/khzb.html +++ b/src/main/resources/views/platform/wakeshome/review/khzb.html @@ -103,7 +103,9 @@ layout("/layouts/platform.html"){ loading: true, activeName: '1', tableData: [], - formData: {}, + formData: { + applyTime: [] + }, viewData: { nrs: [{ bzs: [{}] @@ -131,8 +133,9 @@ layout("/layouts/platform.html"){ const {code, data, msg} = await $.get(loc() + '/edit', {id}) if (code === 0) { this.formData = data - if (this.formData.startTime && this.formData.endTime) { - this.formData.applyTime = [this.formData.startTime, this.formData.endTime] + if (data.startTime && data.endTime) { + this.$set(this.formData, 'applyTime', [data.startTime, data.endTime]) + // this.formData.applyTime = [this.formData.startTime, this.formData.endTime] } this.$refs.guava.edit() } @@ -189,8 +192,12 @@ layout("/layouts/platform.html"){ this.$refs.guava.view() this.loading = true; const {code, data, msg} = await $.get(loc() + '/edit', {id}) - if (code == 0) { + if (code === 0) { this.viewData = data + if (data.startTime && data.endTime) { + this.$set(this.viewData, 'applyTime', [data.startTime, data.endTime]) + // this.formData.applyTime = [this.formData.startTime, this.formData.endTime] + } } this.loading = false; }, diff --git a/src/main/resources/views/platform/wakeshome/review/statistics.html b/src/main/resources/views/platform/wakeshome/review/statistics.html index c7f62b3..814df94 100644 --- a/src/main/resources/views/platform/wakeshome/review/statistics.html +++ b/src/main/resources/views/platform/wakeshome/review/statistics.html @@ -98,7 +98,7 @@ layout("/layouts/platform.html"){ - 导出 @@ -119,24 +119,27 @@ layout("/layouts/platform.html"){ -
+
全部 - {{reviewResultData.bmy+reviewResultData.jbmy+reviewResultData.my}} + {{reviewResultData.fcmy + reviewResultData.my + reviewResultData.lh + reviewResultData.yb}} + 非常满意 + {{reviewResultData.fcmy || 0}} + 满意 {{reviewResultData.my || 0}} - 基本满意 - {{reviewResultData.jbmy || 0}} + 良好 + {{reviewResultData.lh || 0}} - 不满意 - {{reviewResultData.bmy || 0}} + 一般 + {{reviewResultData.yb || 0}}
@@ -174,9 +177,8 @@ layout("/layouts/platform.html"){ label="操作" width="240px" fixed="right"> @@ -337,26 +339,25 @@ layout("/layouts/platform.html"){ downloadByPeoId(row) { window.open(loc() + '/exportByPeoId?peoId=' + row.id) }, - downloadFilesByPeoId(row) { + async downloadFilesByPeoId(row) { const result = this.validateHasFiles({peoId: row.id}) if (!result) { return } window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id) }, - validateHasFiles(data) { - $.post('/platform/wakeshome/review/statistics/validateHasFiles', { + async validateHasFiles(data) { + const res = await $.post('/platform/wakeshome/review/statistics/validateHasFiles', { peoId: data.peoId ? data.peoId : '', zbId: data.zbId ? data.zbId : '', unionId: data.unionId ? data.unionId : '' - }).then(res => { - if (res.code === 0) { - return true - } else { - this.$message.warning("未上传附件，无法导出") - return false - } }) + if (res.code === 0) { + return true + } else { + this.$message.warning("未上传附件，无法导出") + return false + } }, async getReviewResultNum(row) { const res = await $.post(loc() + "/getReviewResultNum", { @@ -422,7 +423,7 @@ layout("/layouts/platform.html"){ computed: { canDownload() { const data = this.zbList.find(v => v.id === this.pageForm.zbId) - return data.commentTarget === 3 && data.unionIds && data.unionIds.length > 0 + return data.scoringMode == 1 } }, async created() { diff --git a/src/main/resources/views/platform/zgfw/lxy/HdMange.html b/src/main/resources/views/platform/zgfw/lxy/HdMange.html index 01b9876..ecad61a 100644 --- a/src/main/resources/views/platform/zgfw/lxy/HdMange.html +++ b/src/main/resources/views/platform/zgfw/lxy/HdMange.html @@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
- 创建活动 + 创建休养
@@ -97,7 +97,7 @@ layout("/layouts/platform.html"){ - - -