|
@@ -5,12 +5,14 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
+import org.jeecg.common.util.DateUtils;
|
|
|
import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
|
|
|
import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -30,8 +32,12 @@ public class ExportReportController {
|
|
|
|
|
|
@ApiOperation(value = "财务结算-结算单导出-头条", notes = "财务结算-结算单导出-头条")
|
|
|
@GetMapping(value = "/settlementReportBytedance")
|
|
|
- public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
|
|
|
+ public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) throws Exception{
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String date = paramsVo.getUploadYears();
|
|
|
+ if(null == date||date.equals("")){
|
|
|
+ paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
|
|
|
+ }
|
|
|
return reportSettlementService.settlementReportBytedance(paramsVo,response,user);
|
|
|
}
|
|
|
|
|
@@ -40,6 +46,10 @@ public class ExportReportController {
|
|
|
@GetMapping(value = "/settlementReportKuaiShou")
|
|
|
public Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ String date = paramsVo.getUploadYears();
|
|
|
+ if(null == date||date.equals("")){
|
|
|
+ paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
|
|
|
+ }
|
|
|
return reportSettlementService.settlementReportKuaiShou(paramsVo,response,user);
|
|
|
}
|
|
|
|