From ccab9a4fe3204fd4a010d6b5626d1312a0c46178 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Wed, 17 Jul 2024 10:44:30 +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 ++--------
 .../modules/inspection/mapper/InspectionPlanMapper.xml | 10 +++++-----
 .../inspection/mapper/InspectionRouteMapper.xml        | 10 +++++-----
 4 files changed, 14 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..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<String, Object> 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<InspectionPlanExcel> 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<InspectionPlan> 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<String, Object> 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<InspectionRouteExcel> 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<InspectionRoute> 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
         <if test="entity.planNo != null and entity.planNo != ''">
-            AND a.plan_no LIKE #{entity.planNo}
+            AND a.plan_no LIKE CONCAT('%', #{entity.planNo}, '%')
         </if>
         <if test="entity.planName != null and entity.planName != ''">
-            AND a.plan_name LIKE #{entity.planName}
+            AND a.plan_name LIKE CONCAT('%', #{entity.planName}, '%')
         </if>
         <if test="entity.station != null and entity.station != ''">
             AND a.station = #{entity.station}
         </if>
         <if test="entity.periodType != null and entity.periodType != ''">
-            AND a.period_type LIKE #{entity.periodType}
+            AND a.period_type LIKE CONCAT('%', #{entity.periodType}, '%')
         </if>
         <if test="entity.planStatus != null and entity.planStatus != ''">
             AND a.plan_status = #{entity.planStatus}
@@ -58,11 +58,11 @@
 
     <select id="getMaxNo" resultType="java.lang.String">
         SELECT max(plan_no)
-        FROM i_inspection_plan where plan_no like ${date}
+        FROM i_inspection_plan where plan_no like CONCAT('%', #{date}, '%')
     </select>
 
     <select id="getDetail" resultMap="inspectionPlanResultMap">
-        select plan_name, plan_type from i_inspection_plan where plan_no = ${plan_no}
+        select plan_name, plan_type from i_inspection_plan where plan_no = #{plan_no}
     </select>
 
 </mapper>
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
         <if test="entity.routeNo != null and entity.routeNo != ''">
-            AND a.route_no LIKE #{entity.routeNo}
+            AND a.route_no LIKE CONCAT('%', #{entity.routeNo}, '%')
         </if>
         <if test="entity.routeName != null and entity.routeName != ''">
-            AND a.route_name LIKE #{entity.routeName}
+            AND a.route_name LIKE CONCAT('%', #{entity.routeName}, '%')
         </if>
         <if test="entity.stations != null and entity.stations != ''">
             AND a.stations = #{entity.stations}
         </if>
         <if test="entity.type != null and entity.type != ''">
-            AND a.type LIKE #{entity.type}
+            AND a.type LIKE CONCAT('%', #{entity.type}, '%')
         </if>
         <if test="entity.istatus != null and entity.istatus != ''">
             AND a.istatus = #{entity.istatus}
@@ -55,11 +55,11 @@
 
     <select id="getMaxNo" resultType="java.lang.String">
         SELECT max(route_no)
-        FROM i_inspection_route where route_no like ${date}
+        FROM i_inspection_route where route_no like CONCAT('%', #{date}, '%')
     </select>
 
     <select id="getDetailList" resultMap="inspectionRouteResultMap">
-        select route_name, type from i_inspection_route where route_no = ${route_no}
+        select route_name, type from i_inspection_route where route_no = #{route_no}
     </select>
 
 </mapper>