Browse Source

修改结算单导出逻辑

songyh 3 năm trước cách đây
mục cha
commit
452985dacc

+ 6 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/ExportReportController.java

@@ -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"));

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/SettlementFileParamsVo.java

@@ -26,6 +26,7 @@ public class SettlementFileParamsVo implements Serializable {
     //@Dict(dicCode = "id", dictTable = "ctop_advertiser", dicText = "name")
     private String advertiserId;
     private String advertiserName;
+    private String userId;
 
     /**
      * 产品id

+ 4 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/IReportSettlementService.java

@@ -1,6 +1,7 @@
 package org.jeecg.ctop.finance.settlement.service;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
 import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
@@ -13,9 +14,9 @@ public interface IReportSettlementService {
 
     List<SettlementReportBytedanceVo> getAccountTransactionDayBytedance();
 
-    Result settlementReportBytedance(SettlementFileParamsVo paramsVo,HttpServletResponse response,LoginUser user);
+    Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response, SysUser user);
 
-    Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response, LoginUser user);
+    Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response, SysUser user);
 
     Result porfitReportBytedance(SettlementFileParamsVo paramsVo,HttpServletResponse response);
 
@@ -27,5 +28,5 @@ public interface IReportSettlementService {
 
     void cwjsPRofit(CwjsPolicyInfo cwjsPolicyInfo);
 
-    List<String> getAccountId(SettlementFileParamsVo paramsVo,LoginUser user);
+    List<String> getAccountId(SettlementFileParamsVo paramsVo,SysUser user);
 }

+ 4 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -21,6 +21,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 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.policy.entity.CwjsPolicyInfo;
@@ -84,7 +85,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         return reportSettlementMapper.getAccountTransactionDayBytedance(null);
     }
     @Override
-    public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response,LoginUser user) {
+    public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response, SysUser user) {
         try {
             //第一步创建workbook
             HSSFWorkbook wb = new HSSFWorkbook();
@@ -269,7 +270,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
      * @return
      */
     @Override
-    public List<String> getAccountId(SettlementFileParamsVo paramsVo,LoginUser user) {
+    public List<String> getAccountId(SettlementFileParamsVo paramsVo,SysUser user) {
         String uploadYears = paramsVo.getUploadYears();
         //1:区分媒体(头条:1 快手:2)
         Integer mediaId = paramsVo.getMediaId();
@@ -315,7 +316,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
     }
 
     @Override
-    public Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response, LoginUser user) {
+    public Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response, SysUser user) {
         try {
             //第一步创建workbook
             HSSFWorkbook wb = new HSSFWorkbook();