|
|
@@ -1481,32 +1481,32 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
BigDecimal zxsCount, BigDecimal qtCount,OrderYearMaxDuration useOyd) {
|
|
|
TOrderPublicReleaseCountBo bo = new TOrderPublicReleaseCountBo();
|
|
|
bo.setMaxDuration(useOyd.getMaxDuration());
|
|
|
- bo.setExceedDuration(useOyd.getMaxDuration().subtract(BigDecimal.valueOf(out.getActualDuration())));
|
|
|
+ bo.setExceedDuration(useOyd.getMaxDuration().subtract(BigDecimal.valueOf(out.getActualDuration())).abs());
|
|
|
bo.setActualDuration(out.getActualDuration());
|
|
|
bo.setFrequency(out.getFrequency());
|
|
|
bo.setPeopleCount(out.getPeopleCount());
|
|
|
- String maxString=":应公出" + bo.getMaxDuration() + "["+useOyd.getYear()+"年]"+"小时";
|
|
|
+ String maxString=":应公出" + bo.getMaxDuration() +"小时["+useOyd.getYear()+"年]";
|
|
|
String actualString=",超过" + bo.getExceedDuration() + "小时,";
|
|
|
if (useOyd.getStatus()==1){
|
|
|
- maxString=":不限制公出小时"+"["+useOyd.getYear()+"年]";
|
|
|
+ maxString=":不限制公出小时["+useOyd.getYear()+"年]";
|
|
|
actualString="";
|
|
|
}
|
|
|
StringBuilder expenseString=new StringBuilder().append("报销").append(count.stripTrailingZeros().toPlainString()).append("元");
|
|
|
- if (yxyCount != null || zxsCount != null||qtCount != null){
|
|
|
+ if (yxyCount.compareTo(BigDecimal.ZERO)>0 || zxsCount.compareTo(BigDecimal.ZERO)>0||qtCount.compareTo(BigDecimal.ZERO)>0){
|
|
|
expenseString.append("(");
|
|
|
- if (zxsCount != null && zxsCount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ if (zxsCount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
expenseString.append("技术").append(zxsCount.stripTrailingZeros().toPlainString()).append("元,");
|
|
|
}
|
|
|
- if (yxyCount != null && yxyCount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ if (yxyCount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
expenseString.append("营销").append(yxyCount.stripTrailingZeros().toPlainString()).append("元,");
|
|
|
}
|
|
|
- if (qtCount != null && qtCount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ if (qtCount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
expenseString.append("其他").append(qtCount.stripTrailingZeros().toPlainString()).append("元,");
|
|
|
}
|
|
|
expenseString.deleteCharAt(expenseString.length() - 1);
|
|
|
expenseString.append(")");
|
|
|
}
|
|
|
- if (bo.getMaxDuration().compareTo(BigDecimal.valueOf(bo.getActualDuration()))<1){
|
|
|
+ if (bo.getMaxDuration().compareTo(BigDecimal.valueOf(bo.getActualDuration()))>0){
|
|
|
actualString="";
|
|
|
}
|
|
|
return e.getBuyerName() + e.getContractNo() +
|