|
@@ -1,9 +1,11 @@
|
|
|
package org.jeecg.ctop.finance.settlement.controller;
|
|
|
|
|
|
+import cn.com.ctop.common.module.service.ISysUserService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.system.entity.SysUser;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
|
|
@@ -28,12 +30,13 @@ public class ExportReportController {
|
|
|
|
|
|
@Autowired
|
|
|
private IReportSettlementService reportSettlementService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService userService;
|
|
|
|
|
|
@ApiOperation(value = "财务结算-结算单导出-头条", notes = "财务结算-结算单导出-头条")
|
|
|
@GetMapping(value = "/settlementReportBytedance")
|
|
|
public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) throws Exception{
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ SysUser user = userService.getById(paramsVo.getUserId());
|
|
|
String date = paramsVo.getUploadYears();
|
|
|
if(null == date||date.equals("")){
|
|
|
paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
|
|
@@ -45,7 +48,7 @@ public class ExportReportController {
|
|
|
@ApiOperation(value = "财务结算-结算单导出-快手", notes = "财务结算-结算单导出-快手")
|
|
|
@GetMapping(value = "/settlementReportKuaiShou")
|
|
|
public Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ SysUser user = userService.getById(paramsVo.getUserId());
|
|
|
String date = paramsVo.getUploadYears();
|
|
|
if(null == date||date.equals("")){
|
|
|
paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
|