Merge remote-tracking branch 'origin/master'

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -184,6 +184,26 @@ public class NoCarController {
         }
     }
     /**
+     * 分页查询无车运单统计信息
+     *
+     * @param    billInvoice
+     * @return 用户集合
+     */
+    @PostMapping("/findNocarInvoicesStatic")
+    @ApiOperation(value="分页查询无车发票统计信息", notes="分页查询无车发票统计信息")
+    @LoginRequired
+    public RespR findNocarInvoicesStatic(BillInvoice billInvoice) {
+        try {
+
+            RespR respR = new RespR(nocarInvoiceService.findInvoiceStatics(billInvoice));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+
+    /**
      * 批量运单导入
      *
      * @param file    参数集
@@ -198,7 +218,7 @@ public class NoCarController {
             params.setTitleRows(1);
             params.setHeadRows(1);
             params.setKeyIndex(2);
-            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params) ;list.remove(0);
             buildDate(list);
             RespR respR = noCarBillWayService.batchBillWayStart(list,customerName);
             return respR;
@@ -247,7 +267,7 @@ public class NoCarController {
             params.setTitleRows(1);
             params.setHeadRows(1);
             params.setKeyIndex(2);
-            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);list.remove(0);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
             buildDateEnd(list);
             RespR respR = noCarBillWayService.batchBillWayEnd(list,customerName);
             return respR;

src/main/java/com/jkcredit/invoice/mapper/Binvoce/BillInvoiceMapper.java

@@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
+
 @Repository
 public interface BillInvoiceMapper extends BaseMapper<BillInvoice>{
     IPage<List<BillInvoice>> selectAllByPage(Page page, @Param("billInvoice") BillInvoice billInvoice);
@@ -21,4 +23,6 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice>{
     List<BillInvoice> selectByBillNum(String wayBillNum);
 
     BillInvoice selectByInvoiceNum(String wayBillNum);
+
+    Map<String,String> findInvoiceStatics(@Param("billInvoice") BillInvoice billInvoice);
 }

src/main/java/com/jkcredit/invoice/service/nocar/NocarInvoiceService.java

@@ -6,6 +6,7 @@ import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 无车发票服务
@@ -18,4 +19,6 @@ public interface NocarInvoiceService {
      * @return
      */
     IPage<List<BillInvoice>> findByPageAndInvoice(Page page, BillInvoice billInvoice);
+
+    Map<String,String> findInvoiceStatics(BillInvoice billInvoice);
 }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NocarInvoiceServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+
 @Service
 public class NocarInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper,BillInvoice> implements NocarInvoiceService{
     @Autowired
@@ -19,4 +21,9 @@ public class NocarInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper,BillI
     public IPage<List<BillInvoice>> findByPageAndInvoice(Page page, BillInvoice billInvoice) {
         return billInvoiceMapper.selectAllByPage(page,billInvoice);
     }
+
+    @Override
+    public Map<String, String> findInvoiceStatics(BillInvoice billInvoice) {
+        return billInvoiceMapper.findInvoiceStatics(billInvoice);
+    }
 }

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -220,4 +220,37 @@
         from t_billInvoice
         where invoiceNum = #{invoiceNum,jdbcType=VARCHAR}
     </select>
+
+    <resultMap id="staticResultMap" type="java.util.Map">
+        <result column="fee" property="fee"/>
+        <result column="totalTaxAmount" property="totalTaxAmount"/>
+        <result column="feeCount" property="feeCount"/>
+    </resultMap>
+    <select id="findInvoiceStatics" resultMap="staticResultMap">
+        select
+        sum(totalAmount) fee,
+        sum(totalTaxAmount) totalTaxAmount,
+        count(DISTINCT(transactionId)) feeCount
+        from t_billInvoice
+        <where>
+            <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
+                and companyName LIKE CONCAT('%',#{billInvoice.companyName},'%')
+            </if>
+            <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
+                and waybillNum = #{billInvoice.waybillNum}
+            </if>
+            <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
+                and plateNum = #{billInvoice.plateNum}
+            </if>
+            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != ''">
+                and invoiceCode = #{billInvoice.invoiceCode}
+            </if>
+            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != ''">
+                and invoiceNum = #{billInvoice.invoiceNum}
+            </if>
+            <if test="billInvoice.invoiceMakeStart != null and billInvoice.invoiceMakeStart != ''">
+                and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}
+            </if>
+        </where>
+    </select>
 </mapper>