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 537073b..df157ab 100644 Binary files a/src/main/resources/docTemplate/WakesHome.docx and b/src/main/resources/docTemplate/WakesHome.docx differ 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"){ - - -