bug

src/main/java/com/huiju/estateagents/controller/TpNewsController.java

@@ -49,6 +49,8 @@ public class TpNewsController extends BaseController {
                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                  @RequestParam(value = "newsName", required = false) String newsName,
                                  @RequestParam(value = "newsTypeId", required = false) String newsTypeId,
+                                 @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                 @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
                                  @PathVariable String client,
                                  HttpServletRequest request) {
         Integer orgId = getOrgId(request);
@@ -59,7 +61,7 @@ public class TpNewsController extends BaseController {
         }
 
         IPage<TpNews> page = new Page<>(pageNum, pageSize);
-        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status,newsTypeId);
+        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status,newsTypeId,startCreateDate,endCreateDate);
 
         return ResponseBean.success(result);
     }

src/main/java/com/huiju/estateagents/property/model/TpBillOrder.java

@@ -124,4 +124,10 @@ public class TpBillOrder implements Serializable {
      */
     @TableField(exist = false)
     private List<BillInvoice> billList;
+
+    /**
+     * 缴费时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime createTime;
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillStatementServiceImpl.java

@@ -62,6 +62,10 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         Integer billInvoiceId = jsonObject.getInteger("billInvoiceId");
         // 缴费人手机号
         String payPhone = jsonObject.getString("payPhone");
+        // 订单状态
+        String orderStatus = jsonObject.getString("orderStatus");
+        // 缴费方式
+        String payType = jsonObject.getString("payType");
 
         // 参数
         Map<String, Object> map = Maps.newHashMap();
@@ -71,6 +75,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         map.put("billInvoiceId", billInvoiceId);
         map.put("payPhone", payPhone);
         map.put("orgId", userElement.getOrgId());
+        map.put("orderStatus", orderStatus);
+        map.put("payType", payType);
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);

src/main/java/com/huiju/estateagents/service/ITpNewsService.java

@@ -15,5 +15,5 @@ import com.huiju.estateagents.entity.TpNews;
  */
 public interface ITpNewsService extends IService<TpNews> {
 
-    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId);
+    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status, String newsTypeId, String startCreateDate, String endCreateDate);
 }

src/main/java/com/huiju/estateagents/service/impl/TpNewsServiceImpl.java

@@ -22,13 +22,16 @@ import org.springframework.stereotype.Service;
 public class TpNewsServiceImpl extends ServiceImpl<TpNewsMapper, TpNews> implements ITpNewsService {
 
     @Override
-    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId) {
+    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status, String newsTypeId, String startCreateDate, String endCreateDate) {
         QueryWrapper<TpNews> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId);
         queryWrapper.eq(!StringUtils.isEmpty(newsTypeId),"news_type_id", newsTypeId);
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.gt(status == null, "status", CommConstant.STATUS_DELETE);
         queryWrapper.like(!StringUtils.isEmpty(newsName), "news_name", "%" + newsName + "%");
+        if (!StringUtils.isEmpty(startCreateDate)){
+            queryWrapper.between("create_date",startCreateDate,endCreateDate);
+        }
         queryWrapper.orderByDesc("weight");
         queryWrapper.orderByDesc("create_date");
 

src/main/resources/mapper/property/BillOrderMapper.xml

@@ -6,7 +6,8 @@
         SELECT
         tbo.*,
         tbs.pay_remark as payRemark,
-        tbs.pay_type as payType
+        tbs.pay_type as payType,
+        tbs.create_time
         FROM
         tp_bill_order tbo LEFT JOIN tp_bill_statement tbs on tbo.tp_bill_invoice_id = tbs.bill_invoice_id
         LEFT JOIN tp_bill tb on tbo.tp_bill_id = tb.id
@@ -30,6 +31,12 @@
                 <if test="map.orgId != null">
                     and tbo.org_id = #{map.orgId}
                 </if>
+                <if test="map.orderStatus != null">
+                    and tbo.order_status = #{map.orderStatus}
+                </if>
+                <if test="map.payType != null">
+                    and tbs.pay_type = #{map.payType}
+                </if>
             </trim>
         </where>
         group by tbo.order_bumber