From 1217c67b32bec70ea61f0c24415e169fa794cb51 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 26 Oct 2020 18:52:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=84=BF=E7=AB=A5=E7=9D=A1?= =?UTF-8?q?=E8=A2=8B=20t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 6 +--- .../app/controller/TestController.java | 14 ++++++++ .../com/lz/modules/app/dto/ApprovalDto.java | 1 + .../lz/modules/flow/dao/FlowRecordMapper.java | 2 ++ .../flow/service/FlowRecordService.java | 2 ++ .../service/impl/FlowRecordServiceImpl.java | 5 +++ .../app/impl/ResultRecordServiceImpl.java | 34 ++++++++++++------- .../mapper/flow/FlowRecordMapper.xml | 4 ++- 8 files changed, 49 insertions(+), 19 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 df3820e9..38cad552 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -652,6 +652,7 @@ public class ResultRecordController extends AbstractController { */ @RequestMapping("/new/approval") public R approval(ApprovalDto approvalDto) { + approvalDto.setLoginUserId(approvalDto.getLoginUserId()); return resultRecordService.newApproval(approvalDto); } @@ -660,9 +661,4 @@ public class ResultRecordController extends AbstractController { - - - - - } diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 33210f66..0b96c350 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -6,6 +6,7 @@ import com.dingtalk.api.response.OapiCrmAuthGroupMemberListResponse; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.dao.DepartmentsDao; +import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; @@ -261,8 +262,21 @@ public class TestController { @RequestMapping("/test/resultrecord") public void resultRecorcd(Long resultRecordId) throws Exception{ R r = resultRecordService.initFlowRecord(resultRecordId); + } + + /** + * 删除 + */ + // http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1 + @RequestMapping("/new/approval") + public R approval(Long resultRecordId,Integer status ) { + ApprovalDto approvalDto = new ApprovalDto(); + approvalDto.setResultRecordId(resultRecordId); + approvalDto.setStatus(status); + return resultRecordService.newApproval(approvalDto); + } diff --git a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java index 99445590..f5c8a9cd 100644 --- a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java +++ b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java @@ -7,4 +7,5 @@ public class ApprovalDto { private Long resultRecordId; private Integer status; //1 提交审批,审批通过,2 撤回,3 催办,5 驳回，6 申述，7 流程终止 private Long loginUserId; + private String menuName; //按钮名称 } 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 c6b13553..7739ceca 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -62,4 +62,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByRecordIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("status") Integer status); + + FlowRecord selectFlowRecordByRecordIdAndFlowId(@Param("resultRecordId") Long resultRecordId, @Param("flowId") Long flowId); } \ 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 16aeecc4..3bb55b2b 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -61,4 +61,6 @@ public interface FlowRecordService extends IService { void insertFlowRecords(List flowRecords); List selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status); + + FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long id); } \ 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 56b0e944..66904608 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 @@ -168,4 +168,9 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status) { return flowRecordMapper.selectFlowRecordByRecordIdStatus(resultRecordId,status); } + + @Override + public FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long flowId) { + return flowRecordMapper.selectFlowRecordByRecordIdAndFlowId(resultRecordId,flowId); + } } 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 4cddc7c0..26ae8c27 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 @@ -818,21 +818,27 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 1); + if(flowRecords!=null && flowRecords.size()>0){ + return R.error("领导己经审批，不能撤回"); + } + return newReject(approvalDto); + } + private R newSubmit(ApprovalDto approvalDto) { List flowRecords = flowRecordService.selectFlowRecordByRecordId(approvalDto.getResultRecordId()); ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId()); @@ -869,12 +875,16 @@ public class ResultRecordServiceImpl extends ServiceImpl select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and status = #{status} - +