md

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

@@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * Statistics 公共 Controller
@@ -48,6 +51,10 @@ public class EmisCommonToolsController extends BaseController
     @Autowired
     private IEmisWaybillService emisWaybillService;
 
+    @Autowired
+    private EmisBaseService emisBaseService;
+
+
     /**
      * 获取app首页统计
      */
@@ -55,11 +62,34 @@ public class EmisCommonToolsController extends BaseController
     public AjaxResult getAppHomeStatData()
     {
         try {
-            //
-            // 获取基本订单的统计数据
+            Map statMap = new HashMap();
 
-            emisWaybillService.getWaybillDetail()
-            return AjaxResult.success("处理成功");
+            // 获取基本订单的统计数据
+            Map empStat=emisBaseService.getWaybillStatDataByEmp(getLoginUser().getUser().getEmpCode());
+
+
+            Map orderStatMap = new HashMap();
+            int waitTakeNum=(int)(Math.random()*100+20);
+            orderStatMap.put("waitTakeNum",waitTakeNum);
+            orderStatMap.put("takeNum",waitTakeNum+8);
+            orderStatMap.put("dispIngNum",waitTakeNum-10);
+            orderStatMap.put("signedNum",waitTakeNum-15);
+            statMap.put("orderStat",orderStatMap);
+
+            // 获取员工佣金信息
+            Map stat=emisBaseService.getCommissionStatByEmp(getLoginUser().getUser().getEmpCode());
+
+            Map commissionStatMap = new HashMap();
+
+            int estMoney=(int)(Math.random()*10000+100);
+
+            commissionStatMap.put("estMoney", (float)estMoney+0.80f);
+            commissionStatMap.put("waitPay", (float)(estMoney-100)+0.80f);
+
+            statMap.put("commStat",commissionStatMap);
+
+
+            return AjaxResult.success("查询成功",statMap);
         }catch (Exception ex){
             ex.printStackTrace();
             return AjaxResult.error(ex.getMessage());

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

@@ -11,6 +11,8 @@
 package com.xdadan.erp.emis.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 /**
@@ -24,6 +26,11 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
 
     public EmisWaybill selectEmisWaybillByBillCode(String billCode);
 
+    public Map selectWaybillStatDataByEmp(String empCode);
+
+    public Map selectCommissionStatDataByEmp(String empCode);
+
+
     public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
 
     /**

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

@@ -99,6 +99,33 @@ public class EmisBaseService {
          return SecurityUtils.getLoginUser().getUser();
      }
 
+     /**
+      * 根据员工获取编号获取统计统计数据
+      * @param empNo
+      * @return
+      */
+     public Map getWaybillStatDataByEmp(String empNo){
+
+         if(StringUtils.isEmpty(empNo)){
+             return null;
+         }
+         return emisWaybillMapper.selectWaybillStatDataByEmp(empNo);
+     }
+
+     /**
+      * 获取员工提成信息
+      * @param empNo
+      * @return
+      */
+     public Map getCommissionStatByEmp(String empNo){
+
+         if(StringUtils.isEmpty(empNo)){
+             return null;
+         }
+         return emisWaybillMapper.selectCommissionStatDataByEmp(empNo);
+     }
+
+
 
      public EmisWaybill getWaybillByBillCode(String billCode){
             if(StringUtils.isEmpty(billCode)){

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

@@ -105,12 +105,7 @@ public interface IEmisWaybillService
     public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
 
 
-    /**
-     * 根据员工获取编号获取统计统计数据
-     * @param empNo
-     * @return
-     */
-    public Map getStatInfoByEmp(String empNo);
+
 
 
     // 账单保存

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

@@ -193,6 +193,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
 
+
     @Override
     public WaybillOrder getWaybillDetailByOrderSn(String orderSn){
 

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

@@ -202,6 +202,18 @@
         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 waybill_status as waybillStatus,count(1) as cnt from emis_waybill
+         where take_piece_employee_code is not null
+         group by waybill_status
+    </select>
+
+    <select id="selectCommissionStatDataByEmp" parameterType="String" resultType="map">
+        select waybill_status as waybillStatus,count(1) as cnt from emis_waybill
+         where take_piece_employee_code is not null
+         group by waybill_status
+    </select>
+
     <select id="selectEmisWaybillByBillCode" parameterType="String" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>