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 { public void pgWithForeman(PgWithPcDto dto){ LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() - .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()){