From 95c02b47c3fcbb0eb6e4ba9929f6204a1aa1147e Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 11 Dec 2020 11:19:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9E=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/job/business/DingtalkBusiness.java | 16 +++++++++------- .../performance/dao/TaskProcessRecordMapper.java | 4 ++++ .../service/TaskProcessRecordService.java | 4 ++++ .../impl/TaskProcessRecordServiceImpl.java | 10 ++++++++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 669d0a2d..4f03c873 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -31,8 +31,10 @@ import com.lz.modules.job.model.responseBo.DepartmentInfosBo; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskComment; +import com.lz.modules.performance.entity.TaskProcessRecord; 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.dao.SysUserTokenDao; import com.lz.modules.sys.entity.SysUserTokenEntity; import com.lz.modules.sys.entity.app.ResultDetail; @@ -114,7 +116,7 @@ public class DingtalkBusiness { private ResultTaskService resultTaskService; @Autowired - private TaskCommentService taskCommentService; + private TaskProcessRecordService taskProcessRecordService; @Resource StaffDao staffDao; @@ -702,14 +704,14 @@ public class DingtalkBusiness { public String sendTaskNoticeMsg(Long detailId, Long taskId) { ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId); logger.info("评论通知指标id{}， 任务id{}", detailId, taskId); - /*if(resultDetail != null){ - TaskComment taskComment = null; + if(resultDetail != null){ + TaskProcessRecord taskProcessRecord = null; if(taskId == null){ - taskComment = taskCommentService.selectTaskCommentByDetailId(detailId); + taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByDetailId(detailId); }else{ - taskComment = taskCommentService.selectTaskCommentByTaskId(taskId); + taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByTaskId(taskId); } - StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskComment.getStaffId()); + StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskProcessRecord.getStaffId()); StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId()); ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); @@ -743,7 +745,7 @@ public class DingtalkBusiness { }else{ return "token无效"; } - }*/ + } return "OK"; } public String sendNoticeMsg(ResultRecord lzResultRecord, List staffs) { 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 13b02ae7..364a1d53 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -40,4 +40,8 @@ public interface TaskProcessRecordMapper extends BaseMapper { List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(@Param("detailId") Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(@Param("taskId") 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 d2d9c1e0..dd4f857c 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -41,4 +41,8 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordsByTaskId(Long taskId); List selectByCondition(IPage page, TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId); } \ 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 5327af7b..a0912730 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 @@ -137,4 +137,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl selectByCondition(IPage page, TaskModel taskModel) { return taskProcessRecordMapper.selectByCondition(page,taskModel); } + + @Override + public TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId){ + return taskProcessRecordMapper.selectCommentTaskProcessRecordByDetailId(detailId); + } + + @Override + public TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId){ + return taskProcessRecordMapper.selectCommentTaskProcessRecordByTaskId(taskId); + } } From 9ccfa10cd760f490dd47bfd349b73b6742b5a55a Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 11 Dec 2020 14:04:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4task=5Fcommant=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/dto/TaskCommentDto.java | 1 - .../service/impl/StaffRoleServiceImpl.java | 7 - .../job/business/DingtalkBusiness.java | 10 - .../performance/dao/TaskCommentMapper.java | 45 ---- .../performance/entity/TaskComment.java | 234 ------------------ .../service/TaskCommentService.java | 38 --- .../service/impl/ResultTaskServiceImpl.java | 8 +- .../service/impl/TaskCommentServiceImpl.java | 78 ------ .../mapper/performance/TaskCommentMapper.xml | 123 --------- .../performance/TaskProcessRecordMapper.xml | 7 + 10 files changed, 8 insertions(+), 543 deletions(-) delete mode 100644 src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java delete mode 100644 src/main/java/com/lz/modules/performance/entity/TaskComment.java delete mode 100644 src/main/java/com/lz/modules/performance/service/TaskCommentService.java delete mode 100644 src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java delete mode 100644 src/main/resources/mapper/performance/TaskCommentMapper.xml diff --git a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java index 9b4fb726..71012b51 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -1,6 +1,5 @@ package com.lz.modules.app.dto; -import com.lz.modules.performance.entity.TaskComment; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index fb556883..1f1178ce 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -27,12 +27,9 @@ import com.lz.modules.flow.dao.StaffRoleMapper; import com.lz.modules.flow.entity.*; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; -import com.lz.modules.performance.dao.TaskCommentMapper; import com.lz.modules.performance.entity.ResultTask; -import com.lz.modules.performance.entity.TaskComment; import com.lz.modules.performance.entity.TaskProcessRecord; 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.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; @@ -112,8 +109,6 @@ public class StaffRoleServiceImpl extends ServiceImpl -* 任务评论表 服务类 -*

