feat: 任务类型配置-回显

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskSubmissionRuleController.java

@@ -86,11 +86,15 @@ public class WmTaskSubmissionRuleController {
 			taskTypeList.forEach(map -> {
 				List<Map<String, Object>> children = (List<Map<String, Object>>) map.get("children");
 				if (CollUtil.isNotEmpty(children)) {
-					// 拼接是否启用标记
+					// child添加是否启用标记
 					children.forEach(childMap -> {
 						String taskTypeId = (String) childMap.get("taskTypeId");
 						childMap.put("enableFlag", ArrayUtil.contains(taskTypeIds, taskTypeId));
 					});
+					// 父级添加是否启用标记
+					map.put("enableFlag", children.stream().anyMatch(childMap -> Boolean.TRUE.equals(childMap.get("enableFlag"))));
+				} else {
+					map.put("enableFlag", Boolean.FALSE);
 				}
 			});
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskTypeSubCate2ServiceImpl.java

@@ -84,7 +84,7 @@ public class WmTaskTypeSubCate2ServiceImpl extends ServiceImpl<WmTaskTypeSubCate
 		// 查询基础任务类型
 		List<WmTaskType> baseTaskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
 				.eq(WmTaskType::getTaskTypeLevel, "1")
-				.eq(WmTaskType::getEnableFlag, EnableEnum.ENABLE.val())
+//				.eq(WmTaskType::getEnableFlag, EnableEnum.ENABLE.val())
 				.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.val()));
 		Map<String, String> baseTaskTypeMap = baseTaskTypeList.stream()
 				.collect(Collectors.toMap(WmTaskType::getTaskTypeName, WmTaskType::getId));