Просмотр исходного кода

报销详情新增客户未归集金额

anderx 1 год назад
Родитель
Сommit
c77a271d07

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -1131,7 +1131,7 @@
                          left join public_release c on b.prid =c.id
                          left join public_release c on b.prid =c.id
                          left join expense_account d on c.id =d.prid
                          left join expense_account d on c.id =d.prid
       where a.order_no = #{orderNo}
       where a.order_no = #{orderNo}
-        and c.status in (1,2) and d.status in (1,2) and c.order_no is null
+        and c.status in (1,2) and d.status in (1,2) and d.order_no is null
     </select>
     </select>
   <select id="getUidNotCountAmount" resultType="java.math.BigDecimal">
   <select id="getUidNotCountAmount" resultType="java.math.BigDecimal">
     SELECT  d.real_amount
     SELECT  d.real_amount
@@ -1139,6 +1139,6 @@
                        left join public_release c on b.prid =c.id
                        left join public_release c on b.prid =c.id
                        left join expense_account d on c.id =d.prid
                        left join expense_account d on c.id =d.prid
     where b.uid= #{uid}
     where b.uid= #{uid}
-      and c.status in (1,2) and d.status in (1,2) and c.order_no is null
+      and c.status in (1,2) and d.status in (1,2) and d.order_no is null
   </select>
   </select>
 </mapper>
 </mapper>

+ 2 - 3
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1482,8 +1482,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 String str = getString(e, out, count, yxyCount, zxsCount,qtCount,useOyd);
                 String str = getString(e, out, count, yxyCount, zxsCount,qtCount,useOyd);
                 str=str+",未归集:"+countAmount.stripTrailingZeros().toPlainString()+"元";
                 str=str+",未归集:"+countAmount.stripTrailingZeros().toPlainString()+"元";
                 orderList.add(str);
                 orderList.add(str);
-            }
-            if (e.getPrid() !=null){
+            }else if (e.getPrid() !=null){
                 //获取未归集的订单
                 //获取未归集的订单
                 List<PublicReleaseDetails> list = publicReleaseMapper.selectDetailsByPrid(e.getPrid());
                 List<PublicReleaseDetails> list = publicReleaseMapper.selectDetailsByPrid(e.getPrid());
 
 
@@ -1492,7 +1491,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     User user = userMapper.selectByPrimaryKey(e2.getUid());
                     User user = userMapper.selectByPrimaryKey(e2.getUid());
                     List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
                     List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
                     BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                     BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
-                    sb.append(user.getNickname()).append(",未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");
+                    sb.append("[").append(user.getNickname()).append("]未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");
                 }
                 }
                 orderList.add(sb.substring(0,sb.length()-1));
                 orderList.add(sb.substring(0,sb.length()-1));
             }
             }