修改车辆弹框查询过滤bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/interceptor/PluginInterceptor.java

@@ -83,7 +83,7 @@ public class PluginInterceptor implements Interceptor {
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
         } else if ("com.yeejoin.equipmanage.mapper.FireFightingSystemMapper.getSystemInfoPage".equals(id) ||
-                "com.yeejoin.equipmanage.mapper.EmergencyMapper.alarmList".equals(id)) {
+                "com.yeejoin.equipmanage.mapper.EmergencyMapper.alarmList".equals(id) || "com.yeejoin.equipmanage.mapper.CarMapper.getCarInfoPage".equals(id)) {
             //执行结果
             String sortField = "";
             if (parameter instanceof HashMap) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarStatisticController.java

@@ -68,12 +68,17 @@ public class CarStatisticController extends AbstractBaseController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取车辆分页", notes = "获取车辆分页")
     public ResponseModel getCarInfoPage(CommonPageable commonPageable, @RequestParam(required = false) String bizOrgCode,
-                                      @RequestParam(required = false) String carNum) {
+                                      @RequestParam(required = false) String sorter) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        Page<Map<String, Object>> page1 = carMapper.getCarInfoPage(page, bizOrgCode, carNum);
+        String sortField = "", sortOrder = "";
+        if (org.springframework.util.StringUtils.hasText(sorter)) {
+            sortField = sorter.split("@")[0];
+            sortOrder = sorter.split("@")[1];
+        }
+        Page<Map<String, Object>> page1 = carMapper.getCarInfoPage(page, bizOrgCode, sortField, sortOrder);
         return CommonResponseUtil.success(page1);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java

@@ -94,7 +94,7 @@ public interface CarMapper extends BaseMapper<Car> {
     @Update("update wl_car set latitude = #{latitude} , longitude = #{longitude} where iot_code = #{iotCode}")
     void updateCarLocationByIotCode(String iotCode,Double latitude,Double longitude);
 
-    Page<Map<String, Object>> getCarInfoPage(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("carNum") String carNum);
+    Page<Map<String, Object>> getCarInfoPage(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("sortField") String sortField, @Param("sortOrder") String sortOrder);
 
     Page<Map<String, Object>> getStationCarInfoPage(Page page, @Param("bizOrgCode") String bizOrgCode);
 }

amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml

@@ -747,11 +747,15 @@
                 </where>
                 GROUP BY wc.biz_org_code
             ) d
-            <if test="carNum!=null and carNum !='' and carNum=1">
-                ORDER BY d.fireCar DESC
-            </if>
-            <if test="carNum!=null and carNum !='' and carNum=0">
-                ORDER BY d.fireCar ASC
+            <if test="sortField != null and sortField != ''">
+                <choose>
+                    <when test="sortOrder == 'ascend'">
+                        ORDER BY @SORT_FIELD ASC
+                    </when>
+                    <otherwise>
+                        ORDER BY @SORT_FIELD DESC
+                    </otherwise>
+                </choose>
             </if>
     </select>
 

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -7204,6 +7204,7 @@
                 AND wes.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
         </where>
+        GROUP BY wes.id
     </select>
 
     <select id="getSystemAlarmNum" resultType="Map">