From 8f32cab62ebfa335d3c6a92d0c79affa7b644c97 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 21 Sep 2020 17:20:47 +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/RecordRoleController.java | 12 ++++++------ .../java/com/lz/modules/flow/model/Auth.java | 1 + .../service/impl/RecordAuthServiceImpl.java | 4 +++- .../service/impl/RecordRoleServiceImpl.java | 6 +----- .../sys/service/app/ResultRecordService.java | 2 +- .../app/impl/ResultRecordServiceImpl.java | 19 +++++++++++++++++-- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/RecordRoleController.java b/src/main/java/com/lz/modules/app/controller/RecordRoleController.java index c819a89b..c5f7d636 100644 --- a/src/main/java/com/lz/modules/app/controller/RecordRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/RecordRoleController.java @@ -16,10 +16,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -92,9 +89,12 @@ public class RecordRoleController { } } recordRoleAuths = recordRoleAuthService.selectByRoleId(role.getRoleId()); - Map staffEntityMap = recordRoleAuths.stream().collect(Collectors.toMap(RecordRoleAuth::getAuthId,p->p)); + Map staffEntityMap = new HashMap<>(); + for(RecordRoleAuth auth : recordRoleAuths){ + staffEntityMap.put(auth.getAuthId(),auth); + } for(Long menuId:menuIds){ - if(menuId <= 0 ){ + if(menuId <= 0 || (menuId.toString().endsWith("000000"))){ continue; } RecordRoleAuth recordRoleAuth = staffEntityMap.get(menuId); 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 1094049c..bfac4a0d 100644 --- a/src/main/java/com/lz/modules/flow/model/Auth.java +++ b/src/main/java/com/lz/modules/flow/model/Auth.java @@ -27,4 +27,5 @@ public class Auth { private int keyResult35; private int keyResult37; private int editScore; + private int deleteDetail; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index 6098226b..e9c6b390 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -107,7 +107,9 @@ public class RecordAuthServiceImpl extends ServiceImpl auths) { Map map = new HashMap<>(); if (CollectionUtils.isNotEmpty(auths)) { - map = auths.stream().collect(Collectors.toMap(RecordAuth::getIdentity, RecordAuth::getStatus)); + for(RecordAuth recordAuth : auths){ + map.put(recordAuth.getIdentity(),recordAuth.getStatus()); + } } return JSONObject.parseObject(JSON.toJSONString(map),Auth.class); } diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordRoleServiceImpl.java index 80e63b3f..5550793f 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordRoleServiceImpl.java @@ -134,11 +134,7 @@ public class RecordRoleServiceImpl extends ServiceImpl { ResultRecord initResult(Long staffId ,Integer recordType,Long roleId) ; - R checkApproval(Long recordId); + R checkApproval(ResultRecord resultRecord,Long userId); int getDepartmentLevelIndex(List list, int flowIndex); 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 24a50b17..816f5ca2 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 @@ -22,6 +22,7 @@ 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.enums.FlowRecordEnum; +import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.flow.model.TypeFlowDto; import com.lz.modules.flow.model.TypeRoleDto; @@ -41,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; @@ -353,7 +355,8 @@ public class ResultRecordServiceImpl extends ServiceImpl resultDetails = resultDetailService.selectByRecordId(recordId); if (CollectionUtils.isEmpty(resultDetails)) { return R.error("请先添加绩效。"); @@ -362,16 +365,28 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoleMap = recordAuthService.selectRoleIdByStaffRoleInfo(resultRecord.getFlowStaffIdRole()); + List listAuth = recordAuthService.selectAuthInfo(staffRoleMap.get(userId)); + Auth auth = recordAuthService.getAuth(listAuth); + // 如果是评分，查看是不是所有内容都己经评分 + if(auth.getEditScore() == 1 ){ + for(ResultDetail resultDetail : resultDetails ){ + if(resultDetail.getAcquireScore().compareTo(BigDecimal.ZERO) <= 0 ){ + return R.error("resultDetail[" + resultDetail.getId() + "] 评分必需 > 0 "); + } + } + } return R.ok(); } @Override public R approval(Long resultRecordId, Long userId) { ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId); - R r = resultRecordService.checkApproval(resultRecordId); + R r = resultRecordService.checkApproval(resultRecord,userId); if (!r.isSuccess()) { return r; } + StaffEntity mySelf = staffService.selectStaffById(userId); TwoTuple> flowInfo = getFlowInfo(resultRecord.getStaffId(), resultRecord.getType()); Long flowId = flowInfo.getFirst();