-* -* @author quyixiao -* @since 2020-12-08 -*/ -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.lz.modules.app.model.TaskModel; -import com.lz.modules.performance.entity.TaskComment; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface TaskCommentMapper extends BaseMapper { - - - TaskComment selectTaskCommentById(@Param("id") Long id); - - - Long insertTaskComment(TaskComment taskComment); - - - int updateTaskCommentById(TaskComment taskComment); - - - int updateCoverTaskCommentById(TaskComment taskComment); - - - int deleteTaskCommentById(@Param("id") Long id); - - - int deleteTaskCommensByTaskId(@Param("taskId") Long taskId); - - List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); - - TaskComment selectTaskCommentByTaskId(Long taskId); - - TaskComment selectTaskCommentByDetailId(Long detailId); -} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/TaskComment.java b/src/main/java/com/lz/modules/performance/entity/TaskComment.java deleted file mode 100644 index 27de9f35..00000000 --- a/src/main/java/com/lz/modules/performance/entity/TaskComment.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.lz.modules.performance.entity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import java.util.Date; -/** -*

-*

*任务评论表 -* @author quyixiao -* @since 2020-12-08 -*/ - -@Data -@TableName("lz_task_comment") -@ApiModel(value = "任务评论表") -public class TaskComment implements java.io.Serializable { - // - @TableId(value = "id", type = IdType.AUTO) - private Long id; - //是否删除状态，1：删除，0：有效 - @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete") - private Integer isDelete; - //创建时间 - @ApiModelProperty(value = "创建时间", name = "gmtCreate") - private Date gmtCreate; - //最后修改时间 - @ApiModelProperty(value = "最后修改时间", name = "gmtModified") - private Date gmtModified; - //任务id - @ApiModelProperty(value = "任务id", name = "taskId") - private Long taskId; - //0表示对所有评论，1表示对单个具体的detail做评论 - @ApiModelProperty(value = "0表示对所有评论，1表示对单个具体的detail做评论", name = "type") - private Integer type; - // - @ApiModelProperty(value = "", name = "detailId") - private Long detailId; - //lz_result_record表id - @ApiModelProperty(value = "lz_result_record表id", name = "resultRecordId") - private Long resultRecordId; - //评论人员 - @ApiModelProperty(value = "评论人员", name = "staffId") - private Long staffId; - //评论内容 - @ApiModelProperty(value = "评论内容", name = "content") - private String content; - //评论人员名称 - @ApiModelProperty(value = "评论人员名称", name = "staffName") - private String staffName; - /** - * - * @return - */ - public Long getId() { - return id; - } - /** - * - * @param id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 是否删除状态，1：删除，0：有效 - * @return - */ - public Integer getIsDelete() { - return isDelete; - } - /** - * 是否删除状态，1：删除，0：有效 - * @param isDelete - */ - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; - } - - /** - * 创建时间 - * @return - */ - public Date getGmtCreate() { - return gmtCreate; - } - /** - * 创建时间 - * @param gmtCreate - */ - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - /** - * 最后修改时间 - * @return - */ - public Date getGmtModified() { - return gmtModified; - } - /** - * 最后修改时间 - * @param gmtModified - */ - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - /** - * 任务id - * @return - */ - public Long getTaskId() { - return taskId; - } - /** - * 任务id - * @param taskId - */ - public void setTaskId(Long taskId) { - this.taskId = taskId; - } - - /** - * 0表示对所有评论，1表示对单个具体的detail做评论 - * @return - */ - public Integer getType() { - return type; - } - /** - * 0表示对所有评论，1表示对单个具体的detail做评论 - * @param type - */ - public void setType(Integer type) { - this.type = type; - } - - /** - * - * @return - */ - public Long getDetailId() { - return detailId; - } - /** - * - * @param detailId - */ - public void setDetailId(Long detailId) { - this.detailId = detailId; - } - - /** - * lz_result_record表id - * @return - */ - public Long getResultRecordId() { - return resultRecordId; - } - /** - * lz_result_record表id - * @param resultRecordId - */ - public void setResultRecordId(Long resultRecordId) { - this.resultRecordId = resultRecordId; - } - - /** - * 评论人员 - * @return - */ - public Long getStaffId() { - return staffId; - } - /** - * 评论人员 - * @param staffId - */ - public void setStaffId(Long staffId) { - this.staffId = staffId; - } - - /** - * 评论内容 - * @return - */ - public String getContent() { - return content; - } - /** - * 评论内容 - * @param content - */ - public void setContent(String content) { - this.content = content; - } - - /** - * 评论人员名称 - * @return - */ - public String getStaffName() { - return staffName; - } - /** - * 评论人员名称 - * @param staffName - */ - public void setStaffName(String staffName) { - this.staffName = staffName; - } - - @Override - public String toString() { - return "TaskComment{" + - ",id=" + id + - ",isDelete=" + isDelete + - ",gmtCreate=" + gmtCreate + - ",gmtModified=" + gmtModified + - ",taskId=" + taskId + - ",type=" + type + - ",detailId=" + detailId + - ",resultRecordId=" + resultRecordId + - ",staffId=" + staffId + - ",content=" + content + - ",staffName=" + staffName + - "}"; - } -} \ 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 deleted file mode 100644 index a6e4a0dd..00000000 --- a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lz.modules.performance.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.lz.modules.performance.entity.TaskComment; - -/** -*

-* 任务评论表 服务类 -*

-* -* @author quyixiao -* @since 2020-12-08 -*/ -public interface TaskCommentService extends IService { - - - - TaskComment selectTaskCommentById(Long id); - - - Long insertTaskComment(TaskComment taskComment); - - - int updateTaskCommentById(TaskComment taskComment); - - - int updateCoverTaskCommentById(TaskComment taskComment); - - - int deleteTaskCommentById(Long id); - - - int deleteTaskCommensByTaskId(Long taskId); - - TaskComment selectTaskCommentByDetailId(Long detailId); - - TaskComment selectTaskCommentByTaskId(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 38eb67af..88efe109 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 @@ -14,11 +14,9 @@ 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; -import com.sun.org.apache.regexp.internal.RE; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -28,7 +26,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; import java.util.Optional; -import java.util.function.Consumer; /** *

@@ -47,9 +44,7 @@ public class ResultTaskServiceImpl extends ServiceImpl -* 任务评论表 服务类 -*

-* -* @author quyixiao -* @since 2020-12-08 -*/ - -@Service -public class TaskCommentServiceImpl extends ServiceImpl implements TaskCommentService { - - - @Autowired - private TaskCommentMapper taskCommentMapper; - - - - @Override - public TaskComment selectTaskCommentById(Long id){ - return taskCommentMapper.selectTaskCommentById(id); - } - - - - @Override - public Long insertTaskComment(TaskComment taskComment){ - return taskCommentMapper.insertTaskComment(taskComment); - } - - - - @Override - public int updateTaskCommentById(TaskComment taskComment){ - return taskCommentMapper.updateTaskCommentById(taskComment); - } - - - - @Override - public int updateCoverTaskCommentById(TaskComment taskComment){ - return taskCommentMapper.updateCoverTaskCommentById(taskComment); - } - - - - @Override - public int deleteTaskCommentById(Long id){ - return taskCommentMapper.deleteTaskCommentById(id); - } - - @Override - public int deleteTaskCommensByTaskId(Long taskId){ - return taskCommentMapper.deleteTaskCommensByTaskId(taskId); - } - - @Override - public TaskComment selectTaskCommentByDetailId(Long detailId){ - return taskCommentMapper.selectTaskCommentByDetailId(detailId); - } - - @Override - public TaskComment selectTaskCommentByTaskId(Long taskId){ - return taskCommentMapper.selectTaskCommentByTaskId(taskId); - } - - - -} diff --git a/src/main/resources/mapper/performance/TaskCommentMapper.xml b/src/main/resources/mapper/performance/TaskCommentMapper.xml deleted file mode 100644 index faf001d6..00000000 --- a/src/main/resources/mapper/performance/TaskCommentMapper.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, task_id AS taskId, type AS type, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, content AS content, staff_name AS staffName - - - - - - - - - - insert into lz_task_comment( - task_id, - type, - detail_id, - result_record_id, - staff_id, - content, - staff_name, - is_delete, - gmt_create, - gmt_modified - )values( - #{ taskId}, - #{ type}, - #{ detailId}, - #{ resultRecordId}, - #{ staffId}, - #{ content}, - #{ staffName}, - 0, - now(), - now() - ) - - - - - update - lz_task_comment - - is_delete = #{isDelete}, - gmt_create = #{gmtCreate}, - task_id = #{taskId}, - type = #{type}, - detail_id = #{detailId}, - result_record_id = #{resultRecordId}, - staff_id = #{staffId}, - content = #{content}, - staff_name = #{staffName} - - ,gmt_modified = now() - where id = #{id} - - - - - update - lz_task_comment - set - is_delete = #{isDelete}, - gmt_create = #{gmtCreate}, - task_id = #{taskId}, - type = #{type}, - detail_id = #{detailId}, - result_record_id = #{resultRecordId}, - staff_id = #{staffId}, - content = #{content}, - staff_name = #{staffName} - ,gmt_modified = now() - where id = #{id} - - - - - - - - - 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 f7b14bc7..4ce5c249 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -155,6 +155,13 @@ select * from lz_task_process_record where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc + + + From 41eb361911cec2d867c0a96ec9de042d0728762d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 11 Dec 2020 14:23:46 +0800 Subject: [PATCH 3/4] fix --- .../dao/TaskProcessRecordMapper.java | 4 ++-- .../performance/dto/TaskProcessRecordDto.java | 2 +- .../performance/req/ChangeTaskListReq.java | 4 ++-- .../impl/TaskProcessRecordServiceImpl.java | 4 +++- .../performance/TaskProcessRecordMapper.xml | 17 ++++++++++++----- 5 files changed, 20 insertions(+), 11 deletions(-) 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 13b02ae7..50fac591 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -31,13 +31,13 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordById(@Param("id") Long id); - List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") int useType); + List selectTaskProcessRecordsByTaskId(@Param("page") IPage page, @Param("taskId") Long taskId,@Param("useType") Integer useType); int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); - List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); + List selectTaskProcessRecordsByTaskIdsAndType(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") Integer useType); List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); } \ 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 index cf508106..84d88c14 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -38,6 +38,6 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "任务名称", name = "name") private String name; //1，修改名称，2修改进度 ，3名称和进度都修改 - @ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType") + @ApiModelProperty(value = "0表示记录，不传全部", name = "useType") private Integer useType; } diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index 455106f5..96560e0a 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -21,6 +21,6 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; - @ApiModelProperty(value="0:不包含评论，1包含评论",name = "type") - private int useType; + @ApiModelProperty(value="0:不包含评论，1评论",name = "type") + private Integer useType; } 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 8aee427d..762c0d7f 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 @@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.model.TaskModel; @@ -21,6 +22,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; @@ -97,7 +99,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( - page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect,req.getUseType()) + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIdsAndType(page, collect,req.getUseType()) ); } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f7b14bc7..be91df62 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -129,7 +129,11 @@ @@ -137,12 +141,16 @@ - + select gmt_create,remark,label,type from lz_task_process_record where is_delete = 0 + + and use_type = #{useType} + and task_id in #{taskId} @@ -155,6 +163,5 @@ select * from lz_task_process_record where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc - From f51bf5a98b9137235653c76a96fa6e200dcfafd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 11 Dec 2020 14:26:23 +0800 Subject: [PATCH 4/4] fix --- .../java/com/lz/modules/performance/req/ChangeTaskListReq.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index 96560e0a..af00aad4 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -21,6 +21,6 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="详情id（二选一）",name = "detailId") private Long detailId; - @ApiModelProperty(value="0:不包含评论，1评论",name = "type") + @ApiModelProperty(value="0:记录 不传全部",name = "useType") private Integer useType; }