From cbf0ced7f5c5f875c392910fc6d5764d407a4ba9 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 20 Nov 2020 10:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E6=B0=A2?= =?UTF-8?q?=E6=B0=94=E6=83=A7=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/business/DingtalkBusiness.java | 20 ++++++++++++++++--- .../controller/EvaluationGroupController.java | 5 +++++ .../controller/FlowChartController.java | 3 +++ .../controller/FlowStartController.java | 3 +++ .../controller/ResultModelController.java | 4 ++++ .../controller/ResultTagetLibController.java | 5 ++++- .../third/dao/ThirdMsgSendRecordMapper.java | 7 +++++++ .../service/ThirdMsgSendRecordService.java | 4 ++++ .../impl/ThirdMsgSendRecordServiceImpl.java | 6 ++++++ .../mapper/third/ThirdMsgSendRecordMapper.xml | 8 ++++++++ 10 files changed, 61 insertions(+), 4 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 039a98ee..ce565832 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -224,7 +224,8 @@ public class DingtalkBusiness { public String delWorkMSGWithStart(List recordIds){ - ThreadSendMessage threadSendMessage = new ThreadSendMessage(recordIds, WorkMsgTypeEnum.CLEARN, appid); + ThreadSendMessage threadSendMessage = new ThreadSendMessage(); + threadSendMessage.setUpdateData(recordIds, WorkMsgTypeEnum.CLEARN, appid); Thread thread = new Thread(threadSendMessage); thread.start(); @@ -383,11 +384,18 @@ public class DingtalkBusiness { this.appid = appid; } - public ThreadSendMessage(List recordIds, WorkMsgTypeEnum typeEnum, String appid){ + + + public void setUpdateData(List recordIds, WorkMsgTypeEnum typeEnum, String appid){ this.recordIds = recordIds; workMsgTypeEnum = typeEnum; this.appid = appid; } + public ThreadSendMessage(){ + + } + + private void sendNotic(Long staffId, String employeeId, String content1, String content2, String content3, @@ -417,7 +425,13 @@ public class DingtalkBusiness { logger.info("绩效清空"); - //List threadSendMessages = thirdMsgSendRecordService.selectThirdMsgSendRecordsByRecordIds(resultRecordIds); + List threadSendMessages + = thirdMsgSendRecordService.selectThirdMsgSendRecordsByRecordIds(recordIds, 1, 1); + logger.info("需要删除的条数为{}", threadSendMessages.size()); + for (ThirdMsgSendRecord thirdMsgSendRecord:threadSendMessages + ) { + dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token); + } }else{ for (StaffSimpleInfo info:toStaffids ) { diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 7580c83a..9ff5ef53 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -16,6 +16,7 @@ import com.lz.modules.performance.req.CheckStaffReq; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.SysUserEntity; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,6 +28,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/evaluationGroup") @Api(tags="考评组") +@Slf4j public class EvaluationGroupController extends AbstractController { @@ -116,6 +118,7 @@ public class EvaluationGroupController extends AbstractController { @ApiOperation("获取考评组列表") @ApiResponses({@ApiResponse(code=200,message = "成功", response=EvaluationGroup.class)}) public R getGroups(@RequestBody @ApiParam EvaluationGroupReq req) { + log.info("获取考评组列表数据{}", req); SysUserEntity sysUserEntity = getUser(); PageUtils pageUtils = evaluationGroupService.selectEvaluationGroupByReq(req, sysUserEntity); return R.ok().put("data",pageUtils); @@ -134,6 +137,7 @@ public class EvaluationGroupController extends AbstractController { @ApiOperation("保存考评组") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = EvaluationGroup.class)}) public R save(@RequestBody @ApiParam EvaluationGroup evaluationGroup) { + log.info("保存考评组数据{}", evaluationGroup); EvaluationGroup evaluationGroup1 = evaluationGroupService.selectEvaluationGroupByName(evaluationGroup.getName()); List staffRoles = null; if(evaluationGroup.getId() != null && evaluationGroup.getId().intValue() > 0){ @@ -228,6 +232,7 @@ public class EvaluationGroupController extends AbstractController { @ApiOperation("校验是否有跨组人员") @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 504,message = "已跨组",response = StaffSimpleDto.class)}) public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) { + log.info("校验跨组人员接受数据{}", checkStaffReq); return evaluationGroupService.checkStaff(checkStaffReq); } } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 063e2980..64d7c8b3 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -17,6 +17,7 @@ import com.lz.modules.flow.service.FlowChartRoleService; import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowManagerService; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ import java.util.stream.Stream; @RestController @RequestMapping("/flowChart") @Api(tags={"考核节点"}) +@Slf4j public class FlowChartController { @@ -142,6 +144,7 @@ public class FlowChartController { @ApiOperation("保存流程节点小流程列表") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowChartDetailRecord.class)}) public R saveDetailProcs(@RequestBody @ApiParam FlowChartDetailRecordListReq flowChartDetailRecordListReq) { + log.info("保存流程小结点接受的数据{}", flowChartDetailRecordListReq); if(flowChartDetailRecordListReq.getRecordSimpleDtos() != null && flowChartDetailRecordListReq.getRecordSimpleDtos().size() > 0){ List inserts = new ArrayList<>(); List updaes = new ArrayList<>(); diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index 96939660..bb7a0fc0 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -23,6 +23,7 @@ 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 io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +38,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/flowStart") @Api(tags = "发起考核") +@Slf4j public class FlowStartController { @@ -69,6 +71,7 @@ public class FlowStartController { @ApiOperation("发起新的考核任务") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowStart.class)}) public R save(@RequestBody @ApiParam FlowStart flowStart) { + log.info("发起考核接受数据{}", flowStart); return flowStartService.saveStart(flowStart); } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java index 420a77d4..83021543 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -12,6 +12,7 @@ import com.lz.modules.flow.req.ResultTagetLibItemReq; import com.lz.modules.flow.service.ResultModelService; import com.lz.modules.performance.service.ResultTagetLibService; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -24,6 +25,7 @@ import java.util.List; @RestController @RequestMapping("/resultModel") @Api(tags = "考核模板相关") +@Slf4j public class ResultModelController { @@ -86,6 +88,7 @@ public class ResultModelController { @PostMapping("/save") @ApiOperation("保存模板中的考核维度") public R save(@RequestBody @ApiParam ResultModel resultModel) { + log.info("保存模板中的考核数据{}", resultModel); if(resultModel.getId() != null && resultModel.getId().intValue() > 0){ return update(resultModel); } @@ -96,6 +99,7 @@ public class ResultModelController { @PostMapping("/saveDetail") @ApiOperation("保存模板中的考核维度及指标") public R saveDetail(@RequestBody @ApiParam ResultModelDetailReq resultModelDetailReq) { + log.info("保存指标的数据{}", resultModelDetailReq); return resultModelService.saveDetail(resultModelDetailReq); } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java b/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java index 67b06801..56529384 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java @@ -8,12 +8,14 @@ import com.lz.modules.flow.model.ResultTagetLibDto; import com.lz.modules.flow.req.ResultTagetLibSearchReq; import com.lz.modules.performance.service.ResultTagetLibService; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/resultTagetLib") @Api(tags = "考核指标相关") +@Slf4j public class ResultTagetLibController { @@ -28,6 +30,7 @@ public class ResultTagetLibController { @ApiOperation("搜索指标库") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultTagetLibDto.class)}) public R GetTargetLibs(@RequestBody @ApiParam ResultTagetLibSearchReq req) { + log.info("搜索指标请求的数据{}", req); PageUtils pageUtils = resultTagetLibService.selectResultTagetLibByReq(req); return R.ok().put("data",pageUtils); } @@ -50,7 +53,7 @@ public class ResultTagetLibController { @PostMapping("/save") @ApiOperation("保存考核指标") public R save(@RequestBody @ApiParam ResultTagetLib resultTagetLib) { - + log.info("保存考核指标{}", resultTagetLib); if(resultTagetLib.getId() != null && resultTagetLib.getId().intValue() > 0){ return update(resultTagetLib); } diff --git a/src/main/java/com/lz/modules/third/dao/ThirdMsgSendRecordMapper.java b/src/main/java/com/lz/modules/third/dao/ThirdMsgSendRecordMapper.java index 9f5c6d71..036a4576 100644 --- a/src/main/java/com/lz/modules/third/dao/ThirdMsgSendRecordMapper.java +++ b/src/main/java/com/lz/modules/third/dao/ThirdMsgSendRecordMapper.java @@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.third.entity.ThirdMsgSendRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface ThirdMsgSendRecordMapper extends BaseMapper { @@ -35,4 +38,8 @@ public interface ThirdMsgSendRecordMapper extends BaseMapper @Param("staffId") Long staffId, @Param("workType") int workType, @Param("status") int status); + + List selectThirdMsgSendRecordsByRecordIds(@Param("list") List recordIds, + @Param("type") int type, + @Param("status") int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/third/service/ThirdMsgSendRecordService.java b/src/main/java/com/lz/modules/third/service/ThirdMsgSendRecordService.java index 4ac5432a..07de4584 100644 --- a/src/main/java/com/lz/modules/third/service/ThirdMsgSendRecordService.java +++ b/src/main/java/com/lz/modules/third/service/ThirdMsgSendRecordService.java @@ -2,8 +2,10 @@ package com.lz.modules.third.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.third.entity.ThirdMsgSendRecord; +import java.util.List; import java.util.Map; /** @@ -38,4 +40,6 @@ public interface ThirdMsgSendRecordService extends IService void insert(ThirdMsgSendRecord thirdMsgSendRecord); ThirdMsgSendRecord selectThirdMsgSendRecordByWorkIdAndStaffIdAndTypeAndStatus(Long workId, Long staffId, int workType, int status); + + List selectThirdMsgSendRecordsByRecordIds(List recordIds, int type, int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/third/service/impl/ThirdMsgSendRecordServiceImpl.java b/src/main/java/com/lz/modules/third/service/impl/ThirdMsgSendRecordServiceImpl.java index f33d9f5e..94cf9aac 100644 --- a/src/main/java/com/lz/modules/third/service/impl/ThirdMsgSendRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/third/service/impl/ThirdMsgSendRecordServiceImpl.java @@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -96,4 +97,9 @@ public class ThirdMsgSendRecordServiceImpl extends ServiceImpl selectThirdMsgSendRecordsByRecordIds(List recordIds, int type, int status){ + return thirdMsgSendRecordMapper.selectThirdMsgSendRecordsByRecordIds(recordIds, type, status); + } + } diff --git a/src/main/resources/mapper/third/ThirdMsgSendRecordMapper.xml b/src/main/resources/mapper/third/ThirdMsgSendRecordMapper.xml index d1a81b1c..2db16611 100644 --- a/src/main/resources/mapper/third/ThirdMsgSendRecordMapper.xml +++ b/src/main/resources/mapper/third/ThirdMsgSendRecordMapper.xml @@ -193,5 +193,13 @@ and work_type = #{workType} and status=#{status} and is_delete = 0 limit 1 + +