Merge branch 'master-report-form' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/auth/PageResult.java

@@ -5,6 +5,10 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 手动给集合分页
+ * @author Administrator
+ */
 @Data
 public class PageResult<M> {
     /** 页码 */

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -157,10 +157,20 @@ public interface UserFeign {
     public ObjectRestResponse<Void> withDrawprocess(@RequestParam(value = "orderNo") String orderNo,
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
+
+
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
 
     @GetMapping("/app/user/collect/exist")
     boolean isCollectionByTypeAndTypeId(@RequestParam("userId") Integer userId,
                                         @RequestParam(value = "type") int type,
                                         @RequestParam("id") Integer typId);
+
+    /**
+     * 通过公司id,获取员工的下级用户id
+     * @param parentCompanyId
+     * @return
+     */
+    @GetMapping("/postion/admin/userid")
+    List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -345,4 +345,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     }
 
 
+    public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) {
+       return mapper.getUserIdByParentCompany(parentCompanyId);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionTempMapper.java

@@ -3,8 +3,12 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 用户身份职位表
  * 
@@ -17,4 +21,6 @@ public interface AppUserPositionTempMapper extends Mapper<AppUserPositionTemp> {
 
     @Insert("INSERT IGNORE INTO `app_user_position_temp`(`user_id`,`phone`,`name`,`position_id`,`crt_time`)VALUES(#{userId},#{phone},#{name},#{positionId},#{crtTime})")
     void insertWithIgnoreRepeat(AppUserPositionTemp appUserPositionTemp);
+
+    List<Integer> getUserIdByParentCompany(@Param("parentCompanyId") List<Integer> parentCompanyId);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -107,4 +107,10 @@ public class AppUserPositionController {
        return ObjectRestResponse.succ(dataVO);
     }
 
+
+    @GetMapping("/userid")
+    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId){
+     return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
+    }
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserPositionTempMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper">
+    <select id="getUserIdByParentCompany" resultType="Integer">
+        SELECT
+        r.uid
+        FROM
+        app_user_position_temp pt
+        LEFT JOIN app_user_detail d ON pt.user_id = d.userid
+        LEFT JOIN (
+        SELECT
+        parent_id AS pid,
+        user_id AS uid
+        FROM
+        app_user_relation
+        WHERE
+        is_del = 0
+        ) r ON d.userid = r.pid
+        WHERE
+        pt.is_del = 0
+        <if test="parentCompanyId != null and parentCompanyId.size() !=0">
+            AND pt.company_id IN
+            <foreach collection="parentCompanyId" index="index" item="pid" open="(" separator="," close=")">
+                #{pid}
+            </foreach>
+        </if>
+
+    </select>
+</mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/BookkeepingTypeEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+/**
+ * 账目类型
+ * @author Administrator
+ */
+
+public enum BookkeepingTypeEnum {
+    ENTER(0,"入账"),OUT(1,"出账");
+
+    private Integer code;
+    private String msg;
+    BookkeepingTypeEnum(int code, String msg) {
+        this.code=code;
+        this.msg=msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/Achievement.java

+package com.xxfc.platform.order.pojo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@ApiModel("订单业绩明细表")
+public class Achievement implements Serializable {
+    private static final Map<Integer, String> orderTypeMap = new HashMap<>();
+    private static final Map<Integer, String> payWayMap = new HashMap<>();
+
+    static {
+        orderTypeMap.put(1, "租车");
+        orderTypeMap.put(2, "旅游");
+        orderTypeMap.put(3, "会员");
+        payWayMap.put(null, "微信");
+        payWayMap.put(1, "微信支付");
+        payWayMap.put(2, "支付宝支付");
+        payWayMap.put(3, "银联支付");
+    }
+
+    @ApiModelProperty(value = "下单用户真实姓名")
+    private String realname;
+    @ApiModelProperty(value = "用户手机号")
+    private String username;
+    @ApiModelProperty(value = "上级姓名")
+    private String parentRealname;
+    @ApiModelProperty(value = "上级职位")
+    private String positionName;
+    @ApiModelProperty(value = "上级手机号")
+    private String parentUsername;
+    @ApiModelProperty(value = "订单所属公司id")
+    private Integer companyId;
+    @ApiModelProperty(value = "订单所属公司名")
+    private String companyName;
+    @ApiModelProperty(value = "优惠价格")
+    private BigDecimal favorablePrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    @Column(name = "crt_time")
+    private String crtTime;
+    @ApiModelProperty(value = "订单号")
+    private String no;
+    @ApiModelProperty(value = "订单类型")
+    private Integer type;
+    @Column(name = "order_amount")
+    @ApiModelProperty("订单总额")
+    private BigDecimal orderAmount = BigDecimal.ZERO;
+    @ApiModelProperty(value = "实际订单额")
+    @Column(name = "real_amount")
+    private BigDecimal realAmount = BigDecimal.ZERO;
+    @Column(name = "pay_way")
+    @ApiModelProperty(value = "支付方式")
+    private Integer payWay;
+
+    public void setCrtTime(Date crtTime) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        this.crtTime = dateFormat.format(crtTime);
+    }
+
+    public String getType() {
+        return orderTypeMap.get(type);
+    }
+
+    public String getPayWay() {
+        return payWayMap.get(payWay);
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/QueryCriteria.java

+package com.xxfc.platform.order.pojo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 总业绩查询条件
+ * @author Administrator
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel
+public class QueryCriteria {
+
+    @ApiModelProperty(value ="开始时间" )
+    private Date startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endDate;
+
+    @ApiModelProperty(value = "订单类型:1-租车 2-旅游 3-会员 null-全部")
+    private Integer orderType;
+
+    @ApiModelProperty(value = "业绩所属公司")
+    private Integer companyId;
+
+    @ApiModelProperty(value = "支付方式: 1-微信支付 2-支付宝支付 3-银联支付 null-全部")
+    private Integer paymentMethod;
+
+    @ApiModelProperty(value = "账目类型:  0-入账 1-出账")
+    private Integer type = 0;
+
+    @ApiModelProperty("权限公司id")
+    private List<Integer>  jurisdiction;
+
+    @ApiModelProperty(value = "当前页数")
+    private Integer page=1;
+
+    @ApiModelProperty(value = "每页条数")
+    private Integer limit=10;
+ }
+

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/ReturnOrderAmount.java

+package com.xxfc.platform.order.pojo;
+
+import com.alibaba.fastjson.JSON;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ReturnOrderAmount implements Serializable {
+    private static final long serialVersionUID = -8445943548965154778L;
+
+    private static final Map<Integer, String> orderTypeMap = new HashMap<>();
+
+    static {
+        orderTypeMap.put(1, "租车");
+        orderTypeMap.put(2, "旅游");
+        orderTypeMap.put(3, "会员");
+    }
+
+    @ApiModelProperty(value = "时间")
+    private Long time;
+    @ApiModelProperty(value = "订单号")
+    private String no;
+    @ApiModelProperty(value = "订单类型")
+    private Integer type;
+    @ApiModelProperty(value = "订单明细")
+    private String accountDetail;
+    @ApiModelProperty(value = "用户姓名")
+    private String realname;
+    @ApiModelProperty(value = "手机号")
+    private String username;
+    @ApiModelProperty(value = "退款说明")
+    private String refundInstruction;
+    @ApiModelProperty(value = "退款明细")
+    private BigDecimal refundAmount = BigDecimal.ZERO;
+    @ApiModelProperty("退还类型")
+    @Column(name = "account_type")
+    private Integer accountType;
+
+    public OrderAccountDetail getAccountDetail() {
+        return StringUtils.hasText(accountDetail) ? JSON.parseObject(accountDetail, OrderAccountDetail.class) : new OrderAccountDetail();
+    }
+
+    public String getType() {
+        return orderTypeMap.get(type);
+    }
+
+    public String getTime() {
+        Date date = new Date(this.time);
+       return  new SimpleDateFormat("yyyy-MM-dd").format(date);
+
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/TotalOrderRevenue.java

+package com.xxfc.platform.order.pojo;
+
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 总业绩报表类
+ *
+ * @author Administrator
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TotalOrderRevenue {
+    @ApiModelProperty(value = "总订单数")
+    private Integer orderSum;
+    @ApiModelProperty(value = "应收总额")
+    private BigDecimal totalReceivables=BigDecimal.ZERO;
+    @ApiModelProperty(value = "优惠金额")
+    private BigDecimal discount=BigDecimal.ZERO;
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal actual=BigDecimal.ZERO;
+    @ApiModelProperty(value = "数据明细")
+    private  PageInfo<Achievement> achievements;
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -5,6 +5,8 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -25,7 +27,9 @@ import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.pojo.Achievement;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
@@ -914,4 +918,18 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return Lists.newArrayList();
     }
 
+
+    public List<Achievement> entryStatisticalData(QueryCriteria queryCriteria) {
+       return mapper.selectTotalStatistical(queryCriteria);
+    }
+
+
+
+    public PageInfo<Achievement> getAchievementPageInfo(QueryCriteria queryCriteria) {
+        PageHelper.startPage(queryCriteria.getPage(),queryCriteria.getLimit());
+        List<Achievement> achievements = mapper.selectTotalStatistical(queryCriteria);
+        return  PageInfo.of(achievements);
+    }
+
+
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -17,6 +19,8 @@ import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderAccountMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.QueryCriteria;
+import com.xxfc.platform.order.pojo.ReturnOrderAmount;
 import com.xxfc.platform.order.pojo.Term;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
@@ -649,4 +653,15 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
     }
 
+    public List<ReturnOrderAmount> outStatisticalData(QueryCriteria queryCriteria) {
+        Long startTime=null;
+        Long endTime= null;
+        if (queryCriteria.getStartDate()!=null) {
+            startTime=queryCriteria.getStartDate().getTime();
+        }
+        if (queryCriteria.getEndDate()!=null) {
+            endTime= queryCriteria.getEndDate().getTime();
+        }
+        return  mapper.outStatisticalData(queryCriteria,startTime,endTime);
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.Achievement;
+import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.bg.BgOrderListVo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -39,4 +42,6 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
 
 
+    List<Achievement> selectTotalStatistical(QueryCriteria queryCriteria);
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.OrderAccount;
+import com.xxfc.platform.order.pojo.QueryCriteria;
+import com.xxfc.platform.order.pojo.ReturnOrderAmount;
 import com.xxfc.platform.order.pojo.Term;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,4 +22,6 @@ import java.util.List;
 public interface OrderAccountMapper extends Mapper<OrderAccount> {
 
     List<OrderAccountDTO> getOrderAccountByOrderType(Term term);
+
+    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria,@Param("startTime") Long startTime,@Param("endTime")Long endTime);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/TotalPerformanceStatementController.java

+package com.xxfc.platform.order.rest.background;
+
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.auth.PageResult;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.order.biz.TotalPerformanceBiz;
+import com.xxfc.platform.order.pojo.QueryCriteria;
+import com.xxfc.platform.order.contant.enumerate.BookkeepingTypeEnum;
+import com.xxfc.platform.order.pojo.ReturnOrderAmount;
+import com.xxfc.platform.order.pojo.TotalOrderRevenue;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 总业绩报表
+ *
+ * @author Administrator
+ */
+
+@RestController()
+@RequestMapping("/report/form")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api(tags = "总业绩统计")
+@IgnoreClientToken
+@IgnoreUserToken
+public class TotalPerformanceStatementController extends CommonBaseController {
+    private final TotalPerformanceBiz totalPerformanceBiz;
+    private final HttpServletRequest request;
+    private final UserAuthConfig userAuthConfig;
+    private final UserFeign userFeign;
+    private final VehicleFeign vehicleFeign;
+    private final Integer HIGHEST_AUTHORITY = 1;
+
+    @PostMapping("/list")
+    public ObjectRestResponse statisticalData(@RequestBody QueryCriteria queryCriteria) throws Exception {
+
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+
+        //获取用户权限
+        List<Integer> Jurisdiction = null;
+
+        //是否有查询所有数据的权限
+        if (!HIGHEST_AUTHORITY.equals(userDTO.getDataAll())) {
+            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+            Jurisdiction = branchCompanies.parallelStream().map(BranchCompany::getId).collect(Collectors.toList());
+
+        }
+        queryCriteria.setJurisdiction(Jurisdiction);
+
+        if (BookkeepingTypeEnum.ENTER.getCode().equals(queryCriteria.getType())) {
+            TotalOrderRevenue totalOrderRevenue = totalPerformanceBiz.entryStatisticalData(queryCriteria);
+            return ObjectRestResponse.succ(totalOrderRevenue);
+        }else if (BookkeepingTypeEnum.OUT.getCode().equals(queryCriteria.getType())){
+            List<ReturnOrderAmount> returnOrderAmounts = totalPerformanceBiz.outStatisticalData(queryCriteria);
+            return ObjectRestResponse.succ(PageResult.nowPageResult(queryCriteria.getPage(),queryCriteria.getLimit(),returnOrderAmounts));
+        }
+      return ObjectRestResponse.succ();
+    }
+
+    @PostMapping("/excel")
+    public void exportTotalPerformance(@RequestBody QueryCriteria queryCriteria, HttpServletResponse response) throws Exception {
+
+        try {
+            String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+
+            if (BookkeepingTypeEnum.ENTER.getCode().equals(queryCriteria.getType())) {
+                 String filename  = String.format("%s-总业绩-入账表.xlsx",name);
+                response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+                ServletOutputStream outputStream = response.getOutputStream();
+                totalPerformanceBiz.exportEntry(queryCriteria, name, outputStream);
+            }else if (BookkeepingTypeEnum.OUT.getCode().equals(queryCriteria.getType())){
+                String filename = String.format("%s-总业绩-出账表.xlsx",name);
+                response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+                ServletOutputStream outputStream = response.getOutputStream();
+                totalPerformanceBiz.exportAccount(queryCriteria, name, outputStream);
+            }else {
+                throw new BaseException("无相关数据");
+            }
+            response.setCharacterEncoding("UTF-8");
+
+        } catch (IOException e) {
+           throw new BaseException("导入数据失败");
+        }
+
+    }
+}

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -410,4 +410,37 @@
         ) AS `omd` ON omd.order_id=bo.id
         ORDER BY bo.`creatTime` DESC
     </select>
+
+
+    <select id="selectTotalStatistical" parameterType="com.xxfc.platform.order.pojo.QueryCriteria"
+            resultType="com.xxfc.platform.order.pojo.Achievement">
+        select
+        crt_time,no,type,order_amount,real_amount,realname,username,parentRealname,positionName,parentUsername,companyName,pay_way,company_id
+        from order_user_position_company
+        <where>
+            <if test="startDate != null">
+                and crt_time <![CDATA[>=]]>  #{startDate}
+            </if>
+            <if test="endDate != null">
+                and crt_time <![CDATA[<=]]>  #{endDate}
+            </if>
+            <if test="paymentMethod !=null">
+                and pay_way = #{paymentMethod}
+            </if>
+            <if test="jurisdiction != null and jurisdiction.size() !=0 ">
+                and company_id in
+                <foreach collection="jurisdiction" index="index" item="companyId" open="(" separator="," close=")">
+                    #{companyId}
+                </foreach>
+            </if>
+            <if test="companyId != null ">
+                and company_id =#{companyId}
+            </if>
+            <if test="orderType != null">
+                and type = #{orderType}
+            </if>
+        </where>
+        order by crt_time DESC
+    </select>
+
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxfc.platform.order.mapper.OrderAccountMapper">
-    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"  resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
+    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"
+            resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
         SELECT
         <if test="subdivide !=null and subdivide ==1">
             date( FROM_UNIXTIME( a.crt_time / 1000 ) ) as oneDay,
@@ -49,6 +50,27 @@
         <if test="subdivide !=null and subdivide ==1">
             AND date( FROM_UNIXTIME( a.crt_time / 1000 ) ) = date( DATE_SUB( now( ), INTERVAL #{day} DAY ) )
         </if>
-
+    </select>
+    <select id="outStatisticalData" resultType="com.xxfc.platform.order.pojo.ReturnOrderAmount">
+        select oa.crt_time as time ,oupc.no,oupc.type,oa.account_detail as accountDetail ,oupc.realname,oupc.username,oa.account_type
+        from order_account oa
+        left join order_user_position_company oupc ON oa.order_id=oupc.id
+        WHERE oa.account_type!=101
+        <if test="startTime != null">
+            and oa.crt_time <![CDATA[>=]]>  #{startTime}
+        </if>
+        <if test="endTime != null">
+            and oa.crt_time <![CDATA[<=]]>  #{endTime}
+        </if>
+        <if test="queryCriteria.jurisdiction != null and queryCriteria.jurisdiction.size() !=0 ">
+            and oupc.company_id in
+            <foreach collection="jurisdiction" index="index" item="companyId" open="(" separator="," close=")">
+                #{companyId}
+            </foreach>
+        </if>
+        <if test="queryCriteria.orderType != null">
+            and oupc.type = #{orderType}
+        </if>
+        order by oa.crt_time DESC
     </select>
 </mapper>
\ No newline at end of file