Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-07-29 bf60845c8da9d0099ef25c8e6703351055865a8e

Merge remote-tracking branch 'origin/score_shop' into score_shop

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -2,8 +2,6 @@

import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.EncrypUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.AddVipDto;
@@ -17,11 +15,9 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.MoneyCardUseService;
@@ -36,8 +32,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.List;

/**
@@ -85,6 +79,11 @@
        int limit = vipInfoListDto.getPageSize();
        vipInfoListDto.setOffset(offset);
        vipInfoListDto.setLimit(limit);





        return AjaxResult.buildSuccessInstance(sysVipInfoService.findVipAddressBook(vipInfoListDto));
    }


 zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java

@@ -22,6 +22,7 @@

import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;

/**
 * DefaultAuthorityManager 实现了权限控制接口
@@ -163,11 +164,17 @@
            // 普通员工账号只拥有自己所拥有的权限
            List<SysFunction> userFunctionList = sysFunctionService.findFunctionByRoleIds(sysUser.getRoleIds());
            for (SysFunction sysFunction : userFunctionList) {

                sysFunction.setSysFnBtnRel(
                        sysFunction.getSysFnBtnRel().stream().filter(item->StringUtils.isContentSet(item.getBtnValue(),sysFunction.getRpfBns())).collect(Collectors.toList())
                );

                // TODO注册访问路径
                registerUrlMapping(userUrlMapping, sysFunction,false);
                if (userFunctionMap.containsKey(sysFunction.getFnCode())) {
                    // 如果功能已经被添加到集合中则追加权限按钮
                    SysFunction oneFunctionInMap = userFunctionMap.get(sysFunction.getFnCode());

                    // 为了方便判断所以用字符串记录一下
                    if (StringUtils.isBlank(oneFunctionInMap.getRpfBns())) {
                        oneFunctionInMap.setRpfBns(sysFunction.getRpfBns());

 zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java

@@ -21,7 +21,7 @@
    @ApiModelProperty(value = "会员ID")
    private Long vipId;

    @NotNull(message = "请选择美疗师")
//    @NotNull(message = "请选择美疗师")
    @ApiModelProperty(value = "美疗师ID")
    private Long beautyId;


 zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java

@@ -14,6 +14,9 @@
    @ApiModelProperty(value = "会员姓名")
    private String vipName;

    @ApiModelProperty(value = "会员编号")
    private String vipNo;

    @ApiModelProperty(value = "会员手机号")
    private String phone;

@@ -87,4 +90,12 @@
    public void setVipLevel(String vipLevel) {
        this.vipLevel = vipLevel;
    }

    public String getVipNo() {
        return vipNo;
    }

    public void setVipNo(String vipNo) {
        this.vipNo = vipNo;
    }
}

 zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java

@@ -59,6 +59,11 @@
    private String plates;

    /**
     * 所有客户权限
     */
    private String coustomer;

    /**
     * 功能集合
     */
    @Extend
@@ -76,6 +81,14 @@
    @Extend
    private String menuKeys;

    public String getCoustomer() {
        return coustomer;
    }

    public void setCoustomer(String coustomer) {
        this.coustomer = coustomer;
    }

    public Integer getIsDefault() {
        return isDefault;
    }

 zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java

@@ -244,6 +244,7 @@
    private String shopName;


    private String allCustomer;

    private String roleName;

@@ -272,6 +273,7 @@
    private String departName;



    /**
     * 入职时间区域查询
     **/
@@ -286,6 +288,14 @@
    @Extend
    private SysCompany company;

    public String getAllCustomer() {
        return allCustomer;
    }

    public void setAllCustomer(String allCustomer) {
        this.allCustomer = allCustomer;
    }

    public Long getSuId() {
        return suId;
    }

 zq-erp/src/main/java/com/matrix/system/common/tag/ButtonRoleJsTagProcessor.java

File was deleted

 zq-erp/src/main/java/com/matrix/system/common/tag/MatrixProcessorDialect.java

