From 870f1ffc275d8f59c85072c4a1dc83627cb49b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 10:05:29 +0800 Subject: [PATCH 01/25] fix --- .../dao/TaskProcessRecordMapper.java | 2 ++ .../performance/res/ResultTaskDetailRes.java | 9 ++++++++ .../service/impl/ResultTaskServiceImpl.java | 23 ++++++++++++++++++- .../performance/TaskProcessRecordMapper.xml | 3 +++ 4 files changed, 36 insertions(+), 1 deletion(-) 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 4b149bdd..e955747f 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -38,4 +38,6 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); + + TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java index 0fb34a09..fdf0b1e2 100644 --- a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java @@ -28,4 +28,13 @@ public class ResultTaskDetailRes { //任务列表 @ApiModelProperty(value = "集体进度", name = "resultTasks") private List resultTasks; + //头像 + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; + //姓名 + @ApiModelProperty(value = "姓名", name = "staffName") + private String staffName; + //标签 + @ApiModelProperty(value = "标签", name = "label") + private String label; } 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 1abe031f..60eb347b 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 @@ -2,8 +2,12 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.BigDecimalUtil; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.ResultTaskMapper; +import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dto.ResultTaskDto; +import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.enums.ProcessRecordEnum; @@ -47,6 +51,10 @@ public class ResultTaskServiceImpl extends ServiceImpl { res.setProcessRate(resultDetail1.getProcessRate()); res.setTarget(resultDetail1.getTarget()); - }); + Long staffId = resultDetail.getStaffId(); + StaffEntity staffEntity = staffService.selectStaffById(staffId); + res.setAvatar(staffEntity.getAvatar()); + }); List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); res.setResultTasks(resultTasks); + //获取最近更新记录 + if(CollectionUtils.isNotEmpty(resultTasks)){ + ResultTaskDto dto = resultTasks.get(resultTasks.size() - 1); + TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(dto.getId()); + if(taskProcessRecordDto != null){ + res.setStaffName(taskProcessRecordDto.getStaffName()); + res.setLabel(taskProcessRecordDto.getLabel()); + } + + } return res; } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 85b3fe8f..c9cc4bf0 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -102,6 +102,9 @@ update lz_task_process_record set is_delete = 1 where task_id=#{taskId} + From 78081a03749cf6cd3d0b494acc740d173b8d692a Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 10 Dec 2020 10:15:31 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/emun/WorkMsgTypeEnum.java | 1 + .../job/business/DingtalkBusiness.java | 58 +++++++++++++++++++ .../performance/dao/TaskCommentMapper.java | 4 ++ .../service/TaskCommentService.java | 4 ++ .../service/impl/TaskCommentServiceImpl.java | 10 ++++ .../mapper/performance/TaskCommentMapper.xml | 8 +++ 6 files changed, 85 insertions(+) diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java index 0f94627a..44fdfc05 100644 --- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java +++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java @@ -24,6 +24,7 @@ public enum WorkMsgTypeEnum { SKIP(10, "绩效跳过", "跳过", "# @的绩效\n ## 己经跳过"), TRANSFER(11, "绩效转交", "转交", "# @的绩效\n ## 己经转交"), CLEARN(12, "绩效转交", "转交", "# @的绩效\n ## 己经转交"), + TASK_COMMENT(13, "任务评论", "去查看", "# 任务评论\n ## @1评论了你的@2的任务"), // 您的2020年10月绩效考核已经开始，请尽快制定绩效目标 // 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认 ; 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 03c8ced1..2270ce66 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -29,9 +29,15 @@ import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.flow.service.FlowStartService; 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.service.ResultTaskService; +import com.lz.modules.performance.service.TaskCommentService; import com.lz.modules.sys.dao.SysUserTokenDao; import com.lz.modules.sys.entity.SysUserTokenEntity; +import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; +import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; import com.lz.modules.third.entity.ThirdAppConfig; import com.lz.modules.third.entity.ThirdMsgSendRecord; @@ -101,6 +107,15 @@ public class DingtalkBusiness { @Autowired private ThirdMsgSendRecordService thirdMsgSendRecordService; + @Autowired + private ResultDetailService resultDetailService; + + @Autowired + private ResultTaskService resultTaskService; + + @Autowired + private TaskCommentService taskCommentService; + @Resource StaffDao staffDao; @@ -646,7 +661,50 @@ 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(taskId == null){ + taskComment = taskCommentService.selectTaskCommentByDetailId(detailId); + }else{ + taskComment = taskCommentService.selectTaskCommentByTaskId(taskId); + } + StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskComment.getStaffId()); + StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId()); + ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); + String token = dingTalkUtil.getAccessTokenWitchEntity(thirdAppConfig); + if(token != null && token.length() > 0){ + + String url = homeUrl; + if(url.contains("?")){ + url += "&halokit=" + System.currentTimeMillis(); + }else{ + url += "?halokit=" + System.currentTimeMillis(); + } + url += ("&detail=1&id=" + resultDetail.getRecordId()); + url = URLEncoder.encode(url); + + + url = "dingtalk://dingtalkclient/action/openapp?corpid=" + thirdAppConfig.getCorpId() + + "&container_type=work_platform&app_id=0_" + + appid + "&redirect_type=jump&redirect_url=" + url; + StaffEntity info = new StaffEntity(); + info.setId(toStaffSimpleInfo.getId()); + info.setEmployeeId(toStaffSimpleInfo.getEmployeeId()); + String content = WorkMsgTypeEnum.TASK_COMMENT.getContent().replace("@1", fromStaffSimpleInfo.getName()); + content = content.replace("@2", "“" + resultDetail.getTarget() + "”"); + logger.info("通知内容{},url{}", content, url); + dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_COMMENT.getTitle(), + content, WorkMsgTypeEnum.TASK_COMMENT.getBtnText(), url, token); + + return "OK"; + + }else{ + return "token无效"; + } + } return "OK"; } public String sendNoticeMsg(ResultRecord lzResultRecord, List staffs) { 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 0d7850d4..794b55d5 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java @@ -38,4 +38,8 @@ public interface TaskCommentMapper extends BaseMapper { 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/service/TaskCommentService.java b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java index aeb55671..a6e4a0dd 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java @@ -31,4 +31,8 @@ public interface TaskCommentService extends IService { 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/TaskCommentServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java index 1002a993..77f7986b 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 @@ -62,6 +62,16 @@ public class TaskCommentServiceImpl extends ServiceImpl + + + + From 7df5d3a3589bd4e378263bf7bf4a4b7da27f94b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 10:23:58 +0800 Subject: [PATCH 03/25] fix --- .../dao/TaskProcessRecordMapper.java | 3 +++ .../performance/req/ChangeTaskListReq.java | 5 +++- .../impl/TaskProcessRecordServiceImpl.java | 23 ++++++++++++++++--- .../performance/TaskProcessRecordMapper.xml | 10 ++++++++ 4 files changed, 37 insertions(+), 4 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 e955747f..5b9cad8d 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,7 @@ public interface TaskProcessRecordMapper extends BaseMapper { int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId); TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId); + + List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds); + } \ No newline at end of file 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 278f1a1a..8a50ea22 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -15,6 +15,9 @@ import lombok.Data; @ApiModel("任务变更记录") public class ChangeTaskListReq extends BasePage { - @ApiModelProperty(value="任务id",name = "taskId") + @ApiModelProperty(value="任务id（二选一）",name = "taskId") private Long taskId; + + @ApiModelProperty(value="详情id（二选一）",name = "detailId") + private Long detailId; } 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 640d9faa..2a2ce79e 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 @@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.TaskProcessRecordMapper; +import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskProcessRecord; @@ -18,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; /** *

@@ -81,9 +84,23 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) - ); + PageUtils pageUtils = new PageUtils(); + if(req.getDetailId()!=null){ + List resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId()); + if(CollectionUtils.isNotEmpty(resultTaskDtos)){ + List collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); + pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect) + ); + } + + } + else { + pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( + page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) + ); + } + List list = pageUtils.getList(); if(CollectionUtils.isNotEmpty(list)){ Long taskId = req.getTaskId(); diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index c9cc4bf0..462f41f5 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -107,5 +107,15 @@ + + From fc497bb1a968ad7d779956356ef1cccefb69b521 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 10 Dec 2020 10:24:22 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=A1=AB=E5=86=99=E8=BF=9B=E5=BA=A6=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=85=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/job/business/DingtalkBusiness.java | 4 ++++ 1 file changed, 4 insertions(+) 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 2270ce66..be5c7a3a 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -660,6 +660,10 @@ public class DingtalkBusiness { return "error"; } + public String sendTaskInputMsg(List staffs){ + return "OK"; + } + public String sendTaskNoticeMsg(Long detailId, Long taskId) { ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId); logger.info("评论通知指标id{}， 任务id{}", detailId, taskId); From b3389f62eaf18d6e454df4ba8262eef75a225ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 10:50:26 +0800 Subject: [PATCH 05/25] notic --- .../modules/job/task/ResultTaskNoticJob.java | 46 +++++++++++++++++++ .../sys/dao/app/ResultRecordMapper.java | 1 + .../sys/service/app/ResultRecordService.java | 2 + .../app/impl/ResultRecordServiceImpl.java | 6 +++ .../mapper/app/ResultRecordMapper.xml | 10 ++++ 5 files changed, 65 insertions(+) create mode 100644 src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java diff --git a/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java b/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java new file mode 100644 index 00000000..ab160bab --- /dev/null +++ b/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java @@ -0,0 +1,46 @@ +package com.lz.modules.job.task; + +import com.google.common.collect.Lists; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.StaffService; +import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.enums.ResultFlowProcessEnum; +import com.lz.modules.sys.service.app.ResultRecordService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/12/10 10:26 + */ + +@Component("resultTaskNoticJob") +public class ResultTaskNoticJob implements ITask { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + DingtalkBusiness dingtalkBusiness; + @Autowired + private ResultRecordService resultRecordService; + @Autowired + private StaffService staffService; + + static final List process = Lists.newArrayList(ResultFlowProcessEnum.TARGET.getStatus(), ResultFlowProcessEnum.CONFIRM.getStatus(), + ResultFlowProcessEnum.DO.getStatus(), ResultFlowProcessEnum.WRITE.getStatus()); + + @Override + public void run(String params) { + + List ids = resultRecordService.selectStaffIdsByFlowProcess(process); + List staffEntities = staffService.selectByIds(ids); + String res = dingtalkBusiness.sendTaskInputMsg(staffEntities); + logger.info("绩效任务填写通知响应：" + res); + + } +} diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index 316791c8..ea4c2003 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -112,5 +112,6 @@ public interface ResultRecordMapper extends BaseMapper { List selectLevelDetailList(@Param("departmentIds") List departmentIds, @Param("startId")Long startId, @Param("scoreLevel")String scoreLevel); + List selectStaffIdsByFlowProcess(@Param("flowProcess") List flowProcess); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 5b568912..b0700c9a 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -131,4 +131,6 @@ public interface ResultRecordService extends IService { R resetData(Long recordId, int clearFlag); + List selectStaffIdsByFlowProcess(List flowProcess); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 972a107c..67472279 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1506,4 +1506,10 @@ public class ResultRecordServiceImpl extends ServiceImpl selectStaffIdsByFlowProcess(List flowProcess) { + return resultRecordMapper.selectStaffIdsByFlowProcess(flowProcess); + } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 0f15ce89..9f6dbab2 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -643,5 +643,15 @@ ORDER BY all_score desc + + + From 13fe3bdb7c6ebcaf2eb66dbf98d9f560464f4bff Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 10 Dec 2020 10:52:10 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/emun/WorkMsgTypeEnum.java | 1 + .../job/business/DingtalkBusiness.java | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java index 44fdfc05..fb0a0920 100644 --- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java +++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java @@ -25,6 +25,7 @@ public enum WorkMsgTypeEnum { TRANSFER(11, "绩效转交", "转交", "# @的绩效\n ## 己经转交"), CLEARN(12, "绩效转交", "转交", "# @的绩效\n ## 己经转交"), TASK_COMMENT(13, "任务评论", "去查看", "# 任务评论\n ## @1评论了你的@2的任务"), + TASK_UPDATE(14, "任务更新", "去更新", "# 任务更新\n ## 记得每天来更新任务哦"), // 您的2020年10月绩效考核已经开始，请尽快制定绩效目标 // 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认 ; 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 be5c7a3a..a1b63bef 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -661,6 +661,43 @@ public class DingtalkBusiness { } public String sendTaskInputMsg(List staffs){ + int m = 0; + String userIds = ""; + ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); + String token = dingTalkUtil.getAccessTokenWitchEntity(thirdAppConfig); + if(token != null && token.length() > 0){ + String url = homeUrl; + if(url.contains("?")){ + url += "&halokit=" + System.currentTimeMillis(); + }else{ + url += "?halokit=" + System.currentTimeMillis(); + } + url = URLEncoder.encode(url); + + + url = "dingtalk://dingtalkclient/action/openapp?corpid=" + thirdAppConfig.getCorpId() + + "&container_type=work_platform&app_id=0_" + + appid + "&redirect_type=jump&redirect_url=" + url; + + for (StaffEntity staff:staffs + ) { + + if(m < 100){ + userIds += (staff.getEmployeeId() + ","); + }else{ + //发送消息 + StaffEntity info = new StaffEntity(); + info.setId(0L); + info.setEmployeeId(userIds); + dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_UPDATE.getTitle(), + WorkMsgTypeEnum.TASK_UPDATE.getContent(), WorkMsgTypeEnum.TASK_UPDATE.getBtnText(), url, token); + m = 0; + userIds = staff.getEmployeeId() + ","; + } + m++; + } + } + return "OK"; } From 08da061ee790ad82fc40f333b6972d2656a8934a Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 10 Dec 2020 10:57:13 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3xml=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 462f41f5..f75e685a 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -111,7 +111,7 @@ select gmt_create,remark,label,type from lz_task_process_record where is_delete = 0 and task_id in - + #{taskId} order by gmt_create desc From 61d9b9237cde718e6963ffcc8a6c624661468ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 11:01:09 +0800 Subject: [PATCH 08/25] fix --- .../performance/dto/ResultTaskDto.java | 48 ++++--------------- .../performance/res/ResultTaskDetailRes.java | 10 +--- .../service/impl/ResultTaskServiceImpl.java | 33 ++++++++----- 3 files changed, 30 insertions(+), 61 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 636e619f..d0bff310 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -29,43 +29,13 @@ public class ResultTaskDto { //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") private BigDecimal processRate; - /** - * 任务名称 - * @return - */ - public String getName() { - return name; - } - /** - * 任务名称 - * @param name - */ - public void setName(String name) { - this.name = name; - } - - - - /** - * 任务的当前进度 - * @return - */ - public BigDecimal getProcessRate() { - return processRate; - } - /** - * 任务的当前进度 - * @param processRate - */ - public void setProcessRate(BigDecimal processRate) { - this.processRate = processRate; - } - - @Override - public String toString() { - return "ResultTaskDto{" + - "name='" + name + '\'' + - ", processRate=" + processRate + - '}'; - } + //头像 + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; + //姓名 + @ApiModelProperty(value = "姓名", name = "staffName") + private String staffName; + //标签 + @ApiModelProperty(value = "标签", name = "label") + private String label; } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java index fdf0b1e2..5e9feef0 100644 --- a/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java @@ -28,13 +28,5 @@ public class ResultTaskDetailRes { //任务列表 @ApiModelProperty(value = "集体进度", name = "resultTasks") private List resultTasks; - //头像 - @ApiModelProperty(value = "头像", name = "avatar") - private String avatar; - //姓名 - @ApiModelProperty(value = "姓名", name = "staffName") - private String staffName; - //标签 - @ApiModelProperty(value = "标签", name = "label") - private String label; + } 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 e0e4a0cf..274eae7e 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 @@ -28,6 +28,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; /** *

@@ -94,26 +95,32 @@ public class ResultTaskServiceImpl extends ServiceImpl { - res.setProcessRate(resultDetail1.getProcessRate()); - res.setTarget(resultDetail1.getTarget()); + if(resultDetail != null){ + res.setProcessRate(resultDetail.getProcessRate()); + res.setTarget(resultDetail.getTarget()); Long staffId = resultDetail.getStaffId(); - StaffEntity staffEntity = staffService.selectStaffById(staffId); - res.setAvatar(staffEntity.getAvatar()); - }); + staffEntity = staffService.selectStaffById(staffId); + } List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); - res.setResultTasks(resultTasks); + //获取最近更新记录 if(CollectionUtils.isNotEmpty(resultTasks)){ - ResultTaskDto dto = resultTasks.get(resultTasks.size() - 1); - TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(dto.getId()); - if(taskProcessRecordDto != null){ - res.setStaffName(taskProcessRecordDto.getStaffName()); - res.setLabel(taskProcessRecordDto.getLabel()); - } + StaffEntity finalStaffEntity = staffEntity; + resultTasks.forEach(resultTaskDto -> { + TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); + if(taskProcessRecordDto != null){ + resultTaskDto.setStaffName(taskProcessRecordDto.getStaffName()); + resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); + if(finalStaffEntity !=null){ + resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); + } + } + }); } + res.setResultTasks(resultTasks); return res; } From dd9409b3de66a4389e0f61d1c94003ba4a9dfa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 11:09:20 +0800 Subject: [PATCH 09/25] fix --- .../modules/performance/controller/ResultTaskController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b0f3cb53..1fbadedc 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -2,6 +2,7 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.req.ResultUpdateTaskReq; @@ -56,7 +57,7 @@ public class ResultTaskController { @PostMapping("/result/changeTaskList") @ApiOperation("任务变更记录") - @ApiResponses({@ApiResponse(code = 200,message = "成功")}) + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) public R changeTaskList(ChangeTaskListReq req){ PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); From 518031ea132874fe613addde693ad618b7ba76a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 13:45:34 +0800 Subject: [PATCH 10/25] fix --- src/main/resources/mapper/performance/ResultTaskMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 5b94ecd5..95ebb1e9 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -85,7 +85,7 @@ @@ -93,7 +93,7 @@ From 7ac236b0e3e94281f0b5a2918d1650c0707806fc Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 10 Dec 2020 13:53:33 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 3 --- .../lz/modules/job/business/DingtalkBusiness.java | 13 ++++++------- 2 files changed, 6 insertions(+), 10 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 878206c1..46587ba6 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -633,9 +633,6 @@ public class ResultRecordController extends AbstractController { resultRecordDetailDto.setRecortModelDtos(resultRecortModelDtos); return R.ok().put("data", resultRecordDetailDto); - - - } //目前支持已生成对象的。不支持当前非对象表中的数据，如果要使用请用常量值 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 a1b63bef..3fc77f65 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -679,12 +679,10 @@ public class DingtalkBusiness { "&container_type=work_platform&app_id=0_" + appid + "&redirect_type=jump&redirect_url=" + url; - for (StaffEntity staff:staffs - ) { - - if(m < 100){ - userIds += (staff.getEmployeeId() + ","); - }else{ + for (int i = 0; i < staffs.size(); i++) { + StaffEntity staff = staffs.get(i); + userIds += (staff.getEmployeeId() + ","); + if(m >= 99 || i == staffs.size() - 1){ //发送消息 StaffEntity info = new StaffEntity(); info.setId(0L); @@ -692,7 +690,8 @@ public class DingtalkBusiness { dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_UPDATE.getTitle(), WorkMsgTypeEnum.TASK_UPDATE.getContent(), WorkMsgTypeEnum.TASK_UPDATE.getBtnText(), url, token); m = 0; - userIds = staff.getEmployeeId() + ","; + userIds = ""; + continue; } m++; } From 7ff5c523278e59969096120c10f2279a484b736e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 14:25:12 +0800 Subject: [PATCH 12/25] fix --- .../com/lz/modules/performance/req/ResultUpdateTaskReq.java | 4 ++-- .../performance/service/impl/ResultTaskServiceImpl.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java index 5bf9d423..df5cb889 100644 --- a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java @@ -16,8 +16,8 @@ public class ResultUpdateTaskReq { @ApiModelProperty(value = "绩效详情id（如果任务id为空，必传）", name = "detailId") private Long detailId; //任务id - @ApiModelProperty(value = "任务id", name = "tasklId") - private Long tasklId; + @ApiModelProperty(value = "任务id", name = "taskId") + private Long taskId; //任务名称 @ApiModelProperty(value = "任务名称", name = "name") private String name; 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 274eae7e..af3a0127 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 @@ -233,6 +233,10 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 14:26:01 +0800 Subject: [PATCH 13/25] fix --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 46587ba6..5030c93b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -870,7 +870,7 @@ public class ResultRecordController extends AbstractController { }else{ ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq(); taskReq.setDetailId(resultDetail.getId()); - taskReq.setTasklId(taskDto.getId()); + taskReq.setTaskId(taskDto.getId()); taskReq.setName(taskDto.getName()); taskReq.setOrderBy(orderBy); taskReq.setProcessRate(taskDto.getProcessRate()); 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 af3a0127..679c4fb7 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 @@ -126,7 +126,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 14:43:13 +0800 Subject: [PATCH 14/25] fix --- .../performance/service/impl/ResultTaskServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 679c4fb7..2522008f 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 @@ -145,7 +145,9 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 17:21:15 +0800 Subject: [PATCH 15/25] fix --- .../lz/modules/performance/service/ResultTaskService.java | 1 + .../performance/service/impl/ResultTaskServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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 92b0cb1b..ff9d59e8 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -44,5 +44,6 @@ public interface ResultTaskService extends IService { List selectResultTasksByDetailId(Long detailId); void deleteTask(Long taskId); + List selectResultTaskDtosByDetailId(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 2522008f..439a4949 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 @@ -187,7 +187,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 17:25:39 +0800 Subject: [PATCH 16/25] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 439a4949..8432f550 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 @@ -176,7 +176,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 17:27:39 +0800 Subject: [PATCH 17/25] fix --- .../performance/service/impl/ResultTaskServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 8432f550..9b685ba2 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 @@ -187,7 +187,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:07:43 +0800 Subject: [PATCH 18/25] fix --- .../controller/ResultRecordController.java | 2 +- .../performance/dto/ResultTaskDto.java | 2 +- .../service/impl/ResultTaskServiceImpl.java | 36 ++++++++++--------- 3 files changed, 22 insertions(+), 18 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 5030c93b..acd0a8b0 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -873,7 +873,7 @@ public class ResultRecordController extends AbstractController { taskReq.setTaskId(taskDto.getId()); taskReq.setName(taskDto.getName()); taskReq.setOrderBy(orderBy); - taskReq.setProcessRate(taskDto.getProcessRate()); + taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate())); resultTaskService.saveOrUpdateResultTask(taskReq); orderBy++; } 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 d0bff310..a27cf643 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -28,7 +28,7 @@ public class ResultTaskDto { private String name; //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") - private BigDecimal processRate; + private Double processRate; //头像 @ApiModelProperty(value = "头像", name = "avatar") private String avatar; 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 9b685ba2..135068c6 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 @@ -145,38 +145,40 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); if(CollectionUtils.isEmpty(resultTaskDtos)){ log.info("未找到该绩效详情下得任务信息"); - return BigDecimal.ZERO; + return 0d; } int size = resultTaskDtos.size(); - BigDecimal rate = BigDecimal.ZERO; + Double rate = 0d; for(ResultTaskDto dto:resultTaskDtos){ rate = BigDecimalUtil.add(rate,dto.getProcessRate()); } - return BigDecimalUtil.divide(rate,BigDecimal.valueOf(size)).setScale(4); + double result = BigDecimalUtil.div(rate, size, 4); + return result; } @@ -187,16 +189,16 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); @@ -240,7 +244,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:19:25 +0800 Subject: [PATCH 19/25] fix --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f75e685a..f2057ec0 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -103,7 +103,7 @@ From 37e6d837971a3099a49f02b9cd4255605c7b994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 18:24:03 +0800 Subject: [PATCH 20/25] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 135068c6..4263d81c 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 @@ -113,6 +113,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:31:56 +0800 Subject: [PATCH 21/25] fix --- .../modules/performance/service/impl/ResultTaskServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 4263d81c..135068c6 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 @@ -113,7 +113,6 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Thu, 10 Dec 2020 18:39:14 +0800 Subject: [PATCH 22/25] fix --- .../lz/modules/performance/controller/ResultTaskController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1fbadedc..33ab6f1b 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -58,7 +58,7 @@ public class ResultTaskController { @PostMapping("/result/changeTaskList") @ApiOperation("任务变更记录") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) - public R changeTaskList(ChangeTaskListReq req){ + public R changeTaskList(@RequestBody ChangeTaskListReq req){ PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); } From 6716964d5b2da6e0ab25c269cd869ea3eba3f1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 10 Dec 2020 18:50:33 +0800 Subject: [PATCH 23/25] fxi --- .../service/impl/TaskProcessRecordServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 2a2ce79e..38053a81 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 @@ -84,8 +84,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId()); if(CollectionUtils.isNotEmpty(resultTaskDtos)){ List collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); @@ -103,9 +105,12 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ From 8be3f01815538b5a98479b40a875c02adc82694a 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 09:15:51 +0800 Subject: [PATCH 24/25] fix --- .../service/impl/TaskProcessRecordServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 38053a81..e2a430f7 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 @@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; @@ -114,8 +116,11 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ - dto.setAvatar(staffEntity.getAvatar()); - dto.setStaffName(staffEntity.getName()); + Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> { + dto.setAvatar(staffEntity1.getAvatar()); + dto.setStaffName(staffEntity1.getName()); + }); + } } return pageUtils; From 47aff425d0e715b25a1c903e119c56ff0a286f18 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 10:02:16 +0800 Subject: [PATCH 25/25] fix --- .../performance/enums/ProcessRecordEnum.java | 19 ++++++++++++++----- .../service/impl/ResultTaskServiceImpl.java | 7 ++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java index efeaa3b3..6993f557 100644 --- a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java @@ -6,14 +6,23 @@ package com.lz.modules.performance.enums; * @Date: 2020/12/9 14:08 */ public enum ProcessRecordEnum { - NAME(1,"修改名称"), - PROCESS(2,"修改进度"), - ALL(3,"全部修改"), - ADD(4,"增加"), - DELETE(5,"删除"), + NAME(1,"更新了名称"), + PROCESS(2,"更新了进度"), + ALL(3,"更新了名称和进度"), + ADD(4,"增加了任务"), + DELETE(5,"删除了任务"), ; + public static ProcessRecordEnum findByType(int type){ + for(ProcessRecordEnum recordEnum:ProcessRecordEnum.values()){ + if(type == recordEnum.getType()){ + return recordEnum; + } + } + return null; + + } private int type; private String desc; 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 135068c6..83b9e5db 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 @@ -111,11 +111,12 @@ public class ResultTaskServiceImpl extends ServiceImpl { TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); if(taskProcessRecordDto != null){ - resultTaskDto.setStaffName(taskProcessRecordDto.getStaffName()); - resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setLabel(byType.getDesc())); if(finalStaffEntity !=null){ resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - } + resultTaskDto.setStaffName(finalStaffEntity.getName()); + } } });