From c4ca52bcf377d075780bf2f2383be4599aa3757c Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 22 Sep 2020 01:20:32 +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 --- .../controller/ResultRecordController.java | 44 ++++++++++++------- .../java/com/lz/modules/flow/model/Auth.java | 1 + .../sys/service/app/ResultRecordService.java | 4 +- .../app/impl/ResultRecordServiceImpl.java | 25 ++++++----- 4 files changed, 46 insertions(+), 28 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 e45382f7..bbc7ccfb 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -134,14 +134,15 @@ public class ResultRecordController extends AbstractController { } } - PageUtils page = lzResultRecordService.queryPage(req, user); - return R.ok().put("page", page) - .put("departmentList1", departmentList1) + R r = lzResultRecordService.queryPage(req, user); + r .put("departmentList1", departmentList1) .put("departmentList2", departmentList2) .put("departmentList3", departmentList3) .put("department1", department1) .put("department2", department2) .put("department3", department3); + return r ; + } @@ -270,7 +271,12 @@ public class ResultRecordController extends AbstractController { 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(flowRecords!=null && flowRecords.size() == 2) { // 表示可以撤回 + auth.setCancel(1); + } } + return R.ok() .put("staffName", staffEntity.getName()) .put("department1", departmentDto.getDepartment1()) @@ -351,7 +357,7 @@ public class ResultRecordController extends AbstractController { * 信息 */ @RequestMapping("/recordIdsSubmit") - public R recordIdsSubmit(String recordIds) { + public R recordIdsSubmit(String recordIds,Integer batchOpt) { if (StringUtil.isBlank(recordIds)) { return R.error("请选择提交"); } @@ -367,20 +373,26 @@ public class ResultRecordController extends AbstractController { if (records == null) { return R.error("请选择状态为待提交的记录"); } - List resultRecords = resultRecordService.selectResultRecordByIds(records); - for (ResultRecord resultRecord : resultRecords) { - if (!resultRecord.getStatus().equals(3)) { - return R.error("您的提交记录中有状态不为侍提交的，请重新选择。"); - } - } - - R r = null; - for (ResultRecord resultRecord : resultRecords) { - r = resultRecordService.approval(resultRecord.getId(), getUserId()); - if (!r.isSuccess()) { - return r; + if(batchOpt == 1){ + List resultRecords = resultRecordService.selectResultRecordByIds(records); + for (ResultRecord resultRecord : resultRecords) { + if (!resultRecord.getStatus().equals(3)) { + return R.error("您的提交记录中有状态不为侍提交的，请重新选择。"); + } } + for (ResultRecord resultRecord : resultRecords) { + r = resultRecordService.approval(resultRecord.getId(), getUserId(),null); + if (!r.isSuccess()) { + return r; + } + } + }else if(batchOpt ==2 ){ + + }else if (batchOpt == 3 ){ + + }else if (batchOpt == 4 ){ + } if (r != null && r.isSuccess()) {//批量提交 StaffEntity mySelf = (StaffEntity) r.get("from"); diff --git a/src/main/java/com/lz/modules/flow/model/Auth.java b/src/main/java/com/lz/modules/flow/model/Auth.java index 65a52ccd..619599cf 100644 --- a/src/main/java/com/lz/modules/flow/model/Auth.java +++ b/src/main/java/com/lz/modules/flow/model/Auth.java @@ -30,5 +30,6 @@ public class Auth { private int deleteDetail; private int dissatisfied; private int submited;//是否己经提交 + private int cancel; } 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 b756d7c5..c48a39b5 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 @@ -44,7 +44,7 @@ public interface ResultRecordService extends IService { int deleteResultRecordById(Long id); - PageUtils queryPage(ResultRecordReq params, SysUserEntity user); + R queryPage(ResultRecordReq params, SysUserEntity user); void deleteBatchIds(List asList); @@ -53,7 +53,7 @@ public interface ResultRecordService extends IService { void updateFlowStaffIdRoleToNull(Long id); - R approval(Long resultRecordId, Long userId); + R approval(Long resultRecordId, Long userId,Integer status); List selectResultRecordByIds(List recordIds); 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 347abfa0..d9c6f442 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 @@ -1,6 +1,5 @@ package com.lz.modules.sys.service.app.impl; -import cn.hutool.db.StatementUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -153,7 +152,7 @@ public class ResultRecordServiceImpl extends ServiceImpl departmentIds = new ArrayList<>(); List tDepartments = departmentsDao.selectAll(); if (StringUtil.isNotBlank(params.getDepartment1()) || StringUtil.isNotBlank(params.getDepartment2()) @@ -209,6 +208,7 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByConditionByLeader(page, params) ); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM"); List resultRecords = pageUtils.getList(); if (CollectionUtils.isNotEmpty(resultRecords)) { @@ -225,7 +225,8 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByResultRecordIdType(req.getRecordResultId(),resultRecord.getType()); if(flowRecords!=null && flowRecords.size() == 2){ // 表示可以撤回 - r = reject(resultRecord,req,userId); - }else if(flowRecords!=null && flowRecords.size() > 2){ + r = reject(resultRecord, req, userId); + } else if (flowRecords != null && flowRecords.size() > 2) { return R.error("你的领导己经审批，不能撤回了"); } - }else if(req.getStatus() == 8 ){ + } else if (req.getStatus() == 8) { Long staffId = resultRecord.getStaffId(); Long approvalStaffId = resultRecord.getCurrentApprovalStaffId(); StaffEntity mySelf = staffService.selectStaffById(staffId); @@ -590,6 +592,9 @@ public class ResultRecordServiceImpl extends ServiceImpl