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

fix

Browse Source
This commit is contained in:
杜建超 2020-12-09 15:49:40 +08:00
parent 196727b8a0
commit 1973ad96ca
7 changed files with 92 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

6
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,7 @@ public interface TaskProcessRecordService extends IService<TaskProcessRecord> {
int deleteTaskProcessRecordById(Long id);
PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req);
}

13
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,11 @@ 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;
}
}

8
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,12 @@
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>
</mapper>