update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostTemplate.java

@@ -101,15 +101,16 @@ public class CostTemplate implements Serializable {
     public boolean shouldFinalCheck(CostDomain cost) {
         BigDecimal amount = cost.getAmount();
 
-        return finalMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
-                amount.compareTo(finalMinimumReviewAmount) >= 0 &&
-                !cost.getCompanyName().contains("工会");
+        return !(finalMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
+                amount.compareTo(finalMinimumReviewAmount) <= 0 &&
+                !cost.getCompanyName().contains("工会"));
     }
 
     public boolean shouldDepartmentCheck(CostDomain cost, BigDecimal departmentMinimumReviewAmount) {
         BigDecimal amount = cost.getAmount();
-        return departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
-                amount.compareTo(departmentMinimumReviewAmount) >= 0 &&
-                !cost.getCompanyName().contains("工会");
+
+        return !(departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
+                amount.compareTo(departmentMinimumReviewAmount) <= 0 &&
+                !cost.getCompanyName().contains("工会"));
     }
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java

@@ -47,7 +47,7 @@ public class DepartmentCheckState extends CostState {
         //如果不需要审核 直接通过
         OaUser oaUser = oaUserMapper.selectByOaUserId(costDomain.getCreateUserid());
         OaDepartment oaDepartment = oaDepartmentMapper.selectByDepartmentId(oaUser.getPrimaryDepartmentId());
-        if (costTemplate.shouldDepartmentCheck(costDomain, oaDepartment.getDepartmentMinimumReviewAmount())) {
+        if (!costTemplate.shouldDepartmentCheck(costDomain, oaDepartment.getDepartmentMinimumReviewAmount())) {
 
             costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
             costDao.updateById(costDomain);