From 06df1d313c7e5be5833486870368d002fc18888d Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 10:58:19 +0800 Subject: [PATCH] =?UTF-8?q?sql=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 10 ++-------- .../controller/InspectionRouteController.java | 10 ++-------- .../controller/InspectionTasksController.java | 8 +------- .../inspection/mapper/InspectionTasksMapper.xml | 12 ++++++------ 4 files changed, 11 insertions(+), 29 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 a330d47..3cddf13 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -141,7 +141,7 @@ public class InspectionPlanController extends DafController { public R submit(@Valid @RequestBody InspectionPlan inspectionPlan) { inspectionPlan.setPlanStatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionPlanService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionPlanService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -213,12 +213,6 @@ public class InspectionPlanController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"planStatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new); List list = inspectionPlanService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -246,7 +240,7 @@ public class InspectionPlanController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetail(String planNo) { - InspectionPlan detail = inspectionPlanService.getDetail("'" + planNo + "'"); + InspectionPlan detail = inspectionPlanService.getDetail(planNo); return R.data(detail); } } 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 86532af..639c344 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -141,7 +141,7 @@ public class InspectionRouteController extends DafController { public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { inspectionRoute.setIstatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionRouteService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -214,12 +214,6 @@ public class InspectionRouteController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"istatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new); List list = inspectionRouteService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -247,7 +241,7 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetailList(String routeNo) { - InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'"); + InspectionRoute DetailList = inspectionRouteService.getDetailList(routeNo); return R.data(DetailList); } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index 532baae..85a05db 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -162,7 +162,7 @@ public class InspectionTasksController extends DafController { public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) { inspectionTasks.setTaskStatus(1L); String date = LocalDate.now().toString().replace("-",""); - String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'"); + String maxTaskNo = inspectionTasksService.getMaxTaskNo(date); int number; if (StringUtil.isNotEmpty(maxTaskNo)){ number = Integer.parseInt(maxTaskNo.substring(9)); @@ -232,12 +232,6 @@ public class InspectionTasksController extends DafController { @ApiLog public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"station".equals(key) && !"taskStatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new); List list = inspectionTasksService.export(vo); response.setContentType("application/vnd.ms-excel"); diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml index 4fdad89..f860d53 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -44,22 +44,22 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.task_no LIKE #{entity.taskNo} + AND a.task_no LIKE CONCAT('%', #{entity.taskNo}, '%') - AND a.task_name LIKE #{entity.taskName} + AND a.task_name LIKE CONCAT('%', #{entity.taskName}, '%') AND a.station = #{entity.station} - AND a.task_start_date LIKE #{entity.taskStartDate} + AND a.task_start_date LIKE CONCAT('%', #{entity.taskStartDate}, '%') - AND a.task_end_date LIKE #{entity.taskEndDate} + AND a.task_end_date LIKE CONCAT('%', #{entity.taskEndDate}, '%') - AND a.responsible_person LIKE #{entity.responsiblePerson} + AND a.responsible_person LIKE CONCAT('%', #{entity.responsiblePerson}, '%') AND a.task_status = #{entity.taskStatus} @@ -68,7 +68,7 @@