wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增部分代码

Browse Source
This commit is contained in:
wulin 2020-12-09 16:36:52 +08:00
commit 73ee332287
17 changed files with 165 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -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<ResultTaskDto> taskDtos = resultTaskService.selectResultTasksByDetailId(dto.getId());
List<ResultTask> 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());

19
src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
View File

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

4
src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
View File

@ -33,7 +33,9 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
int deleteResultTaskById(@Param("id") Long id);
List<ResultTaskDto> selectResultTasksByDetailId(@Param("detailId") Long detailId);
List<ResultTaskDto> selectResultTaskDtosByDetailId(@Param("detailId") Long detailId);
List<ResultTask> selectResultTasksByDetailId(@Param("detailId") Long detailId);
int deleteResultTasksByDetailId(Long detailId);
}

1
src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java
View File

@ -30,4 +30,5 @@ public interface TaskCommentMapper extends BaseMapper<TaskComment> {
int deleteTaskCommentById(@Param("id") Long id);
int deleteTaskCommensByTaskId(@Param("taskId") Long taskId);
}

7
src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
View File

@ -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<TaskProcessRecord> {
@ -29,5 +33,8 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
int deleteTaskProcessRecordById(@Param("id") Long id);
List<TaskProcessRecord> selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId);
int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);
}

33
src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java
View File

@ -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 +
'}';
}
}

32
src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java Normal file
View File

@ -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;
}

20
src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java Normal file
View File

@ -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;
}

2
src/main/java/com/lz/modules/performance/service/ResultTaskService.java
View File

@ -39,7 +39,7 @@ public interface ResultTaskService extends IService<ResultTask> {
int saveOrUpdateResultTask(ResultUpdateTaskReq req);
List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
int deleteResultTasksByDetailId(Long detailId);
List<ResultTask> selectResultTasksByDetailId(Long detailId);
}

1
src/main/java/com/lz/modules/performance/service/TaskCommentService.java
View File

@ -30,4 +30,5 @@ public interface TaskCommentService extends IService<TaskComment> {
int deleteTaskCommentById(Long id);
int deleteTaskCommensByTaskId(Long taskId);
}

7
src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java
View File

@ -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;
/**
* <p>
@ -29,5 +33,8 @@ public interface TaskProcessRecordService extends IService<TaskProcessRecord> {
int deleteTaskProcessRecordById(Long id);
PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req);
int deleteTaskProcessRecordsByTaskId(Long taskId);
}

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

@ -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<ResultTaskMapper, ResultT
private ResultDetailService resultDetailService;
@Autowired
private TaskProcessRecordService taskProcessRecordService;
@Autowired
private TaskCommentService taskCommentService;
@Autowired
private TaskProcessRecordService taskProcessRecordService;
@ -88,7 +93,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
res.setProcessRate(resultDetail1.getProcessRate());
res.setTarget(resultDetail1.getTarget());
});
List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTasksByDetailId(detailId);
List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
res.setResultTasks(resultTasks);
return res;
}
@ -110,6 +115,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
resultTaskMapper.insertResultTask(resultTask);
}
else {
log.info("绩效任务修改操作。。。");
resultTask = resultTaskMapper.selectResultTaskById(tasklId);
BeanUtils.copyProperties(req,resultTask);
@ -128,7 +134,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
//计算总进度
private BigDecimal caclateResultDetailProcess(Long detailId){
List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectResultTasksByDetailId(detailId);
List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
if(CollectionUtils.isEmpty(resultTaskDtos)){
log.info("未找到该绩效详情下得任务信息");
return BigDecimal.ZERO;
@ -170,13 +176,18 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
}
@Override
public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
public List<ResultTask> selectResultTasksByDetailId(Long detailId){
return resultTaskMapper.selectResultTasksByDetailId(detailId);
}
@Override
public int deleteResultTasksByDetailId(Long detailId){
//List<ResultTask> tasks = resultTaskMapper.selectResultTasksByDetailId()
List<ResultTask> tasks = resultTaskMapper.selectResultTasksByDetailId(detailId);
for (ResultTask task:tasks
) {
taskProcessRecordService.deleteTaskProcessRecordsByTaskId(task.getId());
taskCommentService.deleteTaskCommensByTaskId(task.getId());
}
return resultTaskMapper.deleteResultTasksByDetailId(detailId);
}
}

5
src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java
View File

@ -58,6 +58,11 @@ public class TaskCommentServiceImpl extends ServiceImpl<TaskCommentMapper, TaskC
return taskCommentMapper.deleteTaskCommentById(id);
}
@Override
public int deleteTaskCommensByTaskId(Long taskId){
return taskCommentMapper.deleteTaskCommensByTaskId(taskId);
}
}

16
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
View File

@ -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;
/**
* <p>
* 任务进度更新表 服务类
@ -58,6 +62,16 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
return taskProcessRecordMapper.deleteTaskProcessRecordById(id);
}
@Override
public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) {
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
);
return pageUtils;
}
@Override
public int deleteTaskProcessRecordsByTaskId(Long taskId){
return taskProcessRecordMapper.deleteTaskProcessRecordsByTaskId(taskId);
}
}

8
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

@ -84,13 +84,19 @@
update lz_result_task set is_delete = 1 where id=#{id} limit 1
</update>
<select id="selectResultTasksByDetailId" resultType="ResultTask" >
<select id="cselectResultTasksByDetailId" resultType="ResultTask" >
select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
</select>
<<<<<<< HEAD
<update id="deleteResultTasksByDetailId" parameterType="java.lang.Long">
update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1
</update>
=======
<select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
select name,processRate,orderBy from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc
</select>
>>>>>>> a686b4951729942fab37f1855cca21161b19793a
</mapper>

4
src/main/resources/mapper/performance/TaskCommentMapper.xml
View File

@ -99,5 +99,9 @@
update lz_task_comment set is_delete = 1 where id=#{id} limit 1
</update>
<update id="deleteTaskCommentById" parameterType="java.lang.Long">
update lz_task_comment set is_delete = 1 where task_id=#{taskId}
</update>
</mapper>

12
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
View File

@ -29,7 +29,6 @@
select * from lz_task_process_record where id=#{id} and is_delete = 0 limit 1
</select>
<insert id="insertTaskProcessRecord" parameterType="TaskProcessRecord" useGeneratedKeys="true" keyProperty="id" >
insert into lz_task_process_record(
<if test="processRate != null">process_rate, </if>
@ -94,5 +93,16 @@
update lz_task_process_record set is_delete = 1 where id=#{id} limit 1
</update>
<select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.entity.TaskProcessRecord">
select * from lz_task_process_record where task_id=#{taskId} and is_delete = 0 order by gmt_create desc
</select>
<update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long">
update lz_task_process_record set is_delete = 1 where task_id=#{taskId}
</update>
</mapper>