Parcourir la source

[账单对照][修改][账单列表查询]

release_toaliyun_real
gongbiao il y a 6 ans
Parent
révision
20f11e8eec
3 fichiers modifiés avec 14 ajouts et 6 suppressions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +10
    -2
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java Voir le fichier

@@ -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;

}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Voir le fichier

@@ -122,8 +122,8 @@ public class WxBillAllServiceImpl implements WxBillAllService {
//更新各账单状态
//updateBillStatus(record);

if (StringUtils.isNotEmpty(record.getStatusStr())) {
List<Integer> typeList = JSONArray.parseArray(record.getStatusStr(), Integer.class);
if (StringUtils.isNotEmpty(record.getTypeStr())) {
List<Integer> typeList = JSONArray.parseArray(record.getTypeStr(), Integer.class);
record.setTypeList(typeList);
}
PageInfo<WxBillAllVo> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillAllMapper.list(record));


+ 10
- 2
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Voir le fichier

@@ -99,7 +99,7 @@
<if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if>
<if test=" null != status ">and bill.`status` = #{status}</if>
<if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if>
<if test=" null != starttime and null!= endtime ">
<if test=" null != starttime and null!= endtime and '' != starttime and ''!= endtime ">
and bill.receive_date between #{starttime} and #{endtime}
</if>
<if test=" null != merchantId and ''!=merchantId">
@@ -111,6 +111,14 @@
#{status}
</foreach>
</if>
<if test=" null != typeList ">
and bill.`bill_type_value` in
<foreach collection="typeList" index="index" item="type" open="(" separator="," close=")">
#{type}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by bill.receive_date,bill.id desc,bill.merchant_id,bill.status</if>

@@ -291,7 +299,7 @@
#{type}
</foreach>
</if>
<if test="null!=starttime and null!=endtime">
<if test="null!=starttime and null!=endtime and ''!=starttime and ''!=endtime ">
and DATE_FORMAT(bill.receive_date,'%Y-%m') between #{starttime} and #{endtime}
</if>
<if test=" null != status ">


Chargement…
Annuler
Enregistrer