Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

src/main/java/com/lz/modules/app/controller/StaffRoleController.java

@@ -269,6 +269,9 @@ public class StaffRoleController extends AbstractController {
     //http://localhost:8080/lz_management/user/lzstaffrole/comment/list?detailId=4917&pageSize=2
     @RequestMapping("/comment/list")
     public R commentList(TaskModel taskModel) {
+        if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){
+            taskModel.setStaffId(getUserId());
+        }
         return staffRoleService.commentList(taskModel);
     }
 

src/main/java/com/lz/modules/app/controller/TestController.java

@@ -307,7 +307,7 @@ public class TestController {
     }
 
 
-    // 重置：http://localhost:8080/lz_management/test/approval?resultRecordId=3682&status=9&menuName=cccc&flowRecordId=33919&resetFlag=0
+    // 重置：http://localhost:8080/lz_management/test/approval?resultRecordId=3702&status=9&menuName=cccc&flowRecordId=33987&resetFlag=0
     @RequestMapping("/test/approval")
     public R approval(ApprovalDto approvalDto) {
         try {

src/main/java/com/lz/modules/app/dto/TaskCommentDto.java

@@ -5,4 +5,5 @@ import lombok.Data;
 
 @Data
 public class TaskCommentDto extends TaskComment {
+    private int isSelf;
 }

src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java

@@ -655,6 +655,9 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         for (TaskComment taskComment : taskComments) {
             TaskCommentDto taskCommentDto = new TaskCommentDto();
             BeanUtils.copyProperties(taskComment, taskCommentDto);
+            if(taskComment.getStaffId().equals(taskModel.getStaffId())){
+                taskCommentDto.setIsSelf(1);
+            }
             taskCommentDtoList.add(taskCommentDto);
         }
         pageUtils.setList(taskCommentDtoList);

src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java

@@ -38,4 +38,6 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
 
 
     int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);
+
+	TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId);
 }

src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java

@@ -28,4 +28,13 @@ public class ResultTaskDetailRes {
     //任务列表
     @ApiModelProperty(value = "集体进度", name = "resultTasks")
     private List<ResultTaskDto> resultTasks;
+    //头像
+    @ApiModelProperty(value = "头像", name = "avatar")
+    private String avatar;
+    //姓名
+    @ApiModelProperty(value = "姓名", name = "staffName")
+    private String staffName;
+    //标签
+    @ApiModelProperty(value = "标签", name = "label")
+    private String label;
 }

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

@@ -2,8 +2,12 @@ package com.lz.modules.performance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.common.utils.BigDecimalUtil;
+import com.lz.modules.app.entity.StaffEntity;
+import com.lz.modules.app.service.StaffService;
 import com.lz.modules.performance.dao.ResultTaskMapper;
+import com.lz.modules.performance.dao.TaskProcessRecordMapper;
 import com.lz.modules.performance.dto.ResultTaskDto;
+import com.lz.modules.performance.dto.TaskProcessRecordDto;
 import com.lz.modules.performance.entity.ResultTask;
 import com.lz.modules.performance.entity.TaskProcessRecord;
 import com.lz.modules.performance.enums.ProcessRecordEnum;
@@ -47,6 +51,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 	private TaskCommentService taskCommentService;
     @Autowired
 	private TaskProcessRecordService taskProcessRecordService;
+    @Autowired
+	private TaskProcessRecordMapper taskProcessRecordMapper;
+    @Autowired
+	private StaffService staffService;
 
 
 
@@ -90,9 +98,22 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		Optional.ofNullable(resultDetail).ifPresent(resultDetail1 -> {
             res.setProcessRate(resultDetail1.getProcessRate());
             res.setTarget(resultDetail1.getTarget());
-        });
+			Long staffId = resultDetail.getStaffId();
+			StaffEntity staffEntity = staffService.selectStaffById(staffId);
+			res.setAvatar(staffEntity.getAvatar());
+		});
 		List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
 		res.setResultTasks(resultTasks);
+		//获取最近更新记录
+		if(CollectionUtils.isNotEmpty(resultTasks)){
+			ResultTaskDto dto = resultTasks.get(resultTasks.size() - 1);
+			TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(dto.getId());
+			if(taskProcessRecordDto != null){
+				res.setStaffName(taskProcessRecordDto.getStaffName());
+				res.setLabel(taskProcessRecordDto.getLabel());
+			}
+
+		}
 		return res;
 	}
 

