|
@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.biz.dal.dao.EmployeeDao;
|
|
import com.ym.mec.biz.dal.dao.EmployeeDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
|
|
import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
|
|
import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
|
|
import com.ym.mec.biz.dal.dto.StudentHasCourseDto;
|
|
import com.ym.mec.biz.dal.dto.StudentHasCourseDto;
|
|
import com.ym.mec.biz.dal.dto.TeacherSalaryDto;
|
|
import com.ym.mec.biz.dal.dto.TeacherSalaryDto;
|
|
@@ -56,6 +57,8 @@ public class ExportController extends BaseController {
|
|
private EmployeeDao employeeDao;
|
|
private EmployeeDao employeeDao;
|
|
@Autowired
|
|
@Autowired
|
|
private StudentPaymentOrderService studentPaymentOrderService;
|
|
private StudentPaymentOrderService studentPaymentOrderService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
|
|
|
|
|
|
@ApiOperation(value = "导出学员是否有课")
|
|
@ApiOperation(value = "导出学员是否有课")
|
|
@PostMapping("export/studentHasCourse")
|
|
@PostMapping("export/studentHasCourse")
|
|
@@ -153,8 +156,8 @@ public class ExportController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "订单列表导出")
|
|
@ApiOperation(value = "订单列表导出")
|
|
- @RequestMapping("order/orderList")
|
|
|
|
- @PreAuthorize("@pcs.hasPermissions('order/orderList')")
|
|
|
|
|
|
+ @RequestMapping("export/orderList")
|
|
|
|
+ @PreAuthorize("@pcs.hasPermissions('export/orderList')")
|
|
public void orderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) {
|
|
public void orderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) {
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
if (!sysUser.getIsSuperAdmin()) {
|
|
if (!sysUser.getIsSuperAdmin()) {
|
|
@@ -182,6 +185,7 @@ public class ExportController extends BaseController {
|
|
row.setExpectAmount(BigDecimal.ZERO);
|
|
row.setExpectAmount(BigDecimal.ZERO);
|
|
row.setActualAmount(BigDecimal.ZERO);
|
|
row.setActualAmount(BigDecimal.ZERO);
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
try {
|
|
try {
|