中扬CRM客户关系管理系统
LSH
2023-09-14 0fd3f919fe4a43907667d704d4b78be8ab855f85
#下级流程获取上级流程条件member_id==>user_id
7个文件已修改
36 ■■■■■ 已修改文件
src/main/java/com/zy/crm/manager/controller/DashboardController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/PriSalesController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CstmrMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/home/dashboard.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -42,12 +42,15 @@
        if (companyTarget == null) {
            return R.error();
        }
        map.put("yearTarget", formatter.format(Double.parseDouble(companyTarget.getTarget())));//全年交易目标
        double whole = Double.parseDouble(companyTarget.getTarget());
        map.put("yearTarget", formatter.format(whole));//全年交易目标
        //获取全年交易成功金额
        Double successMoney = orderService.selectMoneyByYearAndStatus(year, 1);
        //获取全年未交易成功金额
        Double progressMoney = orderService.selectMoneyByYearAndStatus(year, 0);
//        double v = whole - orderService.selectMoneyByYearAndStatus(year, 0);
        double v = whole - orderService.selectMoneyByYearAndStatus(year, 1);
        Double progressMoney =  v > 0? v : 0D;
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
        //全年完成率
@@ -81,7 +84,9 @@
        //获取全年交易成功金额
        Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
        //获取全年未交易成功金额
        Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 0);
        double v = yearTarget - orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
        Double progressMoney = v > 0? v : 0D;
        Double progressMoney2 = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 0);
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 2);
        //全年完成率
@@ -90,6 +95,7 @@
        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(progressMoney));//全年未交易成功金额
        map.put("progressMoney2", formatter.format(progressMoney2));//跟踪项目金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率
        //获取全年跟踪数量
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -81,10 +81,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,settle,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
//        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriOnline2.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -331,7 +332,7 @@
    public R query(String condition) {
        EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
        wrapper.like("order_num", condition);
        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        wrapper.in("user_id", getUserRoleBelongsToUserId("allopen"));
        Page<PriOnline2> page = priOnline2Service.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (PriOnline2 priOnline2 : page.getRecords()){
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
@@ -70,10 +70,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,settle,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId());
//        wrapper.in("member_id", getUserRoleBelongsToUserId());
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriQuoteBudget.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priQuoteBudgetService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -253,7 +254,7 @@
    public R query(String condition) {
        EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.in("member_id", getUserRoleBelongsToUserId());
        wrapper.in("user_id", getUserRoleBelongsToUserId());
        Page<PriQuoteBudget> page = priQuoteBudgetService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (PriQuoteBudget priQuoteBudget : page.getRecords()){
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -80,10 +80,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template");
        wrapper.in("member_id", getUserRoleBelongsToUserId());
//        wrapper.in("member_id", getUserRoleBelongsToUserId());
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriQuote.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -251,7 +252,7 @@
    public R query(String condition) {
        EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.in("member_id", getUserRoleBelongsToUserId());
        wrapper.in("user_id", getUserRoleBelongsToUserId());
        Page<PriQuote> page = priQuoteService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (PriQuote priQuote : page.getRecords()){
src/main/java/com/zy/crm/manager/controller/PriSalesController.java
@@ -70,10 +70,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriSales> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,settle,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
//        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        excludeTrash(param);
        convert(param, wrapper);
        allLike(PriSales.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priSalesService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -252,7 +253,7 @@
    public R query(String condition) {
        EntityWrapper<PriSales> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
        wrapper.in("user_id", getUserRoleBelongsToUserId("allopen"));
        Page<PriSales> page = priSalesService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (PriSales priSales : page.getRecords()){
src/main/resources/mapper/CstmrMapper.xml
@@ -292,7 +292,7 @@
    </update>
    <select id="selectByName" resultMap="BaseResultMap">
        select * from man_cstmr
        select top 1 * from man_cstmr
        where 1=1
        and name = #{name}
        <if test="hostId != null">
src/main/webapp/views/home/dashboard.html
@@ -292,7 +292,7 @@
                $("#personRate").text(res.data.yearTransactionRate)
                $("#progressCount").text(res.data.progressCount)
                $("#successCount").text(res.data.successCount)
                $("#progressMoney").text(res.data.progressMoney)
                $("#progressMoney").text(res.data.progressMoney2)
                $("#successMoney").text(res.data.successMoney)
            }
        });