Pārlūkot izejas kodu

fix: save task content

shc 9 mēneši atpakaļ
vecāks
revīzija
9a3928d48b

+ 0 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -16,7 +16,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

+ 7 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -70,6 +70,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -577,9 +578,13 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
         if (!StrUtil.equalsAny(taskTypeIdStr, "8", "9", "10", "11")) {
             Integer pId = Integer.valueOf(tWmScorePackage.getId());
-            Map<Integer, List<WmPackageTaskTypeQty>> qtyList = packageTaskTypeQtyService.listPkgTaskTypeQtyByPkgIds(Collections.singletonList(pId)).stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getTaskTypeId));
+            Map<String, List<WmPackageTaskTypeQty>> qtyList = packageTaskTypeQtyService.listPkgTaskTypeQtyByPkgIds(Collections.singletonList(pId)).stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getTaskTypeName));
 
-            List<WmPackageTaskTypeQty> packageTaskTypeQtyList = qtyList.get(Integer.valueOf(taskTypeIdStr));
+            Map<String, WmTaskType> taskTypeMap = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery().lt(WmTaskType::getId, "100")).stream().collect(Collectors.toMap(WmTaskType::getId, Function.identity()));
+
+            WmTaskType taskType = taskTypeMap.get(taskTypeIdStr);
+
+            List<WmPackageTaskTypeQty> packageTaskTypeQtyList = qtyList.get(taskType.getTaskTypeName());
 
             if (CollUtil.isEmpty(packageTaskTypeQtyList)) {
                 throw new RuntimeException("当前积分包拆解结果中该服务类型数量为:0,不能提交!");