Commit 58ebe486 by huluobin

# update

parent 61863067
...@@ -2,9 +2,12 @@ package com.blt.other.module.cost.service; ...@@ -2,9 +2,12 @@ package com.blt.other.module.cost.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.blt.other.module.sys.dto.request.CompanyReviewerListReq;
import com.blt.other.database.model.CostCompanyDomain; import com.blt.other.database.model.CostCompanyDomain;
import com.blt.other.module.sys.dto.request.CompanyReviewerListReq;
import com.blt.other.module.sys.dto.request.CostReviewerExportReq;
import com.blt.other.module.sys.dto.request.CostReviewerImportReq;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -79,4 +82,8 @@ public interface CostCompanyService extends IService<CostCompanyDomain> { ...@@ -79,4 +82,8 @@ public interface CostCompanyService extends IService<CostCompanyDomain> {
* @return 财务主体字典 * @return 财务主体字典
*/ */
Map<String, CostCompanyDomain> costCompanyMap(); Map<String, CostCompanyDomain> costCompanyMap();
void importExcel(CostReviewerImportReq req);
void exportExcel(HttpServletResponse response, CostReviewerExportReq req);
} }
...@@ -4,18 +4,18 @@ package com.blt.other.module.sys.controller; ...@@ -4,18 +4,18 @@ package com.blt.other.module.sys.controller;
import com.bailuntec.cost.api.response.CostResult; import com.bailuntec.cost.api.response.CostResult;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.blt.other.database.model.CostCompanyDomain; import com.blt.other.database.model.CostCompanyDomain;
import com.blt.other.module.auth.service.IOaDepartmentService;
import com.blt.other.module.cost.service.CostCompanyService; import com.blt.other.module.cost.service.CostCompanyService;
import com.blt.other.module.sys.dto.request.CompanyReviewerListReq; import com.blt.other.module.sys.dto.request.CompanyReviewerListReq;
import com.blt.other.module.sys.dto.request.CostReviewerExportReq;
import com.blt.other.module.sys.dto.request.CostReviewerImportReq;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List; import java.util.List;
/** /**
...@@ -26,7 +26,7 @@ import java.util.List; ...@@ -26,7 +26,7 @@ import java.util.List;
* @author robbendev * @author robbendev
* @since 2020-10-13 * @since 2020-10-13
*/ */
@Api(tags = "审核人接口") @Api(tags = "财务审核人、行政审核人接口")
@RestController @RestController
@RequestMapping("/costReviewer") @RequestMapping("/costReviewer")
public class CostReviewerController { public class CostReviewerController {
...@@ -42,6 +42,7 @@ public class CostReviewerController { ...@@ -42,6 +42,7 @@ public class CostReviewerController {
return CostResult.success(costCompanyDomainIPage); return CostResult.success(costCompanyDomainIPage);
} }
@ApiOperation("/修改财务审核人") @ApiOperation("/修改财务审核人")
@GetMapping("/modifyFinancialReviewer") @GetMapping("/modifyFinancialReviewer")
public CostResult<Void> modifyFinancialReviewer(@RequestParam Integer userId, public CostResult<Void> modifyFinancialReviewer(@RequestParam Integer userId,
...@@ -72,4 +73,20 @@ public class CostReviewerController { ...@@ -72,4 +73,20 @@ public class CostReviewerController {
} }
@ApiOperation("批量导入数据")
@PostMapping("/importExcel")
public CostResult<Void> importExcel(CostReviewerImportReq req) throws IOException {
costCompanyService.importExcel(req);
return CostResult.success();
}
@ApiOperation("导出excel")
@GetMapping("/exportExcel")
public CostResult<Void> exportExcel(HttpServletResponse response,
CostReviewerExportReq req) throws IOException {
costCompanyService.exportExcel(response, req);
return CostResult.success();
}
} }
...@@ -3,10 +3,7 @@ package com.blt.other.module.sys.controller; ...@@ -3,10 +3,7 @@ package com.blt.other.module.sys.controller;
import com.bailuntec.cost.api.response.CostResult; import com.bailuntec.cost.api.response.CostResult;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.blt.other.module.sys.dto.request.AddDepartmentReviewerReq; import com.blt.other.module.sys.dto.request.*;
import com.blt.other.module.sys.dto.request.DepartmentReviewerListReq;
import com.blt.other.module.sys.dto.request.ModifyDepartmentReviewerReq;
import com.blt.other.module.sys.dto.request.RemoveDepartmentReviewerReq;
import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem; import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem;
import com.blt.other.module.sys.service.IDepartmentReviewerService; import com.blt.other.module.sys.service.IDepartmentReviewerService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -14,6 +11,8 @@ import io.swagger.annotations.ApiOperation; ...@@ -14,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/** /**
* <p> * <p>
...@@ -38,6 +37,22 @@ public class DepartmentReviewerController { ...@@ -38,6 +37,22 @@ public class DepartmentReviewerController {
return CostResult.success(oaDepartmentIPage); return CostResult.success(oaDepartmentIPage);
} }
@ApiOperation("批量导入数据")
@PostMapping("/importExcel")
public CostResult<Void> importExcel(DepartmentReviewerImportReq excel) throws IOException {
departmentReviewerService.importExcel(excel);
return CostResult.success();
}
@ApiOperation("导出excel")
@GetMapping("/exportExcel")
public CostResult<Void> exportExcel(HttpServletResponse response,
DepartmentReviewerExportReq req) throws IOException {
departmentReviewerService.exportExcel(response, req);
return CostResult.success();
}
@ApiOperation("/修改部门审核人") @ApiOperation("/修改部门审核人")
@PostMapping("/modifyDepartmentReviewer") @PostMapping("/modifyDepartmentReviewer")
public CostResult<Void> modifyDepartmentReviewer(@RequestBody ModifyDepartmentReviewerReq req) { public CostResult<Void> modifyDepartmentReviewer(@RequestBody ModifyDepartmentReviewerReq req) {
......
...@@ -3,16 +3,13 @@ package com.blt.other.module.sys.controller; ...@@ -3,16 +3,13 @@ package com.blt.other.module.sys.controller;
import com.bailuntec.cost.api.response.CostResult; import com.bailuntec.cost.api.response.CostResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.blt.other.module.cost.dto.request.*; import com.blt.other.module.cost.dto.request.BatchUpdateReviewerReq;
import com.blt.other.module.sys.dto.request.*; import com.blt.other.module.sys.dto.request.*;
import com.blt.other.module.sys.model.SpecDepartmentCheckConfig; import com.blt.other.module.sys.model.SpecDepartmentCheckConfig;
import com.blt.other.module.sys.service.ISpecDepartmentCheckConfigService; import com.blt.other.module.sys.service.ISpecDepartmentCheckConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -78,9 +75,9 @@ public class SpecDepartmentCheckConfigController { ...@@ -78,9 +75,9 @@ public class SpecDepartmentCheckConfigController {
} }
@ApiOperation("导出excel") @ApiOperation("导出excel")
@PostMapping("/exportExcel") @GetMapping("/exportExcel")
public CostResult<Void> exportExcel(HttpServletResponse response, public CostResult<Void> exportExcel(HttpServletResponse response,
@RequestBody SpecDepartmentCheckExportExcelReq req) throws IOException { SpecDepartmentCheckExportExcelReq req) throws IOException {
specDepartmentCheckConfigService.exportExcel(response, req); specDepartmentCheckConfigService.exportExcel(response, req);
return CostResult.success(); return CostResult.success();
} }
......
package com.blt.other.module.sys.dto.request;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/21 1:38 下午
*/
public class CostReviewerExportReq extends CompanyReviewerListReq {
}
package com.blt.other.module.sys.dto.request;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/21 1:38 下午
*/
@Data
public class CostReviewerImportReq {
private MultipartFile multipartFile;
private Integer currentUserId;
}
package com.blt.other.module.sys.dto.request;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/21 1:22 下午
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DepartmentReviewerExportReq extends DepartmentReviewerListReq {
}
package com.blt.other.module.sys.dto.request;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/21 1:23 下午
*/
@Data
public class DepartmentReviewerImportReq {
private MultipartFile multipartFile;
private Integer currentUserId;
}
...@@ -2,13 +2,12 @@ package com.blt.other.module.sys.service; ...@@ -2,13 +2,12 @@ package com.blt.other.module.sys.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.blt.other.module.sys.dto.request.AddDepartmentReviewerReq; import com.blt.other.module.sys.dto.request.*;
import com.blt.other.module.sys.dto.request.DepartmentReviewerListReq;
import com.blt.other.module.sys.dto.request.ModifyDepartmentReviewerReq;
import com.blt.other.module.sys.dto.request.RemoveDepartmentReviewerReq;
import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem; import com.blt.other.module.sys.dto.response.DepartmentReviewerListItem;
import com.blt.other.module.sys.model.DepartmentReviewer; import com.blt.other.module.sys.model.DepartmentReviewer;
import javax.servlet.http.HttpServletResponse;
/** /**
* <p> * <p>
* 部门审核人 服务类 * 部门审核人 服务类
...@@ -47,4 +46,8 @@ public interface IDepartmentReviewerService extends IService<DepartmentReviewer> ...@@ -47,4 +46,8 @@ public interface IDepartmentReviewerService extends IService<DepartmentReviewer>
* @param req req * @param req req
*/ */
void removeDepartmentReviewer(RemoveDepartmentReviewerReq req); void removeDepartmentReviewer(RemoveDepartmentReviewerReq req);
void importExcel(DepartmentReviewerImportReq excel);
void exportExcel(HttpServletResponse response, DepartmentReviewerExportReq req);
} }
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