提交修改

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;
@@ -468,7 +469,7 @@ public class ResultRecordController extends AbstractController {
         List<FlowChartDetailRecord> flowChartDetailRecords =
                 flowChartDetailRecordService.selectFlowChartDetailRecordsByFlowProcess(resultRecord.getEvaluationId(), ChartFlowType.SCORE.getCode());//获取参与评分的人
 
-        //List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());
+        List<FlowRecord> flowRecords1 = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());
         List<StaffEntity> staffs = new ArrayList<>();
         Boolean isAllScore = true;//false表示返回所有的评分，true表示值返回评分了的人
         Boolean isOrScore = false;//是否为或签
@@ -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++;
                             }
 
@@ -987,8 +991,8 @@ public class ResultRecordController extends AbstractController {
         }
 
         resultRecordService.updateResultRecordById(resultRecord);
-
+        String commentId = null;
-        if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){
+        if(dto.getSave() == null && editResultDetails.size() > 0){//非暂存
             //修改评论信息
             log.info("修改了多少个指标{}", editResultDetails.size());
             editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ;
@@ -1058,17 +1062,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.setOptDesc("修改了目标");
+                        resultComment.setComment(commandValue);
-                            resultComment.setComment(commandValue);
-                        }else{
-                            resultComment.setOptDesc("修改了目标-" + resultComment.getOptDesc());
 
-                            resultComment.setComment((resultComment.getComment() == null ? "" : (resultComment.getComment() + "\n")) + commandValue);
+                        resultCommentService.insertResultComment(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue);
-                        }
+                        commentId = resultComment.getId().toString();
-                        resultCommentService.updateResultCommentById(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue);
                     }
                 }
             }else{
@@ -1084,7 +1084,7 @@ public class ResultRecordController extends AbstractController {
             resultDetailService.updateBatchById(editResultDetails);
         }
 
-        return R.ok();
+        return R.ok().put("commentId", commentId);
     }
 
     /**

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

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);
     }
+
 }

src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java

@@ -202,9 +202,18 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		}
 		int size = resultTaskDtos.size();
 		Double rate = 0d;
+		int cout = 0;
 		for(ResultTaskDto dto:resultTaskDtos){
+			if(1 == dto.getProcessRate()){
+				cout++;
+				continue;
+			}
 			rate = BigDecimalUtil.add(rate,dto.getProcessRate());
 		}
+		size = size - cout;
+		if(size < 1){
+			return 1d;
+		}
 		double result = BigDecimalUtil.div(rate, size, 4);
 		return result;