From 12575cd84a267c6624d1f28ff183c82ef3852723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 16:45:27 +0800 Subject: [PATCH 1/3] fix --- .../com/lz/modules/flow/dao/EvaluationGroupMapper.java | 2 ++ .../com/lz/modules/performance/req/AssessDetailReq.java | 2 ++ .../service/impl/AssessManagerServiceImpl.java | 9 +++++++++ src/main/resources/mapper/app/ResultRecordMapper.xml | 6 +++--- src/main/resources/mapper/flow/EvaluationGroupMapper.xml | 9 +++++++++ 5 files changed, 25 insertions(+), 3 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 4d5b7fdd..52a2fe34 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java @@ -45,4 +45,6 @@ public interface EvaluationGroupMapper extends BaseMapper { void deleteByCopyIds(@Param("ids") List ids); + List selectIdsByCopyIds(@Param("copyIds")String copyIds); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index 3f2ca943..25d648e9 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -35,4 +35,6 @@ public class AssessDetailReq extends BasePage{ private List departmentIds; private Long loginUserId; + + private String copyEvaluationIds; } 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 3850dab3..00ea06dd 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 @@ -11,6 +11,7 @@ import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.dto.StaffSimpleDto; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.dao.EvaluationGroupMapper; import com.lz.modules.flow.dao.EvaluationStartStaffMapper; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.EvaluationGroup; @@ -36,6 +37,7 @@ import com.lz.modules.sys.service.app.ResultRecordService; import com.sun.org.apache.regexp.internal.RE; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -76,6 +78,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { private FlowStartService flowStartService; @Autowired private AssessService assessService; + @Autowired + private EvaluationGroupMapper evaluationGroupMapper; @Override public PageUtils assessList(AssessListReq req) { @@ -115,6 +119,11 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Override public PageUtils assessDetail(AssessDetailReq req) { + //拼接拷贝组 + if(StringUtil.isNotBlank(req.getEvaluationIds())){ + List evaluationIds = evaluationGroupMapper.selectIdsByCopyIds(req.getEvaluationIds()); + req.setCopyEvaluationIds(StringUtils.join(evaluationIds,",")); + } PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( page -> resultRecordMapper.selectAssessListByStartId(page,req) ); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index e59dd064..eeb6feb0 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -434,14 +434,14 @@ + select id from lz_evaluation_group where is_delete = 0 + and copy_id in ( + + #{copy_id} + + ) + From a7a6d7480e1c5cc6d8f2fe816a866d8af4b16058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 16:57:31 +0800 Subject: [PATCH 2/3] fix --- .../performance/service/impl/AssessManagerServiceImpl.java | 4 ++++ .../performance/service/impl/ChartResultServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 00ea06dd..b17ecba2 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 @@ -81,6 +81,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Autowired private EvaluationGroupMapper evaluationGroupMapper; + + @Override public PageUtils assessList(AssessListReq req) { List data = new ArrayList<>(); @@ -268,6 +270,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { log.error("执行中状态跳过失败 recorId:" + aLong,e); } }); + //更新flowRecord记录 + } 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 2b87921d..15dcf371 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 @@ -236,7 +236,7 @@ public class ChartResultServiceImpl implements ChartResultService { int count = resultRecordService.count(new QueryWrapper() .eq("is_delete", 0) .eq("start_id", startId) - .in("department_id",mandepartmentIds)); + .in(CollectionUtils.isNotEmpty(mandepartmentIds),"department_id",mandepartmentIds)); ChartStatistical all = new ChartStatistical(); all.setDesc("参与人数"); From 00f5dbdace2707c5aaaa4ee001ec32779dec7288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 17:24:02 +0800 Subject: [PATCH 3/3] fix --- .../com/lz/modules/flow/dao/FlowRecordMapper.java | 2 ++ .../service/impl/AssessManagerServiceImpl.java | 12 ++++++++++++ .../service/impl/ChartResultServiceImpl.java | 4 +++- src/main/resources/mapper/flow/FlowRecordMapper.xml | 12 ++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java index 5147fb2c..97d0ffd5 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -75,4 +75,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByResultRecordId(@Param("resultRecordId") Long resultRecordId); FlowRecord selectFlowRecordByRecordIdMinIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("id") Long id, @Param("status") int status); + + int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") Long processId); } \ No newline at end of file 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 b17ecba2..4fdc1bfe 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 @@ -13,6 +13,7 @@ import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.EvaluationGroupMapper; import com.lz.modules.flow.dao.EvaluationStartStaffMapper; +import com.lz.modules.flow.dao.FlowRecordMapper; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.EvaluationStartStaff; @@ -80,6 +81,10 @@ public class AssessManagerServiceImpl implements AssessManagerService { private AssessService assessService; @Autowired private EvaluationGroupMapper evaluationGroupMapper; + @Autowired + private FlowRecordMapper flowRecordMapper; + + public static final Long processId = 1L; @@ -271,7 +276,14 @@ public class AssessManagerServiceImpl implements AssessManagerService { } }); //更新flowRecord记录 + List objects = resultRecordService.listObjs(new QueryWrapper() + .eq("is_delete", 0) + .eq("start_id", req.getStartId()) + .eq("evaluation_id", evaluation).select("id")); + List collect = objects.stream().map(o -> Long.valueOf(String.valueOf(o))).collect(toList()); + + flowRecordMapper.batchUpdateExecution(collect,processId); } 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 15dcf371..ea3bd1c3 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 @@ -67,6 +67,8 @@ public class ChartResultServiceImpl implements ChartResultService { @Autowired private AssessService assessService; + private static final Long processId = 1L; + @Override public List chartReport(Long startId,Long staffId) { @@ -246,7 +248,7 @@ public class ChartResultServiceImpl implements ChartResultService { for(ChartStatistical statistical:process){ map.put(statistical.getDesc(),statistical.getNum()); } - List charts = flowChartService.selectFlowChartByFlowManagerId(1L); + List charts = flowChartService.selectFlowChartByFlowManagerId(processId); for(FlowChart chart:charts){ ChartStatistical statistical = new ChartStatistical(); diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index ba50726d..5104c167 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -261,6 +261,18 @@ select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and id > #{id} and status = #{status} order by id asc limit 1 + + UPDATE lz_flow_record + SET status = 4 + ,gmt_modified = now() + where is_delete = 0 and status !=4 and flow_process = 2 and process_id = #{processId} + + + #{record_id} + + ) + +