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

[统计][添加][完善出租率走势]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
536f42a311
2 измененных файлов: 37 добавлений и 0 удалений
  1. +31
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +6
    -0
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 31
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -5,9 +5,11 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.service.WxBillAllService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;

/**
@@ -88,6 +92,15 @@ public class WxBillAllController extends BaseController {
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
if(StringUtils.isBlank(wxBillAll.getEndtime()) && StringUtils.isBlank(wxBillAll.getStarttime())){
SimpleDateFormat sb = new SimpleDateFormat("yyyy-MM-dd");
wxBillAll.setStarttime(sb.format(DateUtils.getFirstDayForCurrMonth(new Date())));
wxBillAll.setEndtime(sb.format(new Date())+" 23:59:59");
}
wxBillAll.setTenantId(getTenantId());
Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
@@ -102,6 +115,15 @@ public class WxBillAllController extends BaseController {
if (null == wxBillAll){
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
if(StringUtils.isBlank(wxBillAll.getEndtime()) && StringUtils.isBlank(wxBillAll.getStarttime())){
SimpleDateFormat sb = new SimpleDateFormat("yyyy-MM-dd");
wxBillAll.setStarttime(sb.format(DateUtils.getFirstDayForCurrMonth(new Date())));
wxBillAll.setEndtime(sb.format(new Date())+" 23:59:59");
}
wxBillAll.setTenantId(getTenantId());
wxBillAllService.exportOweMerchant(wxBillAll, request, response);
}
@@ -114,6 +136,15 @@ public class WxBillAllController extends BaseController {
if (null == wxBillAll){
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
if(StringUtils.isBlank(wxBillAll.getEndtime()) && StringUtils.isBlank(wxBillAll.getStarttime())){
SimpleDateFormat sb = new SimpleDateFormat("yyyy-MM-dd");
wxBillAll.setStarttime(sb.format(DateUtils.getFirstDayForCurrMonth(new Date())));
wxBillAll.setEndtime(sb.format(new Date())+" 23:59:59");
}
wxBillAll.setTenantId(getTenantId());
wxBillAllService.exportWaitMerchant(wxBillAll, request, response);
}


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

@@ -589,6 +589,12 @@
<if test=" null != month and ''!=month">
and date_format(bill.receive_date,'%Y-%m')=#{month}
</if>
<if test=" null != starttime and ''!=starttime">
and bill.receive_date >= #{starttime}
</if>
<if test=" null != endtime and ''!=endtime">
and bill.receive_date &lt;= #{endtime}
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by totalOwe desc </if>
</select>


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