From 80b1b53f6727e925dfbb8c7432a6899c204eb7eb Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Fri, 12 Jul 2024 14:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BC=96=E7=A0=81key=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionObjectController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionObjectController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionObjectController.java index ac1e8e6..f97c086 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionObjectController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionObjectController.java @@ -94,17 +94,14 @@ public class InspectionObjectController extends DafController { qw.lambda().eq(InspectionObject::getObjectName, inspectionObject.getObjectName()); } if (null != inspectionObject.getStation()) { - qw.lambda().like(InspectionObject::getStation, inspectionObject.getStation()); + qw.lambda().eq(InspectionObject::getStation, inspectionObject.getStation()); } if (null != inspectionObject.getIstatus()) { - qw.lambda().like(InspectionObject::getIstatus, inspectionObject.getIstatus()); + qw.lambda().eq(InspectionObject::getIstatus, inspectionObject.getIstatus()); } if (StringUtil.isNotEmpty(inspectionObject.getObjectArea())){ qw.lambda().like(InspectionObject::getObjectArea, inspectionObject.getObjectArea()); } - if (StringUtil.isNotEmpty(inspectionObject.getKksNo())){ - qw.lambda().like(InspectionObject::getKksNo, inspectionObject.getKksNo()); - } IPage pages = inspectionObjectService.page(Condition.getPage(query), qw); return R.data(pages); } @@ -158,7 +155,7 @@ public class InspectionObjectController extends DafController { number = 1; } String numFormat = String.format("%04d", number); - String no = "R" + date + numFormat; + String no = "D" + date + numFormat; inspectionObject.setObjectNo(no); return R.status(inspectionObjectService.saveOrUpdate(inspectionObject)); }