Просмотр исходного кода

[审批][修改][全列表添加过滤审批]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
e183df7c49
2 измененных файлов: 5 добавлений и 2 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  2. +4
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -553,7 +553,7 @@ public class WxFlowServiceImpl implements WxFlowService {
WxCoupon query = new WxCoupon(); WxCoupon query = new WxCoupon();
query.setTenantId(tenantId); query.setTenantId(tenantId);
query.setId(businessId); query.setId(businessId);
List<WxCoupon> couponList = wxCouponMapper.findCouponList(query);
List<WxCoupon> couponList = wxCouponMapper.findList(query);
if(CollectionUtils.isNotEmpty(couponList)) { if(CollectionUtils.isNotEmpty(couponList)) {
WxCoupon coupon = couponList.get(0); WxCoupon coupon = couponList.get(0);
result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType())); result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType()));


+ 4
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -446,7 +446,10 @@
<include refid="allColumns"/> <include refid="allColumns"/>
from wx_coupon c from wx_coupon c
<include refid="dynamicWhereConditionsForCoupon"/> <include refid="dynamicWhereConditionsForCoupon"/>
limit #{limitStart},#{limitEnd}

<if test="null != limitStart and null != limitEnd">
limit #{limitStart},#{limitEnd}
</if>
</select> </select>


<select id="findCouponListCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="Integer"> <select id="findCouponListCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="Integer">


Загрузка…
Отмена
Сохранить