From 1973ad96ca83bbb4df07f9b4da37ddbadb5360e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 9 Dec 2020 15:49:40 +0800 Subject: [PATCH 1/3] fix --- .../controller/ResultTaskController.java | 19 ++++++----- .../dao/TaskProcessRecordMapper.java | 7 ++++ .../performance/dto/TaskProcessRecordDto.java | 32 +++++++++++++++++++ .../performance/req/ChangeTaskListReq.java | 20 ++++++++++++ .../service/TaskProcessRecordService.java | 6 ++++ .../impl/TaskProcessRecordServiceImpl.java | 13 ++++++-- .../performance/TaskProcessRecordMapper.xml | 8 ++++- 7 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java create mode 100644 src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java 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/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 2ad075b5..897b9cb3 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); + + } \ 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/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java index bb899ec7..c2dcce26 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,7 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordById(Long id); + PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index c13533bd..ea41f40b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -1,12 +1,16 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.common.utils.PageUtils; import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.entity.TaskProcessRecord; +import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.service.TaskProcessRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 任务进度更新表 服务类 @@ -58,6 +62,11 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) + ); + return pageUtils; + } } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index b6d41fd1..1fe34a00 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,12 @@ update lz_task_process_record set is_delete = 1 where id=#{id} limit 1 + + + + + From 50915b9f6b2601c4e87a0e6ddba12abc76ecfbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 9 Dec 2020 16:03:40 +0800 Subject: [PATCH 2/3] fix --- .../controller/ResultRecordController.java | 3 ++- .../performance/dao/ResultTaskMapper.java | 4 +++- .../performance/dto/ResultTaskDto.java | 21 +------------------ .../service/ResultTaskService.java | 2 +- .../service/impl/ResultTaskServiceImpl.java | 6 +++--- .../mapper/performance/ResultTaskMapper.xml | 5 ++++- 6 files changed, 14 insertions(+), 27 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 710ef288..c2490e58 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,6 +26,7 @@ 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; +import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ResultTaskService; @@ -556,7 +557,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){ //获取评分详细 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 17820fed..1dfc2489 100644 --- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -33,6 +33,8 @@ 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); } \ 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..e9a6228f 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -15,9 +15,6 @@ import java.math.BigDecimal; @Data @ApiModel(value = "任务表Dto") public class ResultTaskDto { - // - @ApiModelProperty(value = "", name = "id") - private Long id; //任务名称 @ApiModelProperty(value = "任务名称", name = "name") private String name; @@ -27,21 +24,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 @@ -91,8 +73,7 @@ public class ResultTaskDto { @Override public String toString() { - return "ResultTaskDto{" + - ",id=" + id + + return "ResultTaskDto{" ",name=" + name + ",processRate=" + processRate + ",orderBy=" + orderBy + 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 1bb88f06..b1300452 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -39,5 +39,5 @@ public interface ResultTaskService extends IService { int saveOrUpdateResultTask(ResultUpdateTaskReq req); - List selectResultTasksByDetailId(Long detailId); + List selectResultTasksByDetailId(Long detailId); } \ 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 db18d153..98c2bc60 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 @@ -88,7 +88,7 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTasks = resultTaskMapper.selectResultTasksByDetailId(detailId); + List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); res.setResultTasks(resultTasks); return res; } @@ -128,7 +128,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,7 +170,7 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ + public List selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 7375915c..f68f183e 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -84,9 +84,12 @@ 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 + From a686b4951729942fab37f1855cca21161b19793a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 9 Dec 2020 16:04:06 +0800 Subject: [PATCH 3/3] fix --- .../com/lz/modules/performance/dto/ResultTaskDto.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 e9a6228f..90193073 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -73,10 +73,10 @@ public class ResultTaskDto { @Override public String toString() { - return "ResultTaskDto{" - ",name=" + name + - ",processRate=" + processRate + - ",orderBy=" + orderBy + - "}"; + return "ResultTaskDto{" + + "name='" + name + '\'' + + ", processRate=" + processRate + + ", orderBy=" + orderBy + + '}'; } } \ No newline at end of file