优化代码

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -67,6 +67,7 @@ public class OwnerCarDto extends PageDto implements Serializable {
 
     private String bId;
     private String carTypeCd;
+    private String[] carTypeCds;
     private String memberId;
 
 
@@ -334,4 +335,12 @@ public class OwnerCarDto extends PageDto implements Serializable {
     public void setCarNumLike(String carNumLike) {
         this.carNumLike = carNumLike;
     }
+
+    public String[] getCarTypeCds() {
+        return carTypeCds;
+    }
+
+    public void setCarTypeCds(String[] carTypeCds) {
+        this.carTypeCds = carTypeCds;
+    }
 }

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -150,6 +150,12 @@
         <if test="carTypeCd !=null and carTypeCd != ''">
             and t.car_type_cd= #{carTypeCd}
         </if>
+        <if test="carTypeCds !=null">
+            and t.car_type_cd in
+            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
@@ -307,6 +313,12 @@
         <if test="carTypeCd !=null and carTypeCd != ''">
             and t.car_type_cd= #{carTypeCd}
         </if>
+        <if test="carTypeCds !=null">
+            and t.car_type_cd in
+            <foreach collection="carTypeCds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>

service-api/src/main/java/com/java110/api/listener/owner/QueryOwnerCarsListener.java

@@ -93,14 +93,18 @@ public class QueryOwnerCarsListener extends AbstractServiceApiDataFlowListener {
 
             reqJson.put("psId", parkingSpaceDtos.get(0).getPsId());
         }
+        OwnerCarDto ownerCarDto =  BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class);
+        if(reqJson.containsKey("carTypeCds")){
+            ownerCarDto.setCarTypeCd("");
+            ownerCarDto.setCarTypeCds(reqJson.getString("carTypeCds").split(","));
+        }
 
         //查询总记录数
-        int total = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class));
+        int total = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
 //        int count = 0;
         List<OwnerCarDto> ownerCarDtoList = null;
 
         if (total > 0) {
-            OwnerCarDto ownerCarDto = BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class);
             ownerCarDtoList = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 
             //小区20条时刷房屋和车位信息
@@ -118,12 +122,11 @@ public class QueryOwnerCarsListener extends AbstractServiceApiDataFlowListener {
         basePrivilegeDto.setUserId(dataFlowContext.getUserId());
         privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
         if (privileges == null || privileges.size() == 0) {
-            for (OwnerCarDto ownerCarDto : ownerCarDtoList) {
-
-                String link = ownerCarDto.getLink();
+            for (OwnerCarDto tmpOwnerCarDto : ownerCarDtoList) {
+                String link = tmpOwnerCarDto.getLink();
                 if (!StringUtil.isEmpty(link)) {
                     link = link.substring(0, 3) + "****" + link.substring(7);
-                    ownerCarDto.setLink(link);
+                    tmpOwnerCarDto.setLink(link);
                 }
             }
         }