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

[BUG][修改][dev-解单数据导出-解单日期显示近30天数据,日期显示6月份数据,数据有5月份的]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5deddfc572
3 измененных файлов: 17 добавлений и 0 удалений
  1. +7
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  3. +5
    -0
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 7
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java Просмотреть файл

@@ -46,6 +46,13 @@ public class WxMerchantTradeDaily implements Serializable {
@Transient @Transient
private String month; private String month;


@Transient
private String starttime;

@Transient
private String endtime;


public Integer getTradeAmtInteger(){ public Integer getTradeAmtInteger(){
if (StringUtils.isBlank(tradeAmt)){ if (StringUtils.isBlank(tradeAmt)){
return 0; return 0;


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

@@ -13,6 +13,7 @@ import com.iformall.domain.po.WxMerchantTradeDaily;
import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.domain.vo.WxMerchantTradeDailyVo;
import com.iformall.mapper.WxMerchantTradeDailyMapper; import com.iformall.mapper.WxMerchantTradeDailyMapper;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -185,6 +186,10 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId()); wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId());
wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId());
String endtime = DateUtils.getTimeBefore(30, new Date());
String starttime = DateUtils.getSystemTime("yyyy-MM-dd");
wxMerchantTradeDaily.setStarttime(starttime);
wxMerchantTradeDaily.setEndtime(endtime);
List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily);
String title = "近30天解单数据"; String title = "近30天解单数据";
excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false);


+ 5
- 0
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml Просмотреть файл

@@ -160,6 +160,11 @@
<if test=" null != merchantId "> <if test=" null != merchantId ">
and mtd.merchant_id = #{merchantId} and mtd.merchant_id = #{merchantId}
</if> </if>
<if test=" null != starttime and null != endtime">
and mtd.report_date between #{starttime} and #{endtime}
</if>
order by mtd.create_date desc LIMIT 30 order by mtd.create_date desc LIMIT 30
</select> </select>




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