|
|
@@ -1395,7 +1395,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
private void pushData(MainExpenseAccount res) {
|
|
|
List<SonExpenseAccount> sonList = res.getSonList();
|
|
|
- sonList.forEach(e->{
|
|
|
+ for (SonExpenseAccount e : sonList) {
|
|
|
if (StringUtils.isNotEmpty(e.getUserNames())){
|
|
|
String userNames = e.getUserNames();
|
|
|
String districtName = e.getDistrictName();
|
|
|
@@ -1409,30 +1409,32 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
districtName=districtName.replace(userNames,"");
|
|
|
e.setDistrictName(districtName);
|
|
|
}
|
|
|
- if (e.getOrderNo()!=null){
|
|
|
- List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTask(e.getOrderNo(), null);
|
|
|
- tOrderTaskBos.forEach(e1->{
|
|
|
- if(e1.getType()==8){
|
|
|
- e.setType(8);
|
|
|
- }
|
|
|
- });
|
|
|
- TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
- List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
- BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
- str.append(e.getBuyerName()).append(e.getContractNo())
|
|
|
- .append(":应公出").append(out.getMaxDuration()).append("小时")
|
|
|
- .append(",已").append(out.getPeopleCount()).append("人公出")
|
|
|
- .append(out.getFrequency()).append("次")
|
|
|
- .append(",").append(out.getActualDuration()).append("小时")
|
|
|
- .append(",超过").append(out.getMaxDuration()).append("小时")
|
|
|
- .append(",已报销").append(reduce.stripTrailingZeros().stripTrailingZeros()).append("元");
|
|
|
- e.setCountStr(str.toString());
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
+ }
|
|
|
+ if (e.getOrderNo()!=null){
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTask(e.getOrderNo(), null);
|
|
|
+ tOrderTaskBos.forEach(e1->{
|
|
|
+ if(e1.getType()==8){
|
|
|
+ e.setProjectType(8);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
+ List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
+ BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ String str = e.getBuyerName() + e.getContractNo() +
|
|
|
+ ":应公出" + out.getMaxDuration() + "小时" +
|
|
|
+ ",已" + out.getPeopleCount() + "人公出," +
|
|
|
+ out.getFrequency() + "次" +
|
|
|
+ "," + out.getActualDuration() + "小时" +
|
|
|
+ ",超过" + out.getMaxDuration() + "小时" +
|
|
|
+ ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
|
|
|
+ e.setCountStr(str);
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- });
|
|
|
|
|
|
}
|
|
|
|