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..15a2c64 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -144,7 +144,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)); @@ -216,12 +216,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 (!"station".equals(key) && !"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"); @@ -249,7 +243,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 0a24905..9847cad 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -144,7 +144,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)); @@ -217,12 +217,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 (!"stations".equals(key) && !"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"); @@ -250,7 +244,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/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index cc148a8..5ffb0ae 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -36,16 +36,16 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.plan_no LIKE #{entity.planNo} + AND a.plan_no LIKE CONCAT('%', #{entity.planNo}, '%') - AND a.plan_name LIKE #{entity.planName} + AND a.plan_name LIKE CONCAT('%', #{entity.planName}, '%') AND a.station = #{entity.station} - AND a.period_type LIKE #{entity.periodType} + AND a.period_type LIKE CONCAT('%', #{entity.periodType}, '%') AND a.plan_status = #{entity.planStatus} @@ -58,11 +58,11 @@ diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml index 402eff3..b5fc70d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -33,16 +33,16 @@ 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 - AND a.route_no LIKE #{entity.routeNo} + AND a.route_no LIKE CONCAT('%', #{entity.routeNo}, '%') - AND a.route_name LIKE #{entity.routeName} + AND a.route_name LIKE CONCAT('%', #{entity.routeName}, '%') AND a.stations = #{entity.stations} - AND a.type LIKE #{entity.type} + AND a.type LIKE CONCAT('%', #{entity.type}, '%') AND a.istatus = #{entity.istatus} @@ -55,11 +55,11 @@