src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java

@@ -942,16 +942,19 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     private R resetNode(ApprovalDto approvalDto) {
         FlowRecord f = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
         List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(),f.getFlowIndex());
+        boolean flag = false ;
         for(FlowRecord flowRecord:flowRecords){
             // 如果结果录入己经走了
             if (new Integer(2).equals(flowRecord.getFlowProcess()) && (flowRecord.getStatus() == 1 || flowRecord.getStatus() == 4) ) {
                 flowRecord.setStatus(4);        //表示流程己经被重置
+                flag = true;
             }else{
                 flowRecord.setStatus(0);        //表示流程己经被重置
             }
             flowRecordService.updateFlowRecordById(flowRecord);
         }
-        FlowRecord preFlowRecord = flowRecordService.selectPreFlowRecordByRecordIdMinIdStatusList(f.getRecordId(), f.getFlowIndex() - 1, Arrays.asList(1, 2));
+
+        FlowRecord preFlowRecord = flowRecordService.selectPreFlowRecordByRecordIdMinIdStatusList(f.getRecordId(), f.getFlowIndex(), Arrays.asList(1, 2,4));
         List<FlowRecord> runing = new ArrayList<>();
         if (preFlowRecord != null) {
             runing = flowRecordService.selectFlowRecordByRecordIdFlowIndex(f.getRecordId(), preFlowRecord.getFlowIndex());
@@ -962,6 +965,17 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             r.setStatus(2);
             flowRecordService.updateFlowRecordById(r);
         }
+
+        if(flag) {  //如果录入己经走了，设置新的数据，结果录入己走
+            List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId());
+            for(int i = 0 ;i < newflowRecords.size() ; i ++){
+                FlowRecord newFlowRecord = newflowRecords.get(i) ;
+                if (new Integer(2).equals(newFlowRecord.getFlowProcess()) ) {
+                    newFlowRecord.setStatus(4);
+                    flowRecordService.updateFlowRecordById(newFlowRecord);
+                }
+            }
+        }
         return R.ok();
     }
 
@@ -1444,6 +1458,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         int flowIndex = 0;
         List<ResetDataResp> resetDataResps = new ArrayList<>();
         for (FlowRecord flowRecord : flowRecords) {
+            if(new Integer(2).equals(flowRecord.getFlowProcess())){ //过虑掉flowProcess
+                continue;
+            }
             if (flowRecord.getFlowIndex().equals(flowIndex - 1)) { //表示有重复数据
                 ResetDataResp resetDataResp = resetDataResps.get(flowIndex - 1);
                 resetDataResp.getStaffNames().add(flowRecord.getApprovalStaffName());

src/main/resources/mapper/flow/FlowRecordMapper.xml

@@ -327,7 +327,7 @@
     </select>
 
     <select id="selectFlowRecordByRecordIdGeFlowIndex" resultType="com.lz.modules.flow.entity.FlowRecord">
-        select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId} and flow_index >= #{flowIndex}
+        select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId} and flow_index > #{flowIndex}
     </select>
 
 
@@ -335,9 +335,10 @@
         select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId} and flow_index <![CDATA[<=]]> #{flowIndex}
     </select>
 
+
     <select id="selectPreFlowRecordByRecordIdMinIdStatusList" resultType="com.lz.modules.flow.entity.FlowRecord">
         select * from lz_flow_record  where  is_delete = 0 and flow_index <![CDATA[<=]]> #{flowIndex}
-        and record_id = #{recordId}
+        and record_id = #{recordId} and flow_process !=2
         and status in
         <foreach item="item" collection="statusList"  open="(" separator="," close=")">
             #{item}

src/main/resources/mapper/performance/TaskProcessRecordMapper.xml

@@ -102,6 +102,9 @@
         update lz_task_process_record set is_delete = 1 where task_id=#{taskId}
     </update>
 
+    <select id="selectTaskProcessRecordLastByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
+        select gmt_create,remark,label,type from lz_task_process_record  where task_id=#{taskId} and is_delete = 0 order by id desc
+    </select>
 
 
 </mapper>