From 4dea0d94fc1b8161c450359fc3fc34ecafca353e Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Wed, 17 Jul 2024 10:19:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/controller/InspectionPlanController.java | 5 +---- .../inspection/controller/InspectionRouteController.java | 5 +---- .../modules/inspection/excel/InspectionPlanExcel.java | 4 ---- .../modules/inspection/excel/InspectionRouteExcel.java | 4 ---- .../modules/inspection/mapper/InspectionPlanMapper.xml | 6 +----- .../modules/inspection/mapper/InspectionRouteMapper.xml | 6 +----- 6 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java index 9c08b2b..a330d47 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -91,9 +91,6 @@ public class InspectionPlanController extends DafController { if (StringUtil.isNotEmpty(inspectionPlan.getPlanName())) { qw.lambda().like(InspectionPlan::getPlanName, inspectionPlan.getPlanName()); } - if (null != inspectionPlan.getStation()) { - qw.lambda().eq(InspectionPlan::getStation, inspectionPlan.getStation()); - } if (StringUtil.isNotEmpty(inspectionPlan.getPeriodType())) { qw.lambda().like(InspectionPlan::getPeriodType, inspectionPlan.getPeriodType()); } @@ -217,7 +214,7 @@ public class InspectionPlanController extends DafController { public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); entity.forEach((key, value) -> { - if (!"station".equals(key) && !"planStatus".equals(key)) + if (!"planStatus".equals(key)) { entity.put(key, "%" + value + "%"); } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index 0a24905..86532af 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -91,9 +91,6 @@ public class InspectionRouteController extends DafController { if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) { qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName()); } - if (null != inspectionRoute.getStations()) { - qw.lambda().eq(InspectionRoute::getStations, inspectionRoute.getStations()); - } if (StringUtil.isNotEmpty(inspectionRoute.getType())) { qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType()); } @@ -218,7 +215,7 @@ public class InspectionRouteController extends DafController { public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); entity.forEach((key, value) -> { - if (!"stations".equals(key) && !"istatus".equals(key)) + if (!"istatus".equals(key)) { entity.put(key, "%" + value + "%"); } diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java index 3bae5fb..03a97ca 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java @@ -42,10 +42,6 @@ public class InspectionPlanExcel implements Serializable { @ExcelProperty(value = "计划名称") private String planName; - @ColumnWidth(15) - @ExcelProperty(value = "场站") - private String stationName; - @ColumnWidth(15) @ExcelProperty(value = "计划类型") private String planType; diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java index 1a59383..f0809ef 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java @@ -42,10 +42,6 @@ public class InspectionRouteExcel implements Serializable { @ExcelProperty(value = "路线名称") private String routeName; - @ColumnWidth(15) - @ExcelProperty(value = "场站") - private String stationsName; - @ColumnWidth(15) @ExcelProperty(value = "类型") private String type; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index cc148a8..2d2e15b 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -30,9 +30,8 @@ SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason - ,dic1.dict_value AS stations_name, dic2.dict_value AS istatus_name + , dic2.dict_value AS istatus_name FROM i_inspection_route a - LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.stations AND dic1.is_deleted = '0' LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 @@ -38,9 +37,6 @@ AND a.route_name LIKE #{entity.routeName} - - AND a.stations = #{entity.stations} - AND a.type LIKE #{entity.type}