提交代码
This commit is contained in:
parent
eace5c5917
commit
93e393bf4a
@ -56,18 +56,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||||||
}
|
}
|
||||||
//如果项目类型 projectType 不为空
|
//如果项目类型 projectType 不为空
|
||||||
if (StringUtils.isNotEmpty(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 不为空
|
//如果项目名称 projectName 不为空
|
||||||
if (StringUtils.isNotEmpty(projectName)) {
|
if (StringUtils.isNotEmpty(projectName)) {
|
||||||
@ -89,14 +89,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||||||
@Override
|
@Override
|
||||||
public Boolean addSdproject(Project project) {
|
public Boolean addSdproject(Project project) {
|
||||||
//查询字典表获取项目类型对应数据字典
|
//查询字典表获取项目类型对应数据字典
|
||||||
QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
|
// QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
|
||||||
queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
|
// queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
|
||||||
queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
|
// queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
|
||||||
queryWrapperSysDictionary.orderByAsc("orderno");
|
// queryWrapperSysDictionary.orderByAsc("orderno");
|
||||||
SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
|
// SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
|
||||||
if(sysDictionaryItems != null){
|
// if(sysDictionaryItems != null){
|
||||||
project.setProjectType(sysDictionaryItems.getDictName());
|
// project.setProjectType(sysDictionaryItems.getDictName());
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
//TODO 01.21沟通以后说是先不用管重复校验问题
|
//TODO 01.21沟通以后说是先不用管重复校验问题
|
||||||
@ -134,14 +134,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||||||
@Override
|
@Override
|
||||||
public boolean updateSdproject(Project project) {
|
public boolean updateSdproject(Project project) {
|
||||||
//查询字典表获取项目类型对应数据字典
|
//查询字典表获取项目类型对应数据字典
|
||||||
QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
|
// QueryWrapper<SysDictionaryItems> queryWrapperSysDictionary = new QueryWrapper<>();
|
||||||
queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
|
// queryWrapperSysDictionary.eq("parentcode", "zxxmlx");
|
||||||
queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
|
// queryWrapperSysDictionary.eq("itemcode", project.getProjectType());
|
||||||
queryWrapperSysDictionary.orderByAsc("orderno");
|
// queryWrapperSysDictionary.orderByAsc("orderno");
|
||||||
SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
|
// SysDictionaryItems sysDictionaryItems = sysDictionaryItemsMapper.selectOne(queryWrapperSysDictionary);
|
||||||
if(sysDictionaryItems != null){
|
// if(sysDictionaryItems != null){
|
||||||
project.setProjectType(sysDictionaryItems.getDictName());
|
// project.setProjectType(sysDictionaryItems.getDictName());
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
int valueUpdate = projectMapper.updateById(project);
|
int valueUpdate = projectMapper.updateById(project);
|
||||||
|
Loading…
Reference in New Issue
Block a user