From b1bf2d108e18bde315c151813a5dcbcc529bc5b7 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 18 Jan 2024 09:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/df/domain/BsSgcDfJbxx.java | 4 ++-- .../java/com/kms/yg/sz/domain/BsSgcSzGcda.java | 4 ++-- .../kms/yg/sz/service/BsSgcSzAqrwService.java | 16 ---------------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java index 0bb9c97b..e37d6d96 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java @@ -200,10 +200,10 @@ public class BsSgcDfJbxx extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date recordTakeEffectTime; + private Date effDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date recordLoseEfficacyTime; + private Date exprDate; private String adcd; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java index 3e34fdb0..879ab299 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java @@ -230,9 +230,9 @@ public class BsSgcSzGcda extends BaseEntity private String auxiliaryGateHolesWidth; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date recordTakeEffectTime; + private Date effDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date recordLoseEfficacyTime; + private Date exprDate; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 4859bb0c..a2009260 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -50,23 +50,7 @@ public class BsSgcSzAqrwService extends BaseService fin = records.stream().filter(x -> x.getTaskStatus().equals("1")).collect(Collectors.toList()); - /* for (BsSgcSzAqrw bsSgcSzAqrw : noFin) { - List jbxxList = bsSgcSzSafeJbxxMapper.selectBatchIds(Arrays.asList(bsSgcSzAqrw.getSluiceIds())); -// List no = jbxxList.stream().filter(x -> x.getSecurityStatus().equals("0")).collect(Collectors.toList()); - - bsSgcSzAqrw.setIncompletionNumber((long) no.size()); - - bsSgcSzAqrw.setCompletionNumber(bsSgcSzAqrw.getTaskSluiceNumber()-no.size()); - - - } - - ArrayList bsSgcSzAqrws = new ArrayList<>(); - - bsSgcSzAqrws.addAll(noFin); - bsSgcSzAqrws.addAll(fin); - page.setRecords(bsSgcSzAqrws);*/ return page; }