Commit dd9d1615 by huluobin

hr check

parent 597c3f71
...@@ -311,7 +311,7 @@ public class CostController { ...@@ -311,7 +311,7 @@ public class CostController {
} }
@GetMapping("/check/hrCheckRefuse") @GetMapping("/check/hrCheckRefuse")
@ApiOperation("最终审核人驳回") @ApiOperation("行政审核驳回")
public CostResult<Void> hrCheckRefuse(@RequestParam String costNo, public CostResult<Void> hrCheckRefuse(@RequestParam String costNo,
@RequestParam Integer userid, @RequestParam Integer userid,
@RequestParam String rejectReason) { @RequestParam String rejectReason) {
......
...@@ -125,6 +125,8 @@ public abstract class AbstractCostService implements CostService { ...@@ -125,6 +125,8 @@ public abstract class AbstractCostService implements CostService {
costDomain.setCanAudit(costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.financialReviewer, currentUserId) != null); costDomain.setCanAudit(costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.financialReviewer, currentUserId) != null);
} else if (costDomain.getCostStatus().equals(CostDomain.STATUS_FINAL_CHECK)) { } else if (costDomain.getCostStatus().equals(CostDomain.STATUS_FINAL_CHECK)) {
costDomain.setCanAudit(costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.finalReviewer, currentUserId) != null); costDomain.setCanAudit(costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.finalReviewer, currentUserId) != null);
} else if (costDomain.getCostStatus().equals(CostDomain.STATUS_HR_CHECK)) {
costDomain.setCanAudit(costReviewerMapper.queryOne(costCompany.getId(), CostReviewer.hrReviewer, currentUserId) != null);
} else { } else {
costDomain.setCanAudit(false); costDomain.setCanAudit(false);
} }
......
...@@ -47,7 +47,7 @@ public class HrCheckState extends CostState { ...@@ -47,7 +47,7 @@ public class HrCheckState extends CostState {
} }
//如果不需要审核 直接通过 //如果不需要审核 直接通过
if (!costTemplate.shouldHrCheck(costDomain) { if (!costTemplate.shouldHrCheck(costDomain)) {
costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK); costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
costDao.updateById(costDomain); costDao.updateById(costDomain);
......
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