|
@@ -112,8 +112,8 @@ public class WmPackageManager {
|
|
|
if (roles.contains(DIST_ADMIN_ROLE)) {
|
|
|
queryWrapper.eq(WmPackageRedemptionNotice::getFromEntId, user.getDeptId()).eq(WmPackageRedemptionNotice::getCreateBy, user.getUsername());
|
|
|
}
|
|
|
- // 事业部分管领导
|
|
|
- else if (roles.contains(BIZ_ADMIN_ROLE)) {
|
|
|
+ // 事业部分管领导 || 监督员
|
|
|
+ else if (CollUtil.containsAny(roles, List.of(BIZ_ADMIN_ROLE, 49, 52, 53, 56))) {
|
|
|
// 查询全部
|
|
|
}
|
|
|
// 服务商
|
|
@@ -259,14 +259,14 @@ public class WmPackageManager {
|
|
|
// 服务项目完成度
|
|
|
long okTaskScoreSum = 0L;
|
|
|
|
|
|
- for (SysCheckChainNodeCheckHistory node : okTasks){
|
|
|
+ for (SysCheckChainNodeCheckHistory node : okTasks) {
|
|
|
WmTask wmTask = taskId2EntityMap.get(node.getTargetId().toString());
|
|
|
- if (wmTask != null){
|
|
|
+ if (wmTask != null) {
|
|
|
okTaskScoreSum += wmTask.getScore();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- result.put("servicePlanDeviationRate", String.format("%.2f", okTaskScoreSum * 100.0 / ((planScore == 0) ? 1 : planScore)) );
|
|
|
+ result.put("servicePlanDeviationRate", String.format("%.2f", okTaskScoreSum * 100.0 / ((planScore == 0) ? 1 : planScore)));
|
|
|
|
|
|
// 任务完成比例
|
|
|
result.put("taskCompleteRate", String.format("%.2f", okTasks.size() * 100.0 / ((taskTotalCount == 0) ? 1 : taskTotalCount)));
|