重新生成工时表

4 years ago · 4a0b3aa3d1
1 changed files with 6 additions and 1 deletions
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
@ -82,7 +82,12 @@ public class XmTaskSbillDetailService extends BaseService {
                detail.setSfee(BigDecimal.ZERO);
            }
        }
-        detail.setSamt(detail.getAmt().subtract(detail.getShareFee()).subtract(detail.getSfee()));
+        if(detail.getOthFee()==null){
+            detail.setOthFee(BigDecimal.ZERO);
+        }else if(detail.getOthFee().compareTo(BigDecimal.ZERO)<0){
+            detail.setOthFee(BigDecimal.ZERO);
+        }
+        detail.setSamt(detail.getAmt().subtract(detail.getShareFee()).subtract(detail.getSfee()).subtract(detail.getOthFee()));

    }
 }