|
@@ -8,6 +8,7 @@ import com.jcraft.jsch.SftpException;
|
|
|
import com.sqx.common.utils.PageUtils;
|
|
import com.sqx.common.utils.PageUtils;
|
|
|
import com.sqx.common.utils.Result;
|
|
import com.sqx.common.utils.Result;
|
|
|
import com.sqx.common.utils.SftpUtil;
|
|
import com.sqx.common.utils.SftpUtil;
|
|
|
|
|
+import com.sqx.common.utils.ShiroUtils;
|
|
|
import com.sqx.modules.address.query.InsideAddressQuery;
|
|
import com.sqx.modules.address.query.InsideAddressQuery;
|
|
|
import com.sqx.modules.common.service.CommonInfoService;
|
|
import com.sqx.modules.common.service.CommonInfoService;
|
|
|
import com.sqx.modules.datacentre.query.RankListQuery;
|
|
import com.sqx.modules.datacentre.query.RankListQuery;
|
|
@@ -316,7 +317,8 @@ public class ExportExeclController {
|
|
|
|
|
|
|
|
@GetMapping("exportSpecialFavorStudent")
|
|
@GetMapping("exportSpecialFavorStudent")
|
|
|
@ApiOperation("导出特殊照顾学生列表")
|
|
@ApiOperation("导出特殊照顾学生列表")
|
|
|
- public Result exportSpecialFavorStudent(@RequestAttribute("userId") Long userId, SpecialFavorStudentQuery queryDTO) {
|
|
|
|
|
|
|
+ public Result exportSpecialFavorStudent(SpecialFavorStudentQuery queryDTO) {
|
|
|
|
|
+ Long userId = ShiroUtils.getUserId();
|
|
|
ExportJob exportJob = buildExportJob("特殊照顾学生列表.xlsx","specialFavorStudent", userId.toString(),
|
|
ExportJob exportJob = buildExportJob("特殊照顾学生列表.xlsx","specialFavorStudent", userId.toString(),
|
|
|
queryDTO.buildQueryConditionString(),
|
|
queryDTO.buildQueryConditionString(),
|
|
|
JSONUtil.toJsonStr(queryDTO));
|
|
JSONUtil.toJsonStr(queryDTO));
|
|
@@ -327,7 +329,8 @@ public class ExportExeclController {
|
|
|
|
|
|
|
|
@GetMapping("exportVipPromoRecord")
|
|
@GetMapping("exportVipPromoRecord")
|
|
|
@ApiOperation("导出会员推广记录列表")
|
|
@ApiOperation("导出会员推广记录列表")
|
|
|
- public Result exportVipPromoRecord(@RequestAttribute("userId") Long userId, VipPromoRecordQuery queryDTO) {
|
|
|
|
|
|
|
+ public Result exportVipPromoRecord(VipPromoRecordQuery queryDTO) {
|
|
|
|
|
+ Long userId = ShiroUtils.getUserId();
|
|
|
ExportJob exportJob = buildExportJob("会员推广记录列表.xlsx","vipPromoRecord", userId.toString(),
|
|
ExportJob exportJob = buildExportJob("会员推广记录列表.xlsx","vipPromoRecord", userId.toString(),
|
|
|
queryDTO.buildQueryConditionString(),
|
|
queryDTO.buildQueryConditionString(),
|
|
|
JSONUtil.toJsonStr(queryDTO));
|
|
JSONUtil.toJsonStr(queryDTO));
|