|
|
@@ -1934,15 +1934,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
amountType="已超出合同可公出标准"+data.getDurationMax()+"小时";
|
|
|
}
|
|
|
}else {
|
|
|
- int yearSum=0;
|
|
|
+ int yearSum=1;
|
|
|
for (TTaskMember tTaskMember : tTaskMembers) {
|
|
|
if (tTaskMember.getYearSum()!=null&&tTaskMember.getYearSum()>yearSum){
|
|
|
yearSum=tTaskMember.getYearSum();
|
|
|
}
|
|
|
}
|
|
|
BigDecimal divide =BigDecimal.ZERO;
|
|
|
- if (tOrderNew.getTotalAmount().compareTo(BigDecimal.valueOf(0))>0){
|
|
|
+ if (tOrderNew.getTotalAmount().compareTo(BigDecimal.valueOf(0))>0&&yearSum>0){
|
|
|
divide=tOrderNew.getTotalAmount().divide(BigDecimal.valueOf(yearSum), BigDecimal.ROUND_HALF_UP);
|
|
|
+ }else {
|
|
|
+ divide=tOrderNew.getTotalAmount();
|
|
|
}
|
|
|
if (divide.compareTo(BigDecimal.valueOf(1))<0){
|
|
|
amountName="此会员订单,本年度金额低于1万";
|