From de76f1bb12b8ec36a98f76873db80622a96d5de3 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 18 Dec 2020 10:53:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 22 ++++++++----------- .../flow/model/ResultRecordDetailDto.java | 1 + 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 8d0350c9..af601164 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -468,7 +468,7 @@ public class ResultRecordController extends AbstractController { List flowChartDetailRecords = flowChartDetailRecordService.selectFlowChartDetailRecordsByFlowProcess(resultRecord.getEvaluationId(), ChartFlowType.SCORE.getCode());//获取参与评分的人 - //List flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode()); + List flowRecords1 = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode()); List staffs = new ArrayList<>(); Boolean isAllScore = true;//false表示返回所有的评分，true表示值返回评分了的人 Boolean isOrScore = false;//是否为或签 @@ -987,8 +987,8 @@ public class ResultRecordController extends AbstractController { } resultRecordService.updateResultRecordById(resultRecord); - - if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ + String commentId = null; + if(dto.getSave() == null && editResultDetails.size() > 0){//非暂存 //修改评论信息 log.info("修改了多少个指标{}", editResultDetails.size()); editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; @@ -1058,17 +1058,13 @@ public class ResultRecordController extends AbstractController { } if(commandValue.length() > 0){ log.info("需要写入评论，具体呢容为{}", commandValue); - ResultComment resultComment = resultCommentService.selectResultCommentById(dto.getCommentId()); + ResultComment resultComment = new ResultComment();//resultCommentService.selectResultCommentById(dto.getCommentId()); log.info("resultComment的值{}", resultComment); - if(resultComment.getOptDesc().indexOf("制定了目标") >= 0){ - resultComment.setOptDesc("修改了目标"); - resultComment.setComment(commandValue); - }else{ - resultComment.setOptDesc("修改了目标-" + resultComment.getOptDesc()); + resultComment.setOptDesc("修改了目标"); + resultComment.setComment(commandValue); - resultComment.setComment((resultComment.getComment() == null ? "" : (resultComment.getComment() + "\n")) + commandValue); - } - resultCommentService.updateResultCommentById(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue); + resultCommentService.insertResultComment(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue); + commentId = resultComment.getId().toString(); } } }else{ @@ -1084,7 +1080,7 @@ public class ResultRecordController extends AbstractController { resultDetailService.updateBatchById(editResultDetails); } - return R.ok(); + return R.ok().put("commentId", commentId); } /** diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 855e101d..4138331b 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -101,6 +101,7 @@ public class ResultRecordDetailDto { @ApiModelProperty(value = "职位", name = "position") private String position; + /** * * @return From f213f7cf35d404f779b9d6722a6c1c36e7d743a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 18 Dec 2020 10:54:11 +0800 Subject: [PATCH 2/3] fix --- .../performance/controller/ResultTaskController.java | 9 +++++++++ .../performance/service/impl/ResultTaskServiceImpl.java | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index e8eb4703..8de590a7 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -1,7 +1,10 @@ package com.lz.modules.performance.controller; +import com.lz.common.utils.BigDecimalUtil; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.performance.dao.ResultTaskMapper; +import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.req.ChangeTaskListReq; @@ -15,9 +18,12 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @Author: djc * @Desc: @@ -34,6 +40,8 @@ public class ResultTaskController extends AbstractController{ @Autowired private TaskProcessRecordService taskProcessRecordService; + @Autowired + private ResultTaskMapper resultTaskMapper; @GetMapping("/result/taskDetail") @ApiOperation("获取绩效任务详情") @@ -71,4 +79,5 @@ public class ResultTaskController extends AbstractController{ Long userId = getUserId(); return resultTaskService.deleteTask(taskId,userId); } + } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 27fccbc4..73ddd99d 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -202,9 +202,18 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Fri, 18 Dec 2020 11:00:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=9E=E6=9C=AC=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=8A=9B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index af601164..0e8720ee 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.lz.common.emun.ChartFlowType; import com.lz.common.emun.WorkMsgTypeEnum; +import com.lz.common.exception.RRException; import com.lz.common.utils.*; import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.dto.DepartmentsDto; @@ -937,7 +938,10 @@ public class ResultRecordController extends AbstractController { taskReq.setName(taskDto.getName()); taskReq.setOrderBy(orderBy); taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate())); - resultTaskService.saveOrUpdateResultTask(taskReq,userId); + R r = resultTaskService.saveOrUpdateResultTask(taskReq,userId); + if((int)r.get("code") != 200){ + throw new RRException((String)r.get("msg")); + } orderBy++; }