Parcourir la source

报销统计开发

anderx il y a 1 an
Parent
commit
7d8746965a

+ 7 - 3
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2209,8 +2209,8 @@ 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,
+    <select id="selectExpenseCount" parameterType="com.goafanti.expenseAccount.bo.ExpenseCountsInput" resultType="com.goafanti.expenseAccount.bo.ExpenseCountsBo">
+      select a.order_no orderNo,a.contract_no contractNo,b.buyer_name buyerName,a.total_amount totalAmount,a.settlement_amount settlementAmount,
              c.expenseCount,c.peopleCount,c.notExamine,c.rejectCount,c.paymentAmount,c.days
       from t_order_new a left join t_order_mid b on a.order_no =b.order_no left join (select a.order_no,a.expenseCount,b.peopleCount,c.notExamine,
             c.rejectCount,ifnull(d.paymentAmount,0)paymentAmount,a.days from (select a.order_no,count(a.id)expenseCount,
@@ -2245,8 +2245,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
                   and a.create_time BETWEEN #{startTime} and #{endTime}
                 </if>
                 group by order_no)
-        and  a.contract_no like concat('%' ,#{contractNo},'%')
+      <if test="contactNo !=null ">
+        and  a.contract_no like concat('%' ,#{contactNo},'%')
+      </if>
+      <if test="depId !=null ">
         and a.order_dep = #{depId}
+      </if>
     </select>
 
 </mapper>

+ 47 - 19
src/main/java/com/goafanti/expenseAccount/bo/ExpenseCountsBo.java

@@ -1,9 +1,37 @@
 package com.goafanti.expenseAccount.bo;
 
+import java.math.BigDecimal;
+
 public class ExpenseCountsBo {
 
-    private String orderNo , contractNo , buyerName ,expenseCount,peopleCount,notExamine,rejectCount,paymentAmount,days;
+    private String orderNo;
+    private String contractNo;
+    private String buyerName;
+    private BigDecimal totalAmount;
+    private BigDecimal settlementAmount;
+    private Integer expenseCount;
+    private Integer peopleCount;
+    private Integer rejectCount;
+    private BigDecimal paymentAmount;
+
+    private Integer notExamine;
+    private Integer days;
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
 
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public BigDecimal getSettlementAmount() {
+        return settlementAmount;
+    }
+
+    public void setSettlementAmount(BigDecimal settlementAmount) {
+        this.settlementAmount = settlementAmount;
+    }
 
     public String getOrderNo() {
         return orderNo;
@@ -29,51 +57,51 @@ public class ExpenseCountsBo {
         this.buyerName = buyerName;
     }
 
-    public String getExpenseCount() {
+    public Integer getExpenseCount() {
         return expenseCount;
     }
 
-    public void setExpenseCount(String expenseCount) {
+    public void setExpenseCount(Integer expenseCount) {
         this.expenseCount = expenseCount;
     }
 
-    public String getPeopleCount() {
+    public Integer getPeopleCount() {
         return peopleCount;
     }
 
-    public void setPeopleCount(String peopleCount) {
+    public void setPeopleCount(Integer peopleCount) {
         this.peopleCount = peopleCount;
     }
 
-    public String getNotExamine() {
-        return notExamine;
-    }
-
-    public void setNotExamine(String notExamine) {
-        this.notExamine = notExamine;
-    }
-
-    public String getRejectCount() {
+    public Integer getRejectCount() {
         return rejectCount;
     }
 
-    public void setRejectCount(String rejectCount) {
+    public void setRejectCount(Integer rejectCount) {
         this.rejectCount = rejectCount;
     }
 
-    public String getPaymentAmount() {
+    public BigDecimal getPaymentAmount() {
         return paymentAmount;
     }
 
-    public void setPaymentAmount(String paymentAmount) {
+    public void setPaymentAmount(BigDecimal paymentAmount) {
         this.paymentAmount = paymentAmount;
     }
 
-    public String getDays() {
+    public Integer getNotExamine() {
+        return notExamine;
+    }
+
+    public void setNotExamine(Integer notExamine) {
+        this.notExamine = notExamine;
+    }
+
+    public Integer getDays() {
         return days;
     }
 
-    public void setDays(String days) {
+    public void setDays(Integer days) {
         this.days = days;
     }
 }

+ 3 - 2
src/main/java/com/goafanti/expenseAccount/controller/ExpenseCountsController.java

@@ -2,6 +2,7 @@ package com.goafanti.expenseAccount.controller;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.expenseAccount.bo.ExpenseCountsBo;
 import com.goafanti.expenseAccount.bo.ExpenseCountsInput;
 import com.goafanti.expenseAccount.service.ExpenseCountsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,8 +16,8 @@ public class ExpenseCountsController extends CertifyApiController {
 
     @Autowired
     private ExpenseCountsService expenseAccountService;
-    @RequestMapping(value = "/getcounts",method = RequestMethod.GET)
-    public Result getCounts(ExpenseCountsInput in){
+    @RequestMapping(value = "/getCounts",method = RequestMethod.GET)
+    public Result<ExpenseCountsBo> getCounts(ExpenseCountsInput in){
         Result res=new Result();
         return res.data(expenseAccountService.getCounts(in));
     }

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

@@ -16,7 +16,7 @@ public class ExpenseCountsServiceImpl implements ExpenseCountsService {
     private ExpenseAccountMapper expenseAccountMapper;
     @Override
     public Object getCounts(ExpenseCountsInput in) {
-        if (in.getTargetType()==null)in.setTargetType(0);
+        if (in.getTargetType()==null)in.setTargetType(1);
         return tOrderNewMapper.selectExpenseCount(in);
     }
 }