From a08797fee4d6d8ef06e6fb042f2d41ef05bf88f0 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 29 Sep 2020 10:34:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 8 +++++--- .../com/lz/modules/flow/dao/FlowRecordMapper.java | 2 ++ .../lz/modules/flow/service/FlowRecordService.java | 2 ++ .../flow/service/impl/FlowRecordServiceImpl.java | 5 +++++ .../lz/modules/sys/dao/app/ResultRecordMapper.java | 2 ++ .../modules/sys/service/app/ResultRecordService.java | 2 ++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 11 ++++++++++- src/main/resources/mapper/app/ResultRecordMapper.xml | 3 +++ src/main/resources/mapper/flow/FlowRecordMapper.xml | 3 +++ 9 files changed, 34 insertions(+), 4 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 b3d12f82..a5ea5b79 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -263,12 +263,14 @@ public class ResultRecordController extends AbstractController { String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId()); int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId()); - if(resultRecord.getStaffId().equals(getUserId()) && StringUtil.in(resultRecord.getStatus() ,1,2,3,5)){ - auth.setSubmited(1); - List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdType(req.getRecordResultId(),resultRecord.getType()); + if(resultRecord.getStaffId().equals(getUserId())){ + List flowRecords = flowRecordService.selectFlowRecordByResultRecordIdTypeStatus(req.getRecordResultId(),resultRecord.getType(),0); if(flowRecords!=null && flowRecords.size() == 2) { // 表示可以撤回 auth.setCancel(1); } + if(flowRecords!=null && flowRecords.size() >= 2){ + auth.setSubmited(1); + } } return R.ok() 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 3da2c632..ccf2ec62 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -46,4 +46,6 @@ public interface FlowRecordMapper extends BaseMapper { FlowRecord selectLastFlowNoStatusRecordByRecordId(@Param("recordId") Long recordId); List selectFlowRecordByResultRecordIdType(@Param("resultRecordId") Long resultRecordId, @Param("type") Integer type); + + List selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java index bf66f8a9..33055d1b 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -48,4 +48,6 @@ public interface FlowRecordService extends IService { FlowRecord selectLastFlowNoStatusRecordByRecordId(Long resultRecordId); List selectFlowRecordByResultRecordIdType(Long recordResultId, Integer type); + + List selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java index baaa9595..ccaf4b24 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java @@ -128,5 +128,10 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status) { + return flowRecordMapper.selectFlowRecordByResultRecordIdTypeStatus(recordResultId,type,status); + } + } 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 9b1da890..b59f5e22 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 @@ -63,4 +63,6 @@ public interface ResultRecordMapper extends BaseMapper { ResultRecord selectResultRecordByStaffIdStatus(@Param("staffId") Long staffId, @Param("status") int status); List targetReportList(@Param("req")ReportListReq req, @Param("staffIds") List staffIds, @Param("page") IPage page); + + ResultRecord selectLastResultRecordByStaffIdType(@Param("staffId") Long staffId, @Param("type") int type); } \ 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 540a4606..8949acd1 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 @@ -93,4 +93,6 @@ public interface ResultRecordService extends IService { StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel, List staffRoleDtos, Long roleId); DepartmentsStaffRelateEntity getLeaderDepartmentsStaffRelateEntity(Long staffId); + + ResultRecord selectLastResultRecordByStaffIdType(Long staffId, int type); } \ 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 53ba9a98..12c71521 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 @@ -324,6 +324,11 @@ public class ResultRecordServiceImpl extends ServiceImpl + diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index 15affb60..1dc8819f 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -158,6 +158,9 @@ +