From 2830cc56080ce9770d060b9037c6b555e5d74227 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Wed, 18 Sep 2024 19:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/pgd/PgdTzjhController.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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<Dm_zhbmp> qgkws = dm_zhbmpRepository.findByBMLB("QGKW");
+        List<Dm_zhbmp> qgkws1 = dm_zhbmpRepository.findByBMLB("QGKW");
+        List<Dm_zhbmp>qgkws=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<Dm_zhbmp> zylxs = dm_zhbmpRepository.findByBMLB("zylx");
         List<Dm_zhbmp> pwwzs = dm_zhbmpRepository.findByBMLB("pwwz");
         List<Dm_zhbmp> dhql = dm_zhbmpRepository.findByBMLB("DHQL");
 
-        List<DmBzry> resourcesCodes = dmBzryService.list(new QueryWrapper<DmBzry>().select("DISTINCT resources_code as  resourcesCode ")
-            .eq("flag_status", "1").ne("isnull(resources_code,'')","").orderBy(true,true,"resources_code"));
+        List<DmBzry> resourcesCodes = dmBzryService.list(new QueryWrapper<DmBzry>().select("DISTINCT zyq as  zyq ")
+            .eq("flag_status", "1").in("zyq","二区","三区","四区","五区").orderBy(true,true,"zyq"));
 
 
         List<DmBzry> zyqs = dmBzryService.list(new QueryWrapper<DmBzry>().select(" resources_code","zyq")
             .eq("flag_status", "1").ne("isnull(resources_code,'')","").groupBy("resources_code","zyq").orderBy(true,true,"resources_code"));
 
         List<DmBzry> zyrys= dmBzryService.list(new QueryWrapper<DmBzry>()
-            .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<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("PBBM");