feat: baseid补全

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

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@ import com.qunzhixinxi.hnqz.admin.api.dto.WmTaskDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree;
@@ -55,6 +57,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -196,18 +199,29 @@ public class WmTaskTypeController {
 
             return R.ok(page);
         }
+        Map<String, WmTaskType> taskTypeMap = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
+                .le(WmTaskType::getId, "100")
+                .eq(WmTaskType::getEnableFlag, DelEnum.NOT_DEL.getVal())
+                .eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.getVal())).stream().collect(Collectors.toMap(WmTaskType::getTaskTypeName, Function.identity()));
+
 
         List<WmTaskTypeVO> voList = page.getRecords().stream().map(taskType -> {
             WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score", "taskScoreStart", "taskScoreEnd");
             typeVO.setScore(String.valueOf(taskType.getScore()));
             typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart()));
             typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd()));
+            String baseId = typeVO.getBaseId();
+            if (CharSequenceUtil.isBlank(baseId)) {
+                WmTaskType type = taskTypeMap.get(taskType.getTaskTypeName());
+                typeVO.setBaseId(Objects.nonNull(type) ? type.getBaseId() : typeVO.getTaskTypeName());
+            }
+
             return typeVO;
         }).collect(Collectors.toList());
 
         Page<WmTaskTypeVO> voPage = new Page<>(page.getCurrent(), page.getSize());
 
-        if (secondary){
+        if (secondary) {
             List<WmTaskTypeVO> collect = voList.stream().filter(vo -> Objects.isNull(vo.getDurgentId())).collect(Collectors.toList());
             voPage.setRecords(collect);
             voPage.setTotal(collect.size());

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

@@ -87,7 +87,6 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmScoreTaskTypeService;
 import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
-import com.qunzhixinxi.hnqz.admin.util.MapUtil;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;