优化费用

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

@@ -105,6 +105,12 @@ public class OwnerDto extends PageDto implements Serializable {
 
     private String oweFee;
     private String contractCount;
+    private String staffNameLike;
+    private String logStartTime;
+    private String logEndTime;
+
+    private String ownerNameLike;
+
 
     public String getSex() {
         return sex;
@@ -540,4 +546,36 @@ public class OwnerDto extends PageDto implements Serializable {
     public void setEndDate(String endDate) {
         this.endDate = endDate;
     }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getLogStartTime() {
+        return logStartTime;
+    }
+
+    public void setLogStartTime(String logStartTime) {
+        this.logStartTime = logStartTime;
+    }
+
+    public String getLogEndTime() {
+        return logEndTime;
+    }
+
+    public void setLogEndTime(String logEndTime) {
+        this.logEndTime = logEndTime;
+    }
+
+    public String getOwnerNameLike() {
+        return ownerNameLike;
+    }
+
+    public void setOwnerNameLike(String ownerNameLike) {
+        this.ownerNameLike = ownerNameLike;
+    }
 }

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

@@ -316,7 +316,19 @@
         left join c_orders co on cb.o_id = co.o_id
         left join u_user uu on co.user_id = uu.user_id
         where 1=1
-        and t.member_id = #{memberId}
+        <if test="memberId != null and memberId != ''">
+            and t.member_id = #{memberId}
+        </if>
+        <if test="ownerNameLike != null and ownerNameLike != ''">
+            and t.name like concat('%',#{ownerNameLike},'%')
+        </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>
 
@@ -330,7 +342,19 @@
         left join c_orders co on cb.o_id = co.o_id
         left join u_user uu on co.user_id = uu.user_id
         where 1=1
-        and t.member_id = #{memberId}
+        <if test="memberId != null and memberId != ''">
+            and t.member_id = #{memberId}
+        </if>
+        <if test="ownerNameLike != null and ownerNameLike != ''">
+            and t.name like concat('%',#{ownerNameLike},'%')
+        </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/owner/QueryHisOwnerCmd.java

@@ -30,7 +30,6 @@ public class QueryHisOwnerCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-        Assert.hasKeyAndValue(reqJson,"memberId","未包含业主ID");
         Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
 
     }