diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java index 459270a..2723a15 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java @@ -4,6 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo; +import org.apache.ibatis.annotations.Select; public interface HuzhouSubProjectinfoMapper extends BaseMapper { + /** + * 获取子项目名称 + * @param subProjectId 子项目id + * @return 子项目名称 + */ + @Select("select project_name from huzhou_sub_projectinfo where id = #{subProjectId}") + String getSubProjectName (String subProjectId); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index ddc2580..51446da 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -725,7 +725,6 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl log.info("待新上传的计划阶段名称:{}-->任务所处状态{}:",item.getTaskName(), item.getIsfinish())); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index aaaac37..3458d7d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -2918,6 +2918,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl finalList = Arrays.asList("a", "b","c"); + // Set allowedNames = new HashSet<>(finalList); + // 当 projectName 包含 "监理项目" 时,才对 taskName 做过滤 + // .filter(item -> { + // if (item.getProjectName() != null && item.getProjectName().contains("监理项目")) { + // return allowedNames.contains(item.getTaskName()); + // } + // return true; // 否则保留所有 + // }) planinfoService.saveBatch(updatedHuzhouPlaninfoList); }else {