From 20f11e8eec24bb540dc35b2b93144ee64deb0fce Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 22 Aug 2019 17:19:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=B9=E7=85=A7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/vo/WxBillAll.java | 4 ++-- .../iformall/service/impl/WxBillAllServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxBillAllMapper.xml | 12 ++++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 438167ce9..b04d8fabf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -140,7 +140,7 @@ public class WxBillAll extends BaseEntity { @Transient private Integer balance; - @io.swagger.annotations.ApiModelProperty(value = "多个状态", name = "statusStr") - private String statusStr; + @io.swagger.annotations.ApiModelProperty(value = "多个类型", name = "typeStr") + private String typeStr; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index fe703c0fc..78637436a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -122,8 +122,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { //更新各账单状态 //updateBillStatus(record); - if (StringUtils.isNotEmpty(record.getStatusStr())) { - List typeList = JSONArray.parseArray(record.getStatusStr(), Integer.class); + if (StringUtils.isNotEmpty(record.getTypeStr())) { + List typeList = JSONArray.parseArray(record.getTypeStr(), Integer.class); record.setTypeList(typeList); } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record)); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index c74eaefb2..7e6860768 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -99,7 +99,7 @@ and bill.bill_type_value = #{billTypeValue} and bill.`status` = #{status} and bill.rent_shop_type = #{rentShopType} - + and bill.receive_date between #{starttime} and #{endtime} @@ -111,6 +111,14 @@ #{status} + + + and bill.`bill_type_value` in + + #{type} + + + order by ${sortColumns} order by bill.receive_date,bill.id desc,bill.merchant_id,bill.status @@ -291,7 +299,7 @@ #{type} - + and DATE_FORMAT(bill.receive_date,'%Y-%m') between #{starttime} and #{endtime}