|
|
@@ -1,6 +1,8 @@
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
|
|
|
@@ -64,7 +66,9 @@ public class WmTaskSubmissionPercentRuleController {
|
|
|
.eq(WmTaskSubmissionPercentRule::getDeptId, deptId)
|
|
|
.eq(WmTaskSubmissionPercentRule::getOptFlag, CommonFlag.OptFlag.OK));
|
|
|
|
|
|
- Map<String, List<WmTaskSubmissionPercentRule>> collect = percentRules.stream().collect(Collectors.groupingBy(WmTaskSubmissionPercentRule::getBatchId));
|
|
|
+ Map<String, List<WmTaskSubmissionPercentRule>> collect = percentRules.stream()
|
|
|
+ .filter(rule -> StrUtil.isNotBlank(rule.getBatchId()) && !UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG.equals(rule.getSubCategory()))
|
|
|
+ .collect(Collectors.groupingBy(WmTaskSubmissionPercentRule::getBatchId));
|
|
|
|
|
|
// 查询taskType
|
|
|
List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
|
