WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库基础表搜索条件修改

Browse Source
This commit is contained in:
xiejunyu
2022-04-25 09:52:40 +08:00
parent 3e35bccad0
commit 8e0a013886
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+2 -2
View File
@@ -55,10 +55,10 @@
<!--搜索条件:项目名称,包含%,单独搜索--> <!--搜索条件:项目名称,包含%,单独搜索-->
<choose> <choose>
<when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'> <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
and plb.project_name like '%1%%' escape '1' and pni.project_name like '%1%%' escape '1'
</when> </when>
<otherwise> <otherwise>
and plb.project_name like concat('%',#{params.projectName},'%') and pni.project_name like concat('%',#{params.projectName},'%')
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
-3
View File
@@ -511,7 +511,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
throw new JeroBootException("Only one duty territory can be filled in for import. Please check line " + row); throw new JeroBootException("Only one duty territory can be filled in for import. Please check line " + row);
} }
} else { } else {
// String dictItemsName = sysDictService.queryDictItemByName(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut);
String dictItemValue = sysDictService.queryDictItemByValue(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut); String dictItemValue = sysDictService.queryDictItemByValue(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut);
if (StringUtils.isBlank(dictItemValue)) { if (StringUtils.isBlank(dictItemValue)) {
@@ -524,10 +523,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}else { }else {
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
//String itemValue = sysDictMapper.queryDictTextByKey(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory());
List<ProjectRelatedPersonnel> idList = list(queryWrapper.select("id").eq("duty_territory", projectRelatedPersonnel.getDutyTerritory()).eq("project_id",projectId)); List<ProjectRelatedPersonnel> idList = list(queryWrapper.select("id").eq("duty_territory", projectRelatedPersonnel.getDutyTerritory()).eq("project_id",projectId));
projectRelatedPersonnel.setId(idList.get(0).getId()); projectRelatedPersonnel.setId(idList.get(0).getId());
//projectRelatedPersonnel.setDutyTerritory(itemValue);
} }
} }
}else{ }else{