anderx лет назад: 2
Родитель
Сommit
c92821ee7d

+ 2 - 1
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -25,7 +25,8 @@ public interface ExpenseAccountMapper {
 
     OutExpenseAccount selectByaidAndPrid(InputExpenseAccount in);
 
-    List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid,@Param("depId")String depId, @Param("type")Integer type);
+    List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid,@Param("depId")String depId, @Param("type")Integer type,
+                                               @Param("id")Integer id);
 
     List<OutMyEAStatistics> selectStatistics(@Param("name") String name, @Param("depId") String depId,
                                              @Param("startTime") String startTime, @Param("endTime") String endTime);

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

@@ -522,10 +522,20 @@
   </select>
     <select id="selectByaidAndType" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
       SELECT
-      <include refid="selectDtailsSql"/>
+        a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
+        a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
+        a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
+        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
+        c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,
+        a.liquidation_status liquidationStatus, a.remarks,
+        date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+        date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
+        date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
       FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
       left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
       left join t_order_mid tm on a.order_no =tm.order_no
+      left join (select debit_id ,sum(settlement_amount) amount from expense_account where debit_id is not  null and
+      id !=  #{id} group by debit_id )t0 on a.id =t0.debit_id
       WHERE a.status=2 and a.liquidation_status in (0,1,2)
       and a.aid= #{aid} and a.type= #{type} and a.pay_dep= #{depId}
         order by a.create_time desc

+ 1 - 11
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -621,17 +621,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Override
     public List<OutExpenseAccount> selectDebitOrder(String depId,Integer id) {
         String aid= TokenManager.getAdminId();
-        List<OutExpenseAccount> list = expenseAccountMapper.selectByaidAndType(aid, depId, 4);
-        for (OutExpenseAccount e : list) {
-            BigDecimal count=new BigDecimal(0);
-            List<ExpenseAccount> list1 = expenseAccountMapper.selectByDebitId(e.getId());
-            for (ExpenseAccount e1 : list1) {
-                if (e1.getId()!=id){
-                    count=count.add(e1.getSettlementAmount());
-                }
-            }
-            e.setSettlementAmount(count);
-        }
+        List<OutExpenseAccount> list = expenseAccountMapper.selectByaidAndType(aid, depId, 4,id);
         return list;
     }