Commit ff1f42c0 by huluobin

# 费用系统 sql update

parent 65237395
...@@ -199,7 +199,7 @@ public class CostController { ...@@ -199,7 +199,7 @@ public class CostController {
} }
@ApiOperation("待审核费用单列表") @ApiOperation("待审核费用单列表")
@GetMapping("/checkCostList") @GetMapping("/checkCostList")
public CostResult<IPage<CostDto>> checkCostList(CheckCostListReq req) { public CostResult<IPage<CostDto>> checkCostList(CheckCostListReq req) {
costService = CostServiceFactory.getCostService(); costService = CostServiceFactory.getCostService();
......
...@@ -44,7 +44,7 @@ public interface CostDao extends BaseMapper<CostDomain> { ...@@ -44,7 +44,7 @@ public interface CostDao extends BaseMapper<CostDomain> {
IPage<CostDomain> departmentCheckCostList(@Param("page") IPage<CostDomain> page, IPage<CostDomain> departmentCheckCostList(@Param("page") IPage<CostDomain> page,
@Param("req") CheckCostListReq req); @Param("req") CheckCostListReq req);
//管理后台 所有需要我部门审核 + 我已经部门审核通过 费用列表查询 //管理后台 所有需要部门审核 + 部门审核通过 费用列表查询
IPage<CostDomain> departmentCheckAllCostList(@Param("page") IPage<CostDomain> page, IPage<CostDomain> departmentCheckAllCostList(@Param("page") IPage<CostDomain> page,
@Param("req") CheckCostListReq req); @Param("req") CheckCostListReq req);
......
...@@ -41,5 +41,5 @@ public class CheckCostListReq { ...@@ -41,5 +41,5 @@ public class CheckCostListReq {
private Integer costStatus; private Integer costStatus;
@ApiModelProperty("创建人(模糊搜索) ") @ApiModelProperty("创建人(模糊搜索) ")
private String createUserId; private Integer createUserId;
} }
...@@ -285,23 +285,29 @@ public abstract class AbstractCostService implements CostService { ...@@ -285,23 +285,29 @@ public abstract class AbstractCostService implements CostService {
@Override @Override
public IPage<CostDto> checkCostList(CheckCostListReq req) { public IPage<CostDto> checkCostList(CheckCostListReq req) {
IPage<CostDomain> page = new Page<>(req.getPageNum(), req.getPageSize()); IPage<CostDomain> page = new Page<>(req.getPageNum(), req.getPageSize());
//需要财务审核或者需要我最终审核费用列表查询
if (req.getType().equals(1)) { if (req.getType().equals(1)) {
return costDao.financialOrFinalCheckCostList(page, req).convert(CostDomain::castToDto); return costDao.financialOrFinalCheckCostList(page, req).convert(CostDomain::castToDto);
} }
if (req.getType().equals(2)) { if (req.getType().equals(2)) {
//所有需要部门审核 + 部门审核通过 费用列表查询
if (req.getStatus().equals(1)) { if (req.getStatus().equals(1)) {
return costDao.departmentCheckAllCostList(page, req).convert(CostDomain::castToDto); return costDao.departmentCheckAllCostList(page, req).convert(CostDomain::castToDto);
} }
//需要我部门审核费用列表查询
if (req.getStatus().equals(2)) { if (req.getStatus().equals(2)) {
return costDao.departmentCheckCostList(page, req).convert(CostDomain::castToDto); return costDao.departmentCheckCostList(page, req).convert(CostDomain::castToDto);
} }
//已经部门手动审核费用列表查询
if (req.getStatus().equals(3)) { if (req.getStatus().equals(3)) {
return costDao.departmentManualCheckLllCostList(page, req).convert(CostDomain::castToDto); return costDao.departmentManualCheckLllCostList(page, req).convert(CostDomain::castToDto);
} }
//已经部门自动核费用列表查询
if (req.getStatus().equals(4)) { if (req.getStatus().equals(4)) {
return costDao.departmentAutoCheckLllCostList(page, req).convert(CostDomain::castToDto); return costDao.departmentAutoCheckLllCostList(page, req).convert(CostDomain::castToDto);
} }
} }
//需要我人事审核费用列表查询
if (req.getType().equals(3)) { if (req.getType().equals(3)) {
return costDao.hrCheckCostList(page, req).convert(CostDomain::castToDto); return costDao.hrCheckCostList(page, req).convert(CostDomain::castToDto);
} }
......
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