Commit 2574e48f by liyanlin

1、修改4k费用系统地址;

2、审核流程变更bug fix。
parent 9cccfde8
...@@ -30,7 +30,7 @@ public class CostApi4kController { ...@@ -30,7 +30,7 @@ public class CostApi4kController {
@Resource @Resource
private RestTemplate restTemplate; private RestTemplate restTemplate;
private final static String BASE_URL = "https://oa.4kmiles.com/costApi/purchase/other"; private final static String BASE_URL = "https://fee.infisell.com/costApi/purchase/other";
@ApiOperation("审核回调地址") @ApiOperation("审核回调地址")
@PostMapping(value = "/purchasing/ApplyCallbackUrl",consumes = "application/json") @PostMapping(value = "/purchasing/ApplyCallbackUrl",consumes = "application/json")
......
...@@ -161,7 +161,9 @@ public class GeneralManagerCheckState extends CostState { ...@@ -161,7 +161,9 @@ public class GeneralManagerCheckState extends CostState {
return true; return true;
} }
CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costDomain.getTypeNo()); CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costDomain.getTypeNo());
if (costTypeDomain.getTypeName().contains("工资") || costTypeDomain.getTypeName().contains("物流")|| costTypeDomain.getTypeName().contains("社保费")) { if (costTypeDomain.getTypeName().contains("工资") || costTypeDomain.getTypeName().contains("物流")
|| costTypeDomain.getTypeName().contains("社保费")
|| costTypeDomain.getTypeName().contains("公积金")) {
return true; return true;
} }
return false; return false;
......
...@@ -60,7 +60,7 @@ public class HrCheckState extends CostState { ...@@ -60,7 +60,7 @@ public class HrCheckState extends CostState {
//如果不需要审核 直接通过 //如果不需要审核 直接通过
if (!costTemplate.shouldHrCheck(costDomain)) { if (!costTemplate.shouldHrCheck(costDomain)) {
costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK); costDomain.setCostStatus(CostDomain.STATUS_MANAGER_CHECK);
costDomain.setLastModifyDate(LocalDateTime.now()); costDomain.setLastModifyDate(LocalDateTime.now());
costDao.updateById(costDomain); costDao.updateById(costDomain);
...@@ -82,7 +82,7 @@ public class HrCheckState extends CostState { ...@@ -82,7 +82,7 @@ public class HrCheckState extends CostState {
.costNo(costDomain.getCostNo()) .costNo(costDomain.getCostNo())
.isPassed(true) .isPassed(true)
.build(); .build();
costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK); costDomain.setCostStatus(CostDomain.STATUS_MANAGER_CHECK);
costDomain.setLastModifyDate(LocalDateTime.now()); costDomain.setLastModifyDate(LocalDateTime.now());
costDao.updateById(costDomain); costDao.updateById(costDomain);
costLogService.save(costDomain.getCostNo(), currentUserId, "行政审核通过", CostLogDomain.HR_PASS); costLogService.save(costDomain.getCostNo(), currentUserId, "行政审核通过", CostLogDomain.HR_PASS);
......
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