运营admin加入订单详情功能

java110-bean/src/main/java/com/java110/dto/reportFee/ReportFeeMonthStatisticsDto.java

@@ -22,6 +22,7 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     private String updateTime;
     private String remark;
     private String objName;
+    private String objNameLike;
     private String objNameNum;
     private String receivedAmount;
     private String payableAmount;
@@ -56,6 +57,8 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
 
 
     private String ownerName;
+    private String ownerNameLike;
+
     private String ownerTel;
     private String ownerId;
     private String detailId;
@@ -1150,9 +1153,10 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
         return fadAmount;
     }
 
-    public void setFadAmount(String fadAmount){
-            this.fadAmount = fadAmount;
+    public void setFadAmount(String fadAmount) {
+        this.fadAmount = fadAmount;
     }
+
     public String getAcctAmount() {
         return acctAmount;
     }
@@ -1200,4 +1204,20 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     public void setOwnerTel(String ownerTel) {
         this.ownerTel = ownerTel;
     }
+
+    public String getObjNameLike() {
+        return objNameLike;
+    }
+
+    public void setObjNameLike(String objNameLike) {
+        this.objNameLike = objNameLike;
+    }
+
+    public String getOwnerNameLike() {
+        return ownerNameLike;
+    }
+
+    public void setOwnerNameLike(String ownerNameLike) {
+        this.ownerNameLike = ownerNameLike;
+    }
 }

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

@@ -1458,6 +1458,15 @@
         <if test="objName !=null and objName != ''">
             and t.obj_name= #{objName}
         </if>
+        <if test="objNameLike !=null and objNameLike != ''">
+            and t.obj_name like concat('%', #{objNameLike},'%')
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name = #{ownerName}
+        </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and t.owner_name like concat('%', #{ownerNameLike},'%')
+        </if>
         <if test="floorId !=null and floorId != ''">
             and t.obj_fpc_id = #{floorId}
         </if>
@@ -1470,6 +1479,7 @@
         <if test="objId !=null and objId != ''">
             and t.obj_id= #{objId}
         </if>
+
         <if test="feeName !=null and feeName != ''">
             and t.fee_name= #{feeName}
         </if>
@@ -1500,6 +1510,15 @@
         <if test="objName !=null and objName != ''">
             and t.obj_name= #{objName}
         </if>
+        <if test="objNameLike !=null and objNameLike != ''">
+            and t.obj_name like concat('%', #{objNameLike},'%')
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name = #{ownerName}
+        </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and t.owner_name like concat('%', #{ownerNameLike},'%')
+        </if>
         <if test="floorId !=null and floorId != ''">
             and t.obj_fpc_id = #{floorId}
         </if>

service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java

@@ -258,6 +258,8 @@ public class ReportFeeMonthStatisticsApi {
                                                     @RequestParam(value = "startTime", required = false) String startTime,
                                                     @RequestParam(value = "endTime", required = false) String endTime,
                                                     @RequestParam(value = "objName", required = false) String objName,
+                                                    @RequestParam(value = "objNameLike", required = false) String objNameLike,
+                                                    @RequestParam(value = "ownerNameLike", required = false) String ownerNameLike,
                                                     @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) {
@@ -275,6 +277,8 @@ public class ReportFeeMonthStatisticsApi {
         reportFeeMonthStatisticsDto.setEndTime(endTime);
         reportFeeMonthStatisticsDto.setObjName(objName);
         reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+        reportFeeMonthStatisticsDto.setObjNameLike(objNameLike);
+        reportFeeMonthStatisticsDto.setOwnerNameLike(ownerNameLike);
         return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
     }