Merge remote-tracking branch 'origin/fix_bug_2024-01-09' into fix_bug_2024-01-09

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -126,8 +127,12 @@ public class BasicdataVehicleController extends BladeController {
 	@GetMapping("/dictionary")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "车辆信息表",notes = "传入code")
-	public R<List<BasicdataVehicleVO>> dictionary() {
+	public R<List<BasicdataVehicleVO>> dictionary(@RequestParam(value = "vehicleNub",required = false) String vehicleNub) {
-		List<BasicdataVehicleVO> dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary();
+
+
+		log.info(">>>>112 {}",vehicleNub);
+
+		List<BasicdataVehicleVO> dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary(vehicleNub);
 		return R.data(dictionary);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -151,7 +151,8 @@ public class BasicdataWarehouseController extends BladeController {
 	@GetMapping("/listName")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
-	public R<List<BasicdataWarehouseEntity>> listName(String name) {
+	public R<List<BasicdataWarehouseEntity>> listName(@RequestParam("name") String name) {
+		log.info(">>>>>>>>>>>>>传入warehouseWarehouse name {}",name);
 		List<BasicdataWarehouseEntity> pages = warehouseService.pageListName(name);
 		return R.data(pages);
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java

@@ -59,7 +59,7 @@ public interface BasicdataVehicleMapper extends BaseMapper<BasicdataVehicleEntit
 	 *
 	 * @return
 	 */
-    List<BasicdataVehicleVO> selectBasicdataDictionary();
+    List<BasicdataVehicleVO> selectBasicdataDictionary(@Param("vehicleNub") String vehicleNub);
 
     List<BasicdataVehicleEntity> findCarListByName(@Param("carNumber") String carNumber);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml

@@ -176,6 +176,9 @@
     </select>
     <select id="selectBasicdataDictionary" resultType="com.logpm.basicdata.vo.BasicdataVehicleVO">
         select id,vehicle_nub,vehicle_owner from logpm_basicdata_vehicle where is_deleted = 0
+        <if test="vehicleNub!=null">
+            and vehicle_nub  like concat('%',#{vehicleNub},'%')
+        </if>
     </select>
     <select id="findCarListByName" resultType="com.logpm.basicdata.entity.BasicdataVehicleEntity">
         select *

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java

@@ -65,7 +65,7 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
 	/**
 	 * 车辆信息表 字典
 	 */
-    List<BasicdataVehicleVO> selectBasicdataVehicleDictionary();
+    List<BasicdataVehicleVO> selectBasicdataVehicleDictionary(String vehicleNub);
 	/**
 	 * 新增关联表
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -36,6 +36,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -87,8 +88,11 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 	}
 
 	@Override
-	public List<BasicdataVehicleVO> selectBasicdataVehicleDictionary() {
+	public List<BasicdataVehicleVO> selectBasicdataVehicleDictionary(String vehicleNub) {
-		return baseMapper.selectBasicdataDictionary();
+		if(StringUtil.isBlank(vehicleNub)){
+			vehicleNub = null;
+		}
+		return baseMapper.selectBasicdataDictionary(vehicleNub);
 	}
 
 	@Override

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -135,7 +135,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	@Override
 	public List<BasicdataWarehouseEntity> pageListName(String name) {
 		QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.lambda().eq(StringUtils.isNotBlank(name), BasicdataWarehouseEntity::getName, name);
+		queryWrapper.lambda().like(StringUtils.isNotBlank(name), BasicdataWarehouseEntity::getName, name);
 		return baseMapper.selectList(queryWrapper);
 	}