diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java index 230c09d..5b91f77 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java @@ -144,20 +144,27 @@ public class PgdTzjhController { returnMap.put("ycldws", ycldws); returnMap.put("bmbm", bmbm); - List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + List qgkws1 = dm_zhbmpRepository.findByBMLB("QGKW"); + Listqgkws=new ArrayList<>(); + for (Dm_zhbmp qgkw : qgkws1) { + if(qgkw.getBmsm().equals("1") || qgkw.getBmsm().equals("2")|| qgkw.getBmsm().equals("3")||qgkw.getBmsm().equals("4") ){ + continue; + } + qgkws.add(qgkw); + } List zylxs = dm_zhbmpRepository.findByBMLB("zylx"); List pwwzs = dm_zhbmpRepository.findByBMLB("pwwz"); List dhql = dm_zhbmpRepository.findByBMLB("DHQL"); - List resourcesCodes = dmBzryService.list(new QueryWrapper().select("DISTINCT resources_code as resourcesCode ") - .eq("flag_status", "1").ne("isnull(resources_code,'')","").orderBy(true,true,"resources_code")); + List resourcesCodes = dmBzryService.list(new QueryWrapper().select("DISTINCT zyq as zyq ") + .eq("flag_status", "1").in("zyq","二区","三区","四区","五区").orderBy(true,true,"zyq")); List zyqs = dmBzryService.list(new QueryWrapper().select(" resources_code","zyq") .eq("flag_status", "1").ne("isnull(resources_code,'')","").groupBy("resources_code","zyq").orderBy(true,true,"resources_code")); List zyrys= dmBzryService.list(new QueryWrapper() - .eq("flag_status", "1").ne("isnull(zyq,'')","").orderBy(true,true,"zyq")); + .eq("flag_status", "1").ne("isnull(zyq,'')","").in("zyq","二区","三区","四区","五区").orderBy(true,true,"zyq")); List kwxxs = dm_zhbmpRepository.findByBMLB("PBBM");