优化代码

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

@@ -103,6 +103,9 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String userName;
 
     private String operate;
+
+    private String staffNameLike;
+
     private List<OwnerCarAttrDto> ownerCarAttrDto;
 
     public String getCarColor() {
@@ -536,4 +539,12 @@ public class OwnerCarDto extends PageDto implements Serializable {
     public void setOperate(String operate) {
         this.operate = operate;
     }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -278,7 +278,19 @@
         left join t_dict t4 on t.car_type_cd=t4.status_cd and t4.table_name='owner_car' and t4.table_columns = 'car_type_cd'
         left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
         where 1=1
-        and t.car_num = #{carNum}
+        <if test="carNum != null and carNum != ''">
+            and t.car_num = #{carNum}
+        </if>
+        <if test="carNumLike != null and carNumLike != ''">
+            and t.car_num like concat('%',#{carNumLike},'%')
+        </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
         and t.community_id= #{communityId}
     </select>
 
@@ -301,7 +313,19 @@
         left join t_dict t4 on t.car_type_cd=t4.status_cd and t4.table_name='owner_car' and t4.table_columns = 'car_type_cd'
         left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
         where 1=1
-        and t.car_num = #{carNum}
+        <if test="carNum != null and carNum != ''">
+            and t.car_num = #{carNum}
+        </if>
+        <if test="carNumLike != null and carNumLike != ''">
+            and t.car_num like concat('%',#{carNumLike},'%')
+        </if>
+        <if test="staffNameLike != null and staffNameLike != ''">
+            and uu.name like concat('%',#{staffNameLike},'%')
+        </if>
+        <if test="logStartTime != null and logStartTime != ''">
+            and co.create_time &gt; #{logStartTime}
+            and co.create_time &lt; #{logEndTime}
+        </if>
         and t.community_id= #{communityId}
         order by t.create_time desc,t.operate
         <if test="page != -1 and page != null ">

service-report/src/main/java/com/java110/report/cmd/car/QueryHisOwnerCarCmd.java

@@ -29,7 +29,6 @@ public class QueryHisOwnerCarCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-        Assert.hasKeyAndValue(reqJson,"carNum","未包含车辆");
         Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
 
     }