Commit 58a618f0 authored by fangxinjiang's avatar fangxinjiang

合同审核导出 和 派单审核导出问题

parent da9f6a30
...@@ -373,10 +373,13 @@ public class TEmployeeContractInfoController { ...@@ -373,10 +373,13 @@ public class TEmployeeContractInfoController {
@SysLog("批量导出合同审核") @SysLog("批量导出合同审核")
@PostMapping("/exportAuditContractInfo") @PostMapping("/exportAuditContractInfo")
@PreAuthorize("@pms.hasPermission('employee_export_contract_audit')") @PreAuthorize("@pms.hasPermission('employee_export_contract_audit')")
public void exportAuditContractInfo(@RequestBody(required = false) TEmployeeContractSearchVo contractInfo, HttpServletResponse response) { public void exportAuditContractInfo(@RequestBody(required = false) TEmployeeContractSearchVo contractInfo,
@RequestParam(required = false,name = "mId") String mId,
HttpServletResponse response) {
if (Common.isEmpty(contractInfo)){ if (Common.isEmpty(contractInfo)){
contractInfo = new TEmployeeContractSearchVo(); contractInfo = new TEmployeeContractSearchVo();
} }
contractInfo.setMId(mId);
contractInfo.setAuditStatus(CommonConstants.ONE_INT); contractInfo.setAuditStatus(CommonConstants.ONE_INT);
this.setAuth(contractInfo); this.setAuth(contractInfo);
tEmployeeContractInfoService.exportAuditContractInfo(contractInfo, response); tEmployeeContractInfoService.exportAuditContractInfo(contractInfo, response);
......
...@@ -344,9 +344,11 @@ public class TDispatchInfoController { ...@@ -344,9 +344,11 @@ public class TDispatchInfoController {
@Operation(description = "导出派单审核记录 hasPermission('tdispatchinfo-export')") @Operation(description = "导出派单审核记录 hasPermission('tdispatchinfo-export')")
@PostMapping("/auditExport") @PostMapping("/auditExport")
@PreAuthorize("@pms.hasPermission('tdispatchinfo-export')") @PreAuthorize("@pms.hasPermission('tdispatchinfo-export')")
public void auditExport(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) { public void auditExport(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo,
@RequestParam(required = false,name = "mId") String mId) {
searchVo.setDeleteFlag(CommonConstants.ZERO_STRING); searchVo.setDeleteFlag(CommonConstants.ZERO_STRING);
searchVo.setStatus(CommonConstants.ONE_STRING); searchVo.setStatus(CommonConstants.ONE_STRING);
searchVo.setMId(mId);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo); menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) { if (Common.isNotNull(searchVo.getAuthSql())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment