提交代码

This commit is contained in:
lilin 2025-03-21 10:37:58 +08:00
parent eace5c5917
commit 93e393bf4a

View File

@ -56,18 +56,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
}
//如果项目类型 projectType 不为空
if (StringUtils.isNotEmpty(projectType)) {
//查询字典表获取项目类型对应数据字典
QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
queryWrapperSysDictionary.eq("itemcode", projectType);
queryWrapperSysDictionary.orderByAsc("orderno");
SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
if(sysDictionaryItems != null){
queryWrapper.like(Project::getProjectType, sysDictionaryItems.getDictName());
}else {
queryWrapper.like(Project::getProjectType, projectType);
}
queryWrapper.like(Project::getProjectType, projectType);
// //查询字典表获取项目类型对应数据字典
// QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
// queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
// queryWrapperSysDictionary.eq("itemcode", projectType);
// queryWrapperSysDictionary.orderByAsc("orderno");
// SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
// if(sysDictionaryItems != null){
// queryWrapper.like(Project::getProjectType, sysDictionaryItems.getDictName());
// }else {
// queryWrapper.like(Project::getProjectType, projectType);
// }
}
//如果项目名称 projectName 不为空
if (StringUtils.isNotEmpty(projectName)) {
@ -89,14 +89,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
@Override
public Boolean addSdproject(Project project) {
//查询字典表获取项目类型对应数据字典
QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
queryWrapperSysDictionary.orderByAsc("orderno");
SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
if(sysDictionaryItems != null){
project.setProjectType(sysDictionaryItems.getDictName());
}
// QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
// queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
// queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
// queryWrapperSysDictionary.orderByAsc("orderno");
// SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
// if(sysDictionaryItems != null){
// project.setProjectType(sysDictionaryItems.getDictName());
// }
//TODO 01.21沟通以后说是先不用管重复校验问题
@ -134,14 +134,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
@Override
public boolean updateSdproject(Project project) {
//查询字典表获取项目类型对应数据字典
QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
queryWrapperSysDictionary.orderByAsc("orderno");
SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
if(sysDictionaryItems != null){
project.setProjectType(sysDictionaryItems.getDictName());
}
// QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
// queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
// queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
// queryWrapperSysDictionary.orderByAsc("orderno");
// SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
// if(sysDictionaryItems != null){
// project.setProjectType(sysDictionaryItems.getDictName());
// }
int valueUpdate = projectMapper.updateById(project);