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

调整数据库表结构

Browse Source
This commit is contained in:
liuchengqian
2022-02-28 13:55:17 +08:00
parent 6ed366abe0
commit 3d053e63de
40 changed files with 1492 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,9 @@
package com.xkrs.util;
import com.xkrs.dao.DataDictDao;
import com.xkrs.model.entity.DataDict;
import com.xkrs.dao.QcInspectionItemDictDao;
import com.xkrs.model.entity.QcInspectionItemDict;
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;
@@ -22,27 +21,28 @@ import java.util.List;
public class Query {
@Resource
private DataDictDao dataDictDao;
private QcInspectionItemDictDao inspectionItemDictDao;
/**
* 动态多条件查询字典信息
*
* @return
*/
public List<DataDict> selectDataDict(String dictChineseName,String dictEnglishName) {
Specification<DataDict> specification = new Specification<DataDict>() {
public List<QcInspectionItemDict> selectDataDict(String dictChineseName, String dictEnglishName) {
Specification<QcInspectionItemDict> specification = new Specification<QcInspectionItemDict>() {
@Override
public Predicate toPredicate(Root<DataDict> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
public Predicate toPredicate(Root<QcInspectionItemDict> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
List<Predicate> list = new ArrayList<>();
if(dictChineseName != null && !"".equals(dictChineseName)){
if (dictChineseName != null && !"".equals(dictChineseName)) {
list.add(criteriaBuilder.equal(root.get("dictChineseName").as(String.class), dictChineseName));
}
if(dictEnglishName != null && !"".equals(dictEnglishName)){
if (dictEnglishName != null && !"".equals(dictEnglishName)) {
list.add(criteriaBuilder.equal(root.get("dictEnglishName").as(String.class), dictEnglishName));
}
Predicate[] predicates = new Predicate[list.size()];
return criteriaBuilder.and(list.toArray(predicates));
}
};
return dataDictDao.findAll(specification);
return inspectionItemDictDao.findAll(specification);
}
}