From e80cf744f88edce45912098905cab009812b5c2c Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 29 Sep 2020 08:57:29 +0800 Subject: [PATCH 1/4] =?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 --- src/main/resources/application-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f3c0b9d9..fca703e3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: ldd_biz - password: Hello1234 + url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: lz_manger + password: N8zfBwhOC initial-size: 10 max-active: 100 min-idle: 10 From de8fa66bb3e81463a407e74dc1037bfd50202574 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 29 Sep 2020 09:59:57 +0800 Subject: [PATCH 2/4] =?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 --- .../modules/app/controller/ResultRecordController.java | 4 ++-- .../sys/service/app/impl/ResultDetailServiceImpl.java | 9 +++++---- .../sys/service/app/impl/ResultRecordServiceImpl.java | 1 - src/main/resources/mapper/app/ResultDetailMapper.xml | 2 +- 4 files changed, 8 insertions(+), 8 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 da9b9341..b3d12f82 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -398,12 +398,12 @@ public class ResultRecordController extends AbstractController { } if(batchOpt == 3 ){ for (ResultRecord resultRecord : resultRecords) { - r = resultRecordService.reject(resultRecord,1); //更新驳回状态 + r = resultRecordService.approval(resultRecord.getId(), resultRecord.getCurrentApprovalStaffId(),null,false); if (!r.isSuccess()) { return r; } } - } else { + } else if(batchOpt == 4 ){ for (ResultRecord resultRecord : resultRecords) { List list = flowRecordService.selectFlowRecordByResultRecordIdType(resultRecord.getId(), 2); for (int i = list.size() - 1; i >= 0; i--) { diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index d5d8afed..2b7dc8fe 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -4,14 +4,16 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.BigDecimalUtil; import com.lz.common.utils.Constant; -import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.StaffService; import com.lz.modules.app.utils.t.TwoTuple; -import com.lz.modules.flow.entity.*; +import com.lz.modules.flow.entity.Flow; +import com.lz.modules.flow.entity.FlowDepartment; +import com.lz.modules.flow.entity.FlowRecord; +import com.lz.modules.flow.entity.FlowRelation; import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.service.*; @@ -257,14 +259,13 @@ public class ResultDetailServiceImpl extends ServiceImpl flowIndex - 1 ? flows.get(flowIndex - 1).getRoleId() : null; List staffRoleDtos = new ArrayList<>(); StaffEntity approvalStaff = resultRecordService.getApprovalStaff(resultRecord, departmentLevel, staffRoleDtos, roleId); roleNameMap.put(departmentLevel,approvalStaff.getName()); } } } - log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) + " roleNameMap : " + JSON.toJSONString(roleNameMap)); for (int i = flowIndex; i < flowIndex + 10; i++) { int index = resultRecordService.getDepartmentLevelIndex(flows, i); 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 82d34c42..53ba9a98 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 @@ -526,7 +526,6 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoleDtos, Long roleId) { StaffEntity approvalStaff = null; diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index bfab52ee..9528b9fc 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -97,7 +97,7 @@ priority = #{priority} ,gmt_modified = now() - where id = #{id} + where id = #{id} limit 1 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 3/4] =?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 @@ + From 4c131847c58a3a5aa06b0dbf485eb59f55ee2e87 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 29 Sep 2020 11:36:11 +0800 Subject: [PATCH 4/4] =?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 --- .../lz/modules/app/controller/ResultRecordController.java | 2 ++ .../com/lz/modules/sys/service/app/ResultRecordService.java | 1 + .../sys/service/app/impl/ResultRecordServiceImpl.java | 5 +++-- src/main/resources/mapper/flow/FlowRecordMapper.xml | 5 ++++- 4 files changed, 10 insertions(+), 3 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 a5ea5b79..5a419324 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -254,6 +254,8 @@ public class ResultRecordController extends AbstractController { String target = "审批通过"; if (resultComment.getStatus() == 5) { target = "驳回"; + }else if (resultComment.getStatus() == 6){ + target = "申述"; } comment.setTarget(target); comment.setKeyResult(resultComment.getComment()); 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 8949acd1..11101b50 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 @@ -90,6 +90,7 @@ public interface ResultRecordService extends IService { ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status); R reject( ResultRecord resultRecord,Integer status); + StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel, List staffRoleDtos, Long roleId); DepartmentsStaffRelateEntity getLeaderDepartmentsStaffRelateEntity(Long staffId); 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 12c71521..39545756 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 @@ -624,8 +624,9 @@ public class ResultRecordServiceImpl extends ServiceImpl select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and type = #{type} and status = 0 + + +