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 9684e1d3..4831fd21 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,7 +26,11 @@ import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.dto.ResultTaskDto; +<<<<<<< HEAD import com.lz.modules.performance.req.ResultUpdateTaskReq; +======= +import com.lz.modules.performance.entity.ResultTask; +>>>>>>> a686b4951729942fab37f1855cca21161b19793a import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ResultTaskService; @@ -559,7 +563,7 @@ public class ResultRecordController extends AbstractController { ) { //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels1, dto)) ; - List taskDtos = resultTaskService.selectResultTasksByDetailId(dto.getId()); + List resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId()); weight = weight.add(dto.getCheckWeight()); if(scoreDtos.size() > 0){ //获取评分详细 @@ -851,18 +855,22 @@ public class ResultRecordController extends AbstractController { log.info("任务个数{}", detailDto.getTaskDtos().size()); for (ResultTaskDto taskDto:detailDto.getTaskDtos() ) { - ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq(); - taskReq.setDetailId(resultDetail.getId()); - taskReq.setTasklId(taskDto.getId()); - taskReq.setName(taskDto.getName()); - taskReq.setProcessRate(taskDto.getProcessRate()); - resultTaskService.saveOrUpdateResultTask(taskReq); + if(taskDto.getIsDelete() != null && taskDto.getIsDelete().intValue() == 1){ + //删除 + }else{ + ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq(); + taskReq.setDetailId(resultDetail.getId()); + taskReq.setTasklId(taskDto.getId()); + taskReq.setName(taskDto.getName()); + taskReq.setProcessRate(taskDto.getProcessRate()); + resultTaskService.saveOrUpdateResultTask(taskReq); + } + } } } - }else{ resultDetail.setStaffId(resultRecord.getStaffId()); resultDetail.setRecordId(resultRecord.getId()); 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 8dedeae3..470190a1 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,9 @@ package com.lz.modules.performance.controller; +import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.performance.entity.TaskProcessRecord; +import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.res.ResultTaskDetailRes; import com.lz.modules.performance.service.ResultTaskService; @@ -12,10 +14,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @Author: djc @@ -46,7 +45,7 @@ public class ResultTaskController { @PostMapping("/result/changeTask") @ApiOperation("任务修改") @ApiResponses({@ApiResponse(code = 200,message = "成功")}) - public R changeTask(ResultUpdateTaskReq req){ + public R changeTask(@RequestBody ResultUpdateTaskReq req){ int i = resultTaskService.saveOrUpdateResultTask(req); if(i>0){ return R.ok(); @@ -55,12 +54,12 @@ public class ResultTaskController { } - @GetMapping("/result/changeTaskList") - @ApiOperation("任务修改") + @PostMapping("/result/changeTaskList") + @ApiOperation("任务变更记录") @ApiResponses({@ApiResponse(code = 200,message = "成功")}) - public R updateTask(Long taskId){ - //taskProcessRecordService. - return R.error(); + public R changeTaskList(ChangeTaskListReq req){ + PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); + return R.ok().put("data",pageUtils); } } diff --git a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java index 986b9cac..c8c5a454 100644 --- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -33,7 +33,9 @@ public interface ResultTaskMapper extends BaseMapper { int deleteResultTaskById(@Param("id") Long id); - List selectResultTasksByDetailId(@Param("detailId") Long detailId); + List selectResultTaskDtosByDetailId(@Param("detailId") Long detailId); + + List selectResultTasksByDetailId(@Param("detailId") Long detailId); int deleteResultTasksByDetailId(Long detailId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java index 75cdc4e4..e114e577 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java @@ -30,4 +30,5 @@ public interface TaskCommentMapper extends BaseMapper { int deleteTaskCommentById(@Param("id") Long id); + int deleteTaskCommensByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 2ad075b5..7a60d56b 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -8,9 +8,13 @@ package com.lz.modules.performance.dao; * @since 2020-12-08 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.performance.entity.TaskProcessRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface TaskProcessRecordMapper extends BaseMapper { @@ -29,5 +33,8 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordById(@Param("id") Long id); + List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId); + + int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index 71d340c1..363a006c 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -1,4 +1,6 @@ package com.lz.modules.performance.dto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,9 +17,12 @@ import java.math.BigDecimal; @Data @ApiModel(value = "任务表Dto") public class ResultTaskDto { - // - @ApiModelProperty(value = "", name = "id") + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "任务id", name = "id") private Long id; + //是否删除状态，1：删除，0：有效 + @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete") + private Integer isDelete; //任务名称 @ApiModelProperty(value = "任务名称", name = "name") private String name; @@ -27,21 +32,6 @@ public class ResultTaskDto { //排序由小到大 @ApiModelProperty(value = "排序由小到大", name = "orderBy") private Integer orderBy; - /** - * - * @return - */ - public Long getId() { - return id; - } - /** - * - * @param id - */ - public void setId(Long id) { - this.id = id; - } - /** * 任务名称 * @return @@ -92,10 +82,9 @@ public class ResultTaskDto { @Override public String toString() { return "ResultTaskDto{" + - ",id=" + id + - ",name=" + name + - ",processRate=" + processRate + - ",orderBy=" + orderBy + - "}"; + "name='" + name + '\'' + + ", processRate=" + processRate + + ", orderBy=" + orderBy + + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java new file mode 100644 index 00000000..7fe61f8f --- /dev/null +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -0,0 +1,32 @@ +package com.lz.modules.performance.dto; + +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/12/9 14:41 + */ +public class TaskProcessRecordDto { + //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") + private Date gmtCreate; + //更新说明 + @ApiModelProperty(value = "更新说明", name = "remark") + private String remark; + //操作标签 + @ApiModelProperty(value = "操作标签", name = "label") + private String label; + //1，修改名称，2修改进度 ，3名称和进度都修改 + @ApiModelProperty(value = "1，修改名称，2修改进度 ，3名称和进度都修改", name = "type") + private Integer type; + + @ApiModelProperty(value = "员工姓名", name = "staffName") + private String staffName; + + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; +} diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java new file mode 100644 index 00000000..278f1a1a --- /dev/null +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -0,0 +1,20 @@ +package com.lz.modules.performance.req; + +import com.lz.modules.equipment.entity.model.BasePage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/12/9 14:57 + */ +@Data +@ApiModel("任务变更记录") +public class ChangeTaskListReq extends BasePage { + + @ApiModelProperty(value="任务id",name = "taskId") + private Long taskId; +} diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java index 89a69897..ea850774 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -39,7 +39,7 @@ public interface ResultTaskService extends IService { int saveOrUpdateResultTask(ResultUpdateTaskReq req); - List selectResultTasksByDetailId(Long detailId); int deleteResultTasksByDetailId(Long detailId); + List selectResultTasksByDetailId(Long detailId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java index ca038ee7..aeb55671 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java @@ -30,4 +30,5 @@ public interface TaskCommentService extends IService { int deleteTaskCommentById(Long id); + int deleteTaskCommensByTaskId(Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java index bb899ec7..6b5b482a 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -1,7 +1,11 @@ package com.lz.modules.performance.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.common.utils.PageUtils; import com.lz.modules.performance.entity.TaskProcessRecord; +import com.lz.modules.performance.req.ChangeTaskListReq; + +import java.util.List; /** *

@@ -29,5 +33,8 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordById(Long id); + PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req); + + int deleteTaskProcessRecordsByTaskId(Long taskId); } \ No newline at end of file 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 ce29cff3..dccd933a 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 @@ -10,6 +10,7 @@ import com.lz.modules.performance.enums.ProcessRecordEnum; import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.res.ResultTaskDetailRes; import com.lz.modules.performance.service.ResultTaskService; +import com.lz.modules.performance.service.TaskCommentService; import com.lz.modules.performance.service.TaskProcessRecordService; import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.service.app.ResultDetailService; @@ -44,6 +45,10 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTasks = resultTaskMapper.selectResultTasksByDetailId(detailId); + List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); res.setResultTasks(resultTasks); return res; } @@ -110,6 +115,7 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDtos = resultTaskMapper.selectResultTasksByDetailId(detailId); + List resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); if(CollectionUtils.isEmpty(resultTaskDtos)){ log.info("未找到该绩效详情下得任务信息"); return BigDecimal.ZERO; @@ -170,13 +176,18 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ + public List selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); } @Override public int deleteResultTasksByDetailId(Long detailId){ - //List tasks = resultTaskMapper.selectResultTasksByDetailId() + List tasks = resultTaskMapper.selectResultTasksByDetailId(detailId); + for (ResultTask task:tasks + ) { + taskProcessRecordService.deleteTaskProcessRecordsByTaskId(task.getId()); + taskCommentService.deleteTaskCommensByTaskId(task.getId()); + } return resultTaskMapper.deleteResultTasksByDetailId(detailId); } } diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java index 8ac3ed68..1002a993 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java @@ -58,6 +58,11 @@ public class TaskCommentServiceImpl extends ServiceImpl * 任务进度更新表 服务类 @@ -58,6 +62,16 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) + ); + return pageUtils; + } - + @Override + public int deleteTaskProcessRecordsByTaskId(Long taskId){ + return taskProcessRecordMapper.deleteTaskProcessRecordsByTaskId(taskId); + } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index df365cc2..31ab5181 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -84,13 +84,19 @@ update lz_result_task set is_delete = 1 where id=#{id} limit 1 - select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc +<<<<<<< HEAD update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1 +======= + +>>>>>>> a686b4951729942fab37f1855cca21161b19793a diff --git a/src/main/resources/mapper/performance/TaskCommentMapper.xml b/src/main/resources/mapper/performance/TaskCommentMapper.xml index 79d0a221..2edc0255 100644 --- a/src/main/resources/mapper/performance/TaskCommentMapper.xml +++ b/src/main/resources/mapper/performance/TaskCommentMapper.xml @@ -99,5 +99,9 @@ update lz_task_comment set is_delete = 1 where id=#{id} limit 1 + + update lz_task_comment set is_delete = 1 where task_id=#{taskId} + + diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index b6d41fd1..a697ee84 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -29,7 +29,6 @@ select * from lz_task_process_record where id=#{id} and is_delete = 0 limit 1 - insert into lz_task_process_record( process_rate, @@ -94,5 +93,16 @@ update lz_task_process_record set is_delete = 1 where id=#{id} limit 1 + + + + + update lz_task_process_record set is_delete = 1 where task_id=#{taskId} + + + +