Commit 20afed2e by jianshuqin

啫啫煲的收款单设置鹏哥节点自动通过

parent d46cd2cc
......@@ -89,7 +89,7 @@ public class DepartmentCheckState extends CostState {
boolean shouldAutoCheck = false;
List<CostCurrentReviewer> costCurrentReviewerList = costCurrentReviewerMapper.selectByCostNo(costDomain.getCostNo());
CostCurrentReviewer costCurrentReviewer = null;
if ("啫啫煲".equals(costDomain.getCompanyName())) {
if ("啫啫煲".equals(costDomain.getCompanyName()) && costDomain.getCostForm() != 2) {
if (costCurrentReviewerList != null && costCurrentReviewerList.size() > 0) {
Optional<CostCurrentReviewer> optionalCostCurrentReviewer = costCurrentReviewerList.stream().filter(l -> l.getOaUserId() == 720).findFirst();
if(optionalCostCurrentReviewer.isPresent()) {
......
......@@ -168,7 +168,7 @@ public class GeneralManagerCheckState extends CostState {
return true;
}
//付款主体是"啫啫煲"且小于1k不需要总经办审批
if ("啫啫煲".equals(costDomain.getCompanyName())) {
if ("啫啫煲".equals(costDomain.getCompanyName()) && costDomain.getCostForm() != 2) {
if (costDomain.getAmountRmb().compareTo(new BigDecimal("1000")) < 0) {
costLogService.saveByManage(costDomain.getCostNo(),"人民币金额【" + costDomain.getAmountRmb() + "】少于设定【1000】审核条件",null);
return true;
......
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