md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java

@@ -65,7 +65,7 @@ public class EmisCommonToolsController extends BaseController
             Map statMap = new HashMap();
 
             // 获取基本订单的统计数据
-            Map empStat=emisBaseService.getWaybillStatDataByEmp(getLoginUser().getUser().getEmpCode());
+            List<Map> empStatList=emisBaseService.getWaybillStatDataByEmp(getLoginUser().getUser().getEmpCode());
 
 
             Map orderStatMap = new HashMap();
@@ -77,7 +77,7 @@ public class EmisCommonToolsController extends BaseController
             statMap.put("orderStat",orderStatMap);
 
             // 获取员工佣金信息
-            Map stat=emisBaseService.getCommissionStatByEmp(getLoginUser().getUser().getEmpCode());
+            List<Map> statList=emisBaseService.getCommissionStatByEmp(getLoginUser().getUser().getEmpCode());
 
             Map commissionStatMap = new HashMap();
 

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java

@@ -10,11 +10,14 @@
  */
 package com.xdadan.erp.emis.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisWaybill;
+import org.apache.ibatis.annotations.Param;
+
 /**
  * @ClassName EmisWaybillMapper
  * @Description <p> 运单列表 Mapper 接口 </p>
@@ -26,9 +29,10 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
 
     public EmisWaybill selectEmisWaybillByBillCode(String billCode);
 
-    public Map selectWaybillStatDataByEmp(String empCode);
 
-    public Map selectCommissionStatDataByEmp(String empCode);
+    public List<Map> selectWaybillStatByEmp(@Param("empCode")String empCode,@Param("waybillStatus")String waybillStatus);
+
+    public List<Map> selectCommStatDataByEmp(String empCode);
 
 
     public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -104,7 +104,7 @@ public class EmisBaseService {
       * @param empNo
       * @return
       */
-     public Map getWaybillStatDataByEmp(String empNo){
+     public List<Map> getWaybillStatDataByEmp(String empNo){
 
          if(StringUtils.isEmpty(empNo)){
              return null;
@@ -117,7 +117,7 @@ public class EmisBaseService {
       * @param empNo
       * @return
       */
-     public Map getCommissionStatByEmp(String empNo){
+     public List<Map> getCommissionStatByEmp(String empNo){
 
          if(StringUtils.isEmpty(empNo)){
              return null;

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -202,9 +202,17 @@
         select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill
     </sql>
 
-    <select id="selectWaybillStatDataByEmp" parameterType="String" resultType="map">
+    <select id="selectWaybillStatByEmp" parameterType="String" resultType="map">
          select waybill_status as waybillStatus,count(1) as cnt from emis_waybill
-         where take_piece_employee_code is not null
+        <where>
+            del_flag='0'
+            <if test="empCode != null  and empCode != ''">
+               and take_piece_employee_code=#{empCode}
+            </if>
+            <if test="waybillStatus != null  and waybillStatus != ''">
+                and waybill_status=#{waybillStatus}
+            </if>
+        </where>
          group by waybill_status
     </select>