From 96b1206c4b26c9f17b8bf3b03c12f593cb7636f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 25 Dec 2024 16:17:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=92=E7=BA=BF=E5=88=87?=
 =?UTF-8?q?=E5=89=B2=E6=9C=AA=E6=8C=89=E7=85=A7=E4=BD=9C=E4=B8=9A=E5=8C=BA?=
 =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/controller/zyjh/dto/PgWithPcDto.java     | 1 +
 src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgWithPcDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgWithPcDto.java
index 2b06e53..a4bc87b 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgWithPcDto.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgWithPcDto.java
@@ -12,4 +12,5 @@ public class PgWithPcDto {
     String dcPl;
     String zt;
     String zxZtName;
+    String zyq;
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index 9a33018..8277a7e 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -95,7 +95,10 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     public void pgWithForeman(PgWithPcDto dto){
         LambdaUpdateWrapper<DmYdjh> wrapper = new LambdaUpdateWrapper<DmYdjh>()
-                .eq(DmYdjh::getDcCh,dto.getDcCh()).eq(DmYdjh::getDcPl,dto.getDcPl()).ge(DmYdjh::getZt,32);
+                .eq(DmYdjh::getDcCh,dto.getDcCh())
+                .eq(DmYdjh::getDcPl,dto.getDcPl())
+                .eq(DmYdjh::getZyq1,dto.getZyq())
+                .ge(DmYdjh::getZt,32);
 
         String pgrq = DateUtil.date().toString("yyyy/MM/dd HH:mm:ss");
         switch (dto.getZt()){