diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index 3082d1b..9ad8381 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -363,12 +363,7 @@ public class Oms2cWaybillController extends BaseController @GetMapping("/getCustOrderStatData") public AjaxResult getCustOrderStatData() { - JSONObject jData = new JSONObject(); - jData.put("sendNum",0); - jData.put("recieveNum",0); - - return AjaxResult.success("成功",jData); - + return AjaxResult.success("成功",emisWaybillService.selectUserSendAndReciveOrderCount(getLoginUser().getUser().getCustomerCode())); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java index fad7c12..0195ff3 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java @@ -34,6 +34,21 @@ public interface EmisWaybillMapper extends BaseMapper */ public List selectUserOrderList(EmisWaybill emisWaybill); + /** + * 获取寄件订单数量 + * @param customerCode + * @return + */ + public Long selectUserSendOrderCount(@Param("customerCode") String customerCode); + + + /** + * 获取收件订单数量 + * @param customerCode + * @return + */ + public Long selectUserRecieveOrderCount(@Param("customerCode") String customerCode); + /** * 专属业务员列表 * @param customerCode @@ -44,7 +59,6 @@ public interface EmisWaybillMapper extends BaseMapper @Param("searchValue")String searchValue, @Param("blDefaultFlag")String blDefaultFlag); - /** * 业务员信息查询 * @param searchValue diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java index ef85ed0..eb5d9e8 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java @@ -15,6 +15,7 @@ import java.util.Map; import com.xdadan.erp.oms.domain.EmisWaybill; import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.vo.Salesmen; +import org.apache.ibatis.annotations.Param; /** * @ClassName EmisWaybillService @@ -32,6 +33,10 @@ public interface IEmisWaybillService */ public List selectUserOrderList(EmisWaybill emisWaybill); + + public Map selectUserSendAndReciveOrderCount(String customerCode); + + public List selectUserBindSalesmenList(Salesmen salesmen); diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java index 6a814dd..65c30cc 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java @@ -65,10 +65,21 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService return list; } + + @Override + public Map selectUserSendAndReciveOrderCount(String customerCode) + { + Map cntMap = new HashMap(); + cntMap.put("sendNum",emisWaybillMapper.selectUserSendOrderCount(customerCode)); + cntMap.put("recieveNum",emisWaybillMapper.selectUserRecieveOrderCount(customerCode)); + + return cntMap; + } + /** * 查询业务员 * - * @param searchValue 运单列表 + * @param salesmen * @return 运单列表 */ @Override diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml index fea3281..e101868 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -523,6 +523,44 @@ + + + + + +