liuchengqian/industrial_measurement
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新dao返回值类型

Browse Source
This commit is contained in:
liuchengqian
2022-03-01 10:20:08 +08:00
parent 9cf2698ec8
commit 5ef4df2d6f
8 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/xkrs/util/Query.java
View File

@ -4,7 +4,6 @@ import com.xkrs.dao.DataDictDao;
import com.xkrs.model.entity.DataDict;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import javax.persistence.criteria.CriteriaBuilder;
@ -26,18 +25,19 @@ public class Query {
/**
* 动态多条件查询字典信息
*
* @return
*/
public List<DataDict> selectDataDict(String dictChineseName,String dictEnglishName) {
public List<DataDict> selectDataDict(String inspectionItemName, String inspectionItemCode) {
Specification<DataDict> specification = new Specification<DataDict>() {
@Override
public Predicate toPredicate(Root<DataDict> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
List<Predicate> list = new ArrayList<>();
if(dictChineseName != null && !"".equals(dictChineseName)){
list.add(criteriaBuilder.equal(root.get("dictChineseName").as(String.class), dictChineseName));
if (inspectionItemName != null && !"".equals(inspectionItemName)) {
list.add(criteriaBuilder.equal(root.get("inspectionItemName").as(String.class), inspectionItemName));
}
if(dictEnglishName != null && !"".equals(dictEnglishName)){
list.add(criteriaBuilder.equal(root.get("dictEnglishName").as(String.class), dictEnglishName));
if (inspectionItemCode != null && !"".equals(inspectionItemCode)) {
list.add(criteriaBuilder.equal(root.get("inspectionItemCode").as(String.class), inspectionItemCode));
}
Predicate[] predicates = new Predicate[list.size()];
return criteriaBuilder.and(list.toArray(predicates));