@@ -47,7 +47,6 @@
    public Set<IProcessor> getProcessors(final String dialectPrefix) {
        final Set<IProcessor> processors = new HashSet<IProcessor>();
        processors.add(new ButtonRoleAttributeTagProcessor(dialectPrefix));
        processors.add(new ButtonRoleJsTagProcessor(dialectPrefix));
        processors.add(new ButtonRoleFnTagProcessor(dialectPrefix));
        // This will remove the xmlns:matrix attributes we might add for IDE validation
        processors.add(new StandardXmlNsTagProcessor(TemplateMode.HTML, dialectPrefix));

 zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java

@@ -25,4 +25,13 @@
    }


    /**
     * 可以查询所有会员
     * @return
     */
    public static boolean hasAllCustomerAuth() {
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        return user.getShopRole().equals(Dictionary.FLAG_YES_Y) || user.getSuUserType().equals(AppConstance.USER_TYPE_ADMIN);

    }
}

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -18,6 +18,7 @@
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.service.SystemDictionaryService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -31,7 +32,6 @@
import com.matrix.system.score.dao.ScoreVipDetailDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -41,7 +41,6 @@
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
@@ -548,25 +547,17 @@
    }

    @RequestMapping(value = "/exportExcel")
    public void report(ModelMap model, HttpServletRequest request, HttpServletResponse response,
    public void report( HttpServletResponse response,
                       SysVipInfo vipInfo) throws IOException {

        if (vipInfo.getVipType() != null && !(vipInfo.getVipType().equals(""))) {
            vipInfo.setVipType(URLDecoder.decode(vipInfo.getVipType(), "UTF-8"));
        }
        if (vipInfo.getVipName() != null && !"".equals(vipInfo.getVipName())) {
            vipInfo.setVipName(URLDecoder.decode(vipInfo.getVipName(), "UTF-8"));
        }
        if (vipInfo.getArrivalWay() != null && !"".equals(vipInfo.getArrivalWay())) {
            vipInfo.setArrivalWay(URLDecoder.decode(vipInfo.getArrivalWay(), "UTF-8"));
        }
        if (vipInfo.getVipState() != null && !"".equals(vipInfo.getVipState())) {
            vipInfo.setVipState(URLDecoder.decode(vipInfo.getVipState(), "UTF-8"));
        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if(!DataAuthUtil.hasAllShopAuth()){
            vipInfo.setShopId(sysUsers.getShopId());
        }

        List<ExcelSheetPO> res = new ArrayList<>();
        ExcelSheetPO orderSheet = new ExcelSheetPO();
        String title = "每日单据明细";
        String title = "会员资料";
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        String[] header = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -484,9 +484,6 @@
        //检查交易限制调整
        checkSealLimit(pageOrder);

        //交易业绩设置是否合理
        checkAchieveIsOk(pageOrder);


        // 更新收款时间
        pageOrder.setPayTime(new Date());
@@ -558,27 +555,7 @@

    }

    /**
     * 交易业绩设置是否合理
     * @param pageOrder
     */
    private void checkAchieveIsOk(SysOrder pageOrder) {
        double huakouSum = pageOrder.getItems().stream()
                .mapToDouble(
                        item ->
                                item.getAchieveList().stream()
                                        .filter(achieveNew -> "划扣".equals(achieveNew.getPayMethod()))
                                        .mapToDouble(achieve -> achieve.getGoodsCash()).sum()
                ).sum();

        double czkPay= pageOrder.getFlows().stream()
                .filter(sysOrderFlow -> "储值卡".equals(sysOrderFlow.getPayMethod()))
                .mapToDouble(sysOrderFlow ->sysOrderFlow.getAmount().doubleValue()).sum();

        if(czkPay!=huakouSum){
            throw new GlobleException("划扣业绩不等于储值卡扣款金额，请修改业绩设置！");
        }
    }

    /**
     * 设置会员消费积分

 zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderStatisticsAction.java

@@ -2,9 +2,13 @@

import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.hive.dao.SysOrderItemDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,6 +16,11 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
@@ -33,12 +42,27 @@
    public @ResponseBody
    AjaxResult showList( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(orderItemDao.selectItemDetail(param),
                orderItemDao.selectItemDetailTotal(param));
    }
    @RequestMapping(value = "/exportShowList")
    public void exportShowList(@RequestParam Map<String, Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "产品销售明细统计";
        String[] header = {"门店", "销售日期", "订单号", "商品名称", "分类", "客户名", "购买数量", "单价", "健康顾问", "支付方式", "状态"};
        String[] column = {"SHOP_NAME", "pay_time", "ORDER_NO", "goodsName", "cateName", "VIP_NAME", "COUNT", "ZK_PRICE", "su_name", "pay_method", "status"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = orderItemDao.selectItemDetail(param);
        exportExcel(title, header,column, dataList, response);
    }


    /**
     * 产品销售明细统计
@@ -47,12 +71,52 @@
    public @ResponseBody
    AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(orderItemDao.summaryItemDetail(param),
                orderItemDao.summaryItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportSummaryItemDetail")
    public void exportSummaryItemDetail(@RequestParam Map<String, Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "产品销售明细统计";
        String[] header = {"门店", "商品名称", "分类", "销售数量", "销售总额"};
        String[] column = {"SHOP_NAME", "goodsName", "cateName", "COUNT", "ZK_PRICE"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = orderItemDao.summaryItemDetail(param);
        exportExcel(title, header,column, dataList, response);
    }


    public static void exportExcel(String title, String[] header,String[] column, List<Map<String, Object>> dataList, HttpServletResponse response) throws Exception {
        //这里是从数据库里查数据并组装成我们想要的数据结构的过程
        List<ExcelSheetPO> res = new ArrayList<>();
        ExcelSheetPO orderSheet = new ExcelSheetPO();
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        orderSheet.setHeaders(header);
        List<List<Object>> list = new ArrayList<>();
        if (dataList.size() > 0) {
            for (Map<String, Object> item : dataList) {
                List<Object> temp = new ArrayList<>();
                Arrays.stream(column).forEach(key-> temp.add(item.get(key)));
                list.add(temp);
            }
        }
        orderSheet.setDataList(list);
        res.add(orderSheet);
        response = ResponseHeadUtil.setExcelHead(response);
        response.setHeader("Content-Disposition",
                "attachment;filename=" + java.net.URLEncoder.encode(title + DateUtil.getTimeMark() + ".xlsx".trim(), "UTF-8"));
        OutputStream os = response.getOutputStream();
        com.matrix.core.tools.excl.ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
    }


}

 zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java

@@ -4,7 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.dao.SysProjUseDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
@@ -33,12 +35,29 @@
    public @ResponseBody
    AjaxResult showList( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(projUseDao.selectItemDetail(param),
                projUseDao.selectItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportShowList")
    public void exportShowList( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "项目剩余次数明细";
        String[] header = {"客户名", "服务名称",  "到期日期", "剩余次数", "单价", "项目类型", "套餐类型", "是否使用完成", "备注", "来源", "订单号"};
        String[] column = {"VIP_NAME", "PROJ_NAME", "FAIL_TIME", "SURPLUS_COUNT", "PRICE", "TYPE_NAME", "type", "IS_OVER", "remark", "SOURCE", "ORDER_NO"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = projUseDao.selectItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }




    /**
     * 项目剩余次数统计
@@ -47,12 +66,26 @@
    public @ResponseBody
    AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(projUseDao.summaryItemDetail(param),
                projUseDao.summaryItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportSummaryItemDetail")
    public void exportSummaryItemDetail( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "项目剩余次数统计";
        String[] header = {"服务名称", "项目类型",  "剩余次数", "剩余消耗总额"};
        String[] column = {"PROJ_NAME", "TYPE_NAME", "SURPLUS_COUNT", "PRICE"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = projUseDao.summaryItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }


}

 zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java

@@ -4,7 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.dao.SysBeauticianStateDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
@@ -33,13 +35,29 @@
    public @ResponseBody
    AjaxResult showList( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }

        return AjaxResult.buildSuccessInstance(beauticianStateDao.selectItemDetail(param),
                beauticianStateDao.selectItemDetailTotal(param));
    }


    @RequestMapping(value = "/exportShowList")
    public void exportShowList( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "项目服务明细";
        String[] header = {"门店", "预约时间","划扣时间","服务单号","服务名称","分类","客户名","次数","划扣单价","提成","美疗师","来源"};
        String[] column = {"SHOP_NAME", "yy_time", "consume_time", "SERVICE_NO", "PROJ_NAME", "TYPE_NAME", "VIP_NAME", "COUNT", "PRICE", "extract", "su_name", "SOURCE"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = beauticianStateDao.selectItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }


    /**
     * 项目服务明细统计
@@ -48,12 +66,27 @@
    public @ResponseBody
    AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(beauticianStateDao.summaryItemDetail(param),
                beauticianStateDao.summaryItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportSummaryItemDetail")
    public void exportSummaryItemDetail( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "项目服务明细统计";
        String[] header = {"门店", "服务名称","分类","总次数","消耗金额"};
        String[] column = {"SHOP_NAME", "PROJ_NAME", "TYPE_NAME", "COUNT", "PRICE"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = beauticianStateDao.summaryItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }



}

 zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java

@@ -4,7 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
@@ -33,11 +35,25 @@
    public @ResponseBody
    AjaxResult showList( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(moneyCardUseDao.selectItemDetail(param),
                moneyCardUseDao.selectItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportShowList")
    public void exportShowList( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "客户充值卡明细";
        String[] header = {"客户名", "充值卡名称","到期日期","剩余本金","剩余赠送金额","是否使用完成","是否为会籍卡","备注","来源","订单号"};
        String[] column = {"VIP_NAME", "card_name","FAIL_TIME","real_money","gift_money","isOver","is_vip_car","remark","SOURCE","ORDER_NO"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = moneyCardUseDao.selectItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }

    /**
@@ -47,12 +63,26 @@
    public @ResponseBody
    AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId",sysUsers.getShopId());
        }
        return AjaxResult.buildSuccessInstance(moneyCardUseDao.summaryItemDetail(param),
                moneyCardUseDao.summaryItemDetailTotal(param));
    }

    @RequestMapping(value = "/exportSummaryItemDetail")
    public void exportSummaryItemDetail( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
        SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        String title = "客户充值卡统计";
        String[] header = {"充值卡名称", "剩余总本金",  "剩余总赠送金额"};
        String[] column = {"card_name", "real_money", "gift_money"};

        if(!DataAuthUtil.hasAllShopAuth()){
            param.put("shopId", sysUsers.getShopId());
        }
        List<Map<String, Object>> dataList = moneyCardUseDao.summaryItemDetail(param);
        OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
    }


}

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java

@@ -33,7 +33,6 @@
import com.matrix.system.hive.service.SysVipLevelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -44,7 +43,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -401,26 +399,16 @@
    }

    @RequestMapping(value = "/exportExcel")
    public void report(ModelMap model, HttpServletRequest request, HttpServletResponse response,
    public void report(HttpServletResponse response,
                       SysVipInfo vipInfo)
            throws IOException {

        QueryUtil.setQueryLimitCom(vipInfo );
        if (vipInfo.getVipType() != null && !(vipInfo.getVipType().equals(""))) {
            vipInfo.setVipType(URLDecoder.decode(vipInfo.getVipType(), "UTF-8"));
        }
        if (vipInfo.getVipName() != null && !"".equals(vipInfo.getVipName())) {
            vipInfo.setVipName(URLDecoder.decode(vipInfo.getVipName(), "UTF-8"));
        }
        if (vipInfo.getArrivalWay() != null && !"".equals(vipInfo.getArrivalWay())) {
            vipInfo.setArrivalWay(URLDecoder.decode(vipInfo.getArrivalWay(), "UTF-8"));
        }
        if (vipInfo.getVipState() != null && !"".equals(vipInfo.getVipState())) {
            vipInfo.setVipState(URLDecoder.decode(vipInfo.getVipState(), "UTF-8"));
        }


        List<ExcelSheetPO> res = new ArrayList<>();
        ExcelSheetPO orderSheet = new ExcelSheetPO();
        String title = "每日单据明细";
        String title = "会员资料";
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        String[] header = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};

 zq-erp/src/main/resources/config/mdprd/system.properties

 zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml

@@ -12,6 +12,7 @@
        <result property="companyId" column="company_id" />
        <result property="plates" column="plates" />
        <result property="shopAble" column="shop_able" />
        <result property="coustomer" column="coustomer" />
    </resultMap>


@@ -31,6 +32,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        )
        VALUES (
@@ -44,6 +46,7 @@
        #{companyId},
        #{plates},
        #{isDefault},
        #{coustomer},
        #{shopAble}
        )
    </insert>
@@ -63,6 +66,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        )
        VALUES
@@ -78,6 +82,7 @@
            #{item.companyId},
            #{item.plates},
            #{item.isDefault},
            #{item.coustomer},
            #{item.shopAble}
            )
        </foreach>
@@ -110,6 +115,9 @@
            <if test="_parameter.containsKey('shopAble')">
                shop_able = #{shopAble},
            </if>
            <if test="_parameter.containsKey('coustomer')">
                coustomer = #{coustomer},
            </if>
        </set>
        WHERE role_id=#{roleId}
    </update>
@@ -141,6 +149,9 @@
            </if>
            <if test="(shopAble!=null and shopAble!='') or (shopAble!='' and shopAble==0)">
                shop_able = #{shopAble},
            </if>
            <if test="(coustomer!=null and coustomer!='') or (coustomer!='' and coustomer==0)">
                coustomer = #{coustomer},
            </if>
        </set>
        WHERE role_id=#{roleId}
@@ -206,6 +217,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        <where>
@@ -291,6 +303,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        where role_id=#{roleId}
@@ -323,6 +336,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        <where>

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -56,6 +56,7 @@
        <result property="signOrder" column="SIGN_ORDER"/>
        <result property="signDate" column="SIGN_DATE"/>
        <result property="salarGrad" column="salarGrad"/>
        <result property="allCustomer" column="allCustomer"/>

        <!-- 扩展属性 -->
        <result property="shopName" column="SHOP_NAME"/>
@@ -655,6 +656,8 @@
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
        shopRole,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
        allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        (select com_name from sys_company where com_id=company_id) as company_name,
        (select shop_name from sys_shop_info where shop_id=id) as SHOP_NAME
@@ -937,6 +940,8 @@
    <select id="selectById" resultMap="SysUsersMap">
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是') shopRole,
               (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
                   allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        role_ids
        from sys_users
@@ -949,6 +954,8 @@
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
        shopRole,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
        allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        role_ids
        from sys_users

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -240,10 +240,10 @@
                and a.orderType = #{record.orderType}
            </if>
            <if test="record.beginTimeVo != null  ">
                and a.ORDER_TIME >= #{record.beginTimeVo}
                and a.pay_time >= #{record.beginTimeVo}
            </if>
            <if test="record.endTimeVo != null  ">
                <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
                <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
            </if>

        </if>
@@ -321,10 +321,10 @@
                and a.SHOP_ID = #{record.shopId}
            </if>
            <if test="record.beginTimeVo != null ">
                and a.ORDER_TIME >= #{record.beginTimeVo}
                and a.pay_time >= #{record.beginTimeVo}
            </if>
            <if test="record.endTimeVo != null   ">
                <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
                <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
            </if>
        </if>
    </select>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -1361,6 +1361,7 @@
        select
               a.ID id,
               a.VIP_NAME vipName,
               a.VIP_NO vipNo,
               a.PHONE phone,
               a.photo photo,
               b.arriveCnt arriveCnt,

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html

@@ -52,7 +52,7 @@
                    </select>
                </div>
            <div class="form-group mr-20">
                <label>订单日期</label>
                <label>付款日期</label>
                <input autocomplete="off"   name="beginTimeVo" type="text" class="form-control datetimepicker" id="beginTime">-
                <input autocomplete="off"   name="endTimeVo"  type="text" class="form-control datetimepicker" id="endTime">
            </div>
@@ -100,6 +100,8 @@
                <th data-field="vipPhone">客户手机号</th>
                <th data-field="orderTime" data-formatter="MGrid.getTime"
                    data-sortable="true">下单时间</th>
                <th data-field="payTime" data-formatter="MGrid.getTime"
                    data-sortable="true">支付时间</th>
                <th data-field="statu">订单状态</th>
                <th data-field="total">订单总价</th>
                <th data-field="zkTotal">折后价</th>

 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html

@@ -105,12 +105,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/admin/moneyCardUseStatistics/exportShowList?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html

@@ -86,12 +86,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/moneyCardUseStatistics/exportSummaryItemDetail?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-item.html

@@ -121,12 +121,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/admin/orderStatistics/exportShowList?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-summary.html

@@ -102,7 +102,7 @@
        
        function exportExcel(){
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/form/furnsale/exportFurn? "+param;
            window.location.href=basePath+"/admin/orderStatistics/exportSummaryItemDetail?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html

@@ -124,15 +124,12 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/serviceStatistics/exportShowList?"+param;
        }



    function initFunctionList() {
        $.AjaxProxy({
            a: false,

 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html

@@ -101,12 +101,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/serviceStatistics/exportSummaryItemDetail?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html

@@ -106,12 +106,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/admin/projUseStatistics/exportShowList?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html

@@ -74,13 +74,10 @@
             });
        });
        

        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html

@@ -110,12 +110,12 @@

            <!-- 功能按钮部分 -->
            <div id="option-bar" >
                <button matrix:fn="mdhyzl-edit" onclick="openEdit()"  type="button" class="btn btn-success btn-sm "><i
                <button matrix:btn="mdhyzl-edit" onclick="openEdit()"  type="button" class="btn btn-success btn-sm "><i
                        class="fa fa-edit"></i>编辑
                </button>
                    <button matrix:fn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:fn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:btn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            </div>

        <!-- 数据表格部分 -->
@@ -203,19 +203,8 @@

    //导出
        function exportExcel() {
            var name = $("#search-text").attr("name");
            var value = $("#search-text").val();
            var vipType = $("#vipType").val();
            var arrivalWay = $("#arrivalWay").val();
            var vipState = $("#vipState").val();
            var staffId = $("#staffId").val();
            var shopId = $("#shopId").val();
            window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
                + encodeURI(encodeURI(vipType)) + "&arrivalWay="
                + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
                + encodeURI(encodeURI(value)) + "&vipState="
                + encodeURI(encodeURI(vipState)) + "&shopId=" + shopId
                + "&staffId=" + staffId;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/hiveErp/vipInfo/exportExcel?"+param;
        }

    //打开编辑界面

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html

@@ -105,15 +105,12 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/admin/moneyCardUseStatistics/exportShowList?"+param;
        }



    function initFunctionList() {
        $.AjaxProxy({
            a: false,

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html

@@ -87,15 +87,12 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/moneyCardUseStatistics/exportSummaryItemDetail?"+param;
        }



    function initFunctionList() {
        $.AjaxProxy({
            a: false,

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html

@@ -113,12 +113,8 @@
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/orderStatistics/exportShowList?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-summary.html

@@ -91,15 +91,11 @@
             });
        });
        
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        }

    function exportExcel(){
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param;
    }

    function initFunctionList() {
        $.AjaxProxy({

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html

@@ -116,13 +116,10 @@
             });
        });
        

        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/serviceStatistics/exportShowList?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html

@@ -91,16 +91,10 @@
                 url:basePath+"/admin/serviceStatistics/summaryItemDetail"
             });
        });
		
        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/serviceStatistics/exportSummaryItemDetail?"+param;
        }


    function initFunctionList() {
        $.AjaxProxy({

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html

@@ -105,16 +105,14 @@
             });
        });
        

        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/admin/projUseStatistics/exportShowList?"+param;
        }



    function initFunctionList() {
        $.AjaxProxy({
            a: false,

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html

@@ -74,13 +74,10 @@
             });
        });
        

        function exportExcel(){
            var select_begin = $("#select_begin").val();
            var select_end = $("#select_end").val();
            var select_id = $("#select_id").val();
            var goodsName = $("#goodsName").val();
            var guwen = $("#goodsName").val();
            window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param;
        }



 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html

@@ -121,7 +121,7 @@
                    <button matrix:fn="orderClub"  onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
                    <button matrix:fn="serviceClub"  onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
                    <button matrix:btn="vipInfo-add"  onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i>  新增</button>
                    <button matrix:btn="vipInfo-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-allot"  onclick="updateVipInfos()" type="button" class="btn btn-info btn-sm"><i class="" ></i>批量设置健康顾问</button>
                    <button onclick="skinCheck()" type="button" class="btn btn-info btn-sm"><i class="" ></i>皮肤检测管理</button>
                    <button onclick="importVipInfo()" type="button" class="btn btn-info btn-sm"><i class="" ></i>导入会员</button>
@@ -403,18 +403,8 @@

    //导出
        function exportExcel() {
            var name = $("#search-text").attr("name");
            var value = $("#search-text").val();
            var vipType = $("#vipType").val();
            var arrivalWay = $("#arrivalWay").val();
            var vipState = $("#vipState").val();
            var staffId = $("#staffId").val();
            window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
                + encodeURI(encodeURI(vipType)) + "&arrivalWay="
                + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
                + encodeURI(encodeURI(value)) + "&vipState="
                + encodeURI(encodeURI(vipState)) 
                + "&staffId=" + staffId;
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/vipInfo/exportExcel?"+param;
        }

</script>

 zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html

@@ -60,7 +60,13 @@
            </div>
        </div>
        <div class="form-group">

            <label class="col-sm-2 control-label">可查询所有门店客户</label>
            <div class="col-sm-4">
                <select class="form-control" name="coustomer">
                    <option th:selected="${obj?.coustomer == '是'}" >是</option>
                    <option th:selected="${obj?.coustomer == '否'}" >否</option>
                </select>
            </div>
            <label class="col-sm-2 control-label">是否允许门店分配本角色</label>
            <div class="col-sm-4">
                <select class="form-control" name="shopAble">