From e077ea54a3fd55d4f56e337c556be034a83e4cdf 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, 30 Oct 2020 15:37:37 +0800 Subject: [PATCH] add log --- .../java/com/lz/modules/flow/dao/EvaluationGroupMapper.java | 2 +- .../com/lz/modules/flow/service/EvaluationGroupService.java | 2 +- .../modules/flow/service/impl/EvaluationGroupServiceImpl.java | 4 ++-- .../lz/modules/performance/controller/UserTaskController.java | 3 ++- .../performance/service/impl/AssessManagerServiceImpl.java | 3 ++- .../performance/service/impl/ChartResultServiceImpl.java | 3 +++ .../java/com/lz/modules/sys/dao/app/ResultRecordMapper.java | 2 +- src/main/resources/mapper/flow/EvaluationGroupMapper.xml | 4 ++-- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index b6418ff4..67f05b71 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java @@ -41,6 +41,6 @@ public interface EvaluationGroupMapper extends BaseMapper { EvaluationGroup selectEvaluationGroupByName(@Param("name") String name); - void deleteByIds(@Param("ids") List ids); + void deleteByCopyIds(@Param("ids") List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index 323470a2..abbd3f0e 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java @@ -48,7 +48,7 @@ public interface EvaluationGroupService extends IService { //获取考核组里面所有参与的人员信息，去除重复，去除离职 List selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup); - void deleteByIds(List ids); + void deleteByCopyIds(List ids); List checkStaff(EvaluationGroup evaluationGroup); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 9157782a..39fa9fee 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -255,8 +255,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl ids) { - evaluationGroupMapper.deleteByIds(ids); + public void deleteByCopyIds(List ids) { + evaluationGroupMapper.deleteByCopyIds(ids); } diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index b4ea27be..8aef05e2 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -33,9 +33,10 @@ public class UserTaskController extends AbstractController{ public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ PageUtils pageUtils = null; try { + //Long userId = getUserId(); pageUtils = assessService.userTaskList(req, 313L); } catch (Exception e) { - log.error("获取用户事项异常" ,e); + log.error("获取用户事项异常 userId:" ,e); return R.error(); } return R.ok().put("data",pageUtils); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index dd5683b5..57b2eaa1 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -115,7 +115,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { String[] split = groupIds.split(","); List ids = Arrays.asList(split); List collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList()); - evaluationGroupService.deleteByIds(collect); + //删除副本组 + evaluationGroupService.deleteByCopyIds(collect); } resultRecordMapper.batchDeleteByStartId(flowStart.getId()); return ; diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index ab4b38a9..0b896738 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -28,6 +28,7 @@ import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,6 +41,7 @@ import java.util.*; * @Date: 2020/10/14 16:53 */ @Service("chartResultService") +@Slf4j public class ChartResultServiceImpl implements ChartResultService { @Autowired @@ -70,6 +72,7 @@ public class ChartResultServiceImpl implements ChartResultService { //取最近一条记录 FlowStart flowStart = flowStartMapper.selectRecentlyLimt(); if(flowStart!=null){ + log.info("首次进入，默认返回最新记录 flowStartId:" + flowStart.getId()); startId = flowStart.getId(); defaultTime = flowStart.getName(); defaultCycleType = flowStart.getCycleType(); 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 78189749..db5988d3 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 @@ -89,7 +89,7 @@ public interface ResultRecordMapper extends BaseMapper { List countAssessNumByFlowProcess(@Param("req")AssessDetailReq req); - void batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List staffIds); + int batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List staffIds); List selectToScoreList(@Param("startId")Long startId,@Param("evaluationId")Long evaluationId); } \ No newline at end of file diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml index 4dcafff2..fdd95b47 100644 --- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml @@ -122,9 +122,9 @@ select * from lz_evaluation_group where name=#{name} and is_delete = 0 limit 1 - + update lz_evaluation_group set is_delete = 1 where is_delete=0 - and id in ( + and copy_id in ( #{id}