Browse Source

报销统计开发

anderx 1 year ago
parent
commit
53a0aaf198

+ 3 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.Department;
 import com.goafanti.common.model.FinanceCount;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.expenseAccount.bo.ExpenseCountsBo;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.outStatistics.OutOrderSalesSourceAmount;
 import com.goafanti.organization.bo.OrganizationListOut;
@@ -101,4 +102,6 @@ public interface TOrderNewMapper {
     List<String> selectByFinanceNotExamine(String financeId);
 
     void updateOrderDepFinanceExamineName(List<String> list);
+
+    List<ExpenseCountsBo> selectExpenseCount();
 }

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

@@ -716,12 +716,14 @@
            c.debit_id debitId, debit.real_amount DebitRealAmount ,debit.settlement_amount DebitSettlementAmount,debit.liquidation_status DebitliquidationStatus,
            d.id detId,d.`type` detType,d.amount detAmount,d.real_amount detRealAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
            d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,d.type_other detTypeOther,
-           date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
+           tm.buyer_name,o.buyer_id,
+             date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
            date_format(d.agree_time,'%Y-%m-%d')agreeTime
     from expense_relationship a left join expense_account b on a.id =b.id left join expense_account c on a.ea_id =c.id
     left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
      left join expense_account_private eap on b.eaaid =eap.id left join expense_account_details d on c.id =d.eaid
-    left join t_order_new o on c.order_no =o.order_no left join public_release pr on c.prid=pr.id left join t_order_new pro on pr.order_no=pro.order_no
+    left join t_order_new o on c.order_no =o.order_no left join t_order_mid tm on c.order_no=tm.order_no
+    left join public_release pr on c.prid=pr.id left join t_order_new pro on pr.order_no=pro.order_no
     left join expense_account debit on c.debit_id=debit.id
     where a.id= #{id}
   </select>
@@ -784,6 +786,8 @@
     <result column="debitLiquidationStatus" jdbcType="INTEGER" property="debitLiquidationStatus" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
+    <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
     <result column="publicReleaseType" jdbcType="INTEGER" property="publicReleaseType" />
     <association property="detList" resultMap="ExpenseAccountDetailsMap"/>
   </resultMap>
@@ -990,10 +994,10 @@
     select count(*)
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id
-    left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
+    left join t_order_new o on a.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
     left join department dep on mea.apply_dep =dep.id
-    left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on mea.aid=ad.id
-    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
+    left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on a.aid=ad.id
+    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id
     where 1=1
     <include refid="ExpenseDetailsSql"/>
   </select>
@@ -1001,10 +1005,10 @@
     select sum(ead.amount) totalAmount
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id
-    left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
+    left join t_order_new o on a.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
     left join department dep on mea.apply_dep =dep.id
-    left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on mea.aid=ad.id
-    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
+    left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on a.aid=ad.id
+    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id
     where 1=1
     <include refid="ExpenseDetailsSql"/>
   </select>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2209,5 +2209,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     from t_order_new a left join t_order_examine b on a.order_no=b.order_no
     where b.status=0 and b.aid = #{financeId} and a.process_status = 3
   </select>
+    <select id="selectExpenseCount" resultType="com.goafanti.expenseAccount.bo.ExpenseCountsBo">
+      select a.order_no orderNo ,a.contract_no contractNo ,b.buyer_name buyerName
+      from t_order_new a left join t_order_mid b on a.order_no =b.order_no
+      where a.order_no in
+            (select a.order_no from expense_account a where a.target_type =1 group by order_no)
+    </select>
 
 </mapper>

+ 6 - 0
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsBo.java

@@ -0,0 +1,6 @@
+package com.goafanti.expenseAccount.bo;
+
+public class ExpenseCountsBo {
+
+    private String orderNo , contractNo , buyerName;
+}

+ 18 - 0
src/main/java/com/goafanti/expenseAccount/bo/SonExpenseAccount.java

@@ -26,6 +26,8 @@ public class SonExpenseAccount {
     private String plan;
     private String contractNo;
     private String orderNo;
+    private String buyerName;
+    private String buyerId;
     private Integer debitId;
     private Integer publicReleaseType;
     private BigDecimal debitRealAmount;
@@ -33,6 +35,22 @@ public class SonExpenseAccount {
     private Integer debitLiquidationStatus;
     private List<SonExpenseAccountDetails> detList;
 
+    public String getBuyerId() {
+        return buyerId;
+    }
+
+    public void setBuyerId(String buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
     public Integer getPrid() {
         return prid;
     }

+ 22 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseCountsController.java

@@ -0,0 +1,22 @@
+package com.goafanti.expenseAccount.controller;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.expenseAccount.service.ExpenseCountsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/admin/expenseCounts")
+public class ExpenseCountsController extends CertifyApiController {
+
+    @Autowired
+    private ExpenseCountsService expenseAccountService;
+    @RequestMapping(value = "/getcounts",method = RequestMethod.GET)
+    public Result getCounts(){
+        Result res=new Result();
+        return res.data(expenseAccountService.getCounts());
+    }
+}

+ 5 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseCountsService.java

@@ -0,0 +1,5 @@
+package com.goafanti.expenseAccount.service;
+
+public interface ExpenseCountsService {
+    Object getCounts();
+}

+ 23 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseCountsServiceImpl.java

@@ -0,0 +1,23 @@
+package com.goafanti.expenseAccount.service.impl;
+
+import com.goafanti.common.dao.ExpenseAccountMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.expenseAccount.service.ExpenseCountsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExpenseCountsServiceImpl implements ExpenseCountsService {
+
+    @Autowired
+    private TOrderNewMapper tOrderNewMapper;
+    @Autowired
+    private ExpenseAccountMapper expenseAccountMapper;
+    @Override
+    public Object getCounts() {
+        //获取订单基本信息
+        tOrderNewMapper.selectExpenseCount();
+        //获取订单报销多人
+        return null;
+    }
+}