#

Junjie

2023-09-08 133307a0637193ca0c23f468aea2bd91c76e710a

#

 src/main/java/com/zy/crm/manager/controller/OrderController.java

@@ -52,12 +52,18 @@
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId){
                  @RequestParam(required = false, value = "user_id") Long userId,
                  @RequestParam Map<String, Object> param){
        Integer status = null;
        if (param.get("status") != null) {
            status = Integer.parseInt(param.get("status").toString());
        }
        return R.ok(orderService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , condition)
                , condition
                , status)
        );
    }

@@ -165,7 +171,8 @@
                , getHostId()
                , role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
                , user.getId()
                , condition);
                , condition
                , null);
        List<KeyValueVo> vos = new ArrayList<>();
        page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
        return R.ok().add(vos);

 src/main/java/com/zy/crm/manager/mapper/OrderMapper.java

@@ -18,7 +18,7 @@

    Order selectOrderByNewestUuid(@Param("hostId") Long hostId);

    List<Order> listByPage(Page<Order> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId , @Param("condition") String condition);
    List<Order> listByPage(Page<Order> page, @Param("hostId") Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId, @Param("condition") String condition, @Param("status") Integer status);

    Double selectMoneyByYearAndStatus(String year, Integer status);//获取指定年份和订单状态总交易金额


 src/main/java/com/zy/crm/manager/service/OrderService.java

@@ -14,7 +14,7 @@

    String getUuid(Long hostId);

    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition);
    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status);

    Double selectMoneyByYearAndStatus(String year, Integer status);//获取指定年份和订单状态总交易金额


 src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java

@@ -21,8 +21,8 @@
    }

    @Override
    public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition) {
        return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
    public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status) {
        return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition, status));
    }

    @Override

 src/main/resources/mapper/OrderMapper.xml

@@ -91,6 +91,9 @@
        <if test="hostId != null">
            and mo.host_id = #{hostId}
        </if>
        <if test="status != null">
            and mo.status = #{status}
        </if>
        <if test="condition != null and condition != ''">
            and (
            mo.uuid like concat('%',#{condition},'%')

 src/main/webapp/static/js/order/order.js

@@ -120,6 +120,11 @@
        })
    }

    let where = {}
    if (getQueryVariable('status') !== false) {
        where = {status: getQueryVariable('status')}
    }

    // 数据渲染
    tableIns = table.render({
        elem: '#order',
@@ -132,6 +137,7 @@
        height: 'full-148',
        // size: 'sm',
        skin: 'line',
        where: where,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'name', align: 'left',title: '跟踪项目名称', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 300}

 src/main/webapp/views/home/dashboard.html

@@ -101,7 +101,7 @@
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
                            <div class="numberInfoSubTitle">跟踪项目数量</div>
                            <div class="numberInfoValue">
                                <span id="progressCount">124</span><em class="numberInfoSuffix">个</em>
                                <a href="#" id="openProgress"><span id="progressCount">124</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -113,7 +113,7 @@
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
                            <div class="numberInfoSubTitle">成交项目数量</div>
                            <div class="numberInfoValue">
                                <span id="successCount">121</span><em class="numberInfoSuffix">个</em>
                                <a href="#" id="openSuccess"><span id="successCount">121</span><em class="numberInfoSuffix">个</em></a>
                            </div>
                        </div>
                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -248,6 +248,7 @@
        var $ = layui.jquery;
        var layer = layui.layer;
        var element = layui.element;
        element.init();

        //获取团队数据
        $.ajax({
@@ -419,6 +420,34 @@
            myCharts3.resize();
        };

        $("#openProgress").on("click", () => {
            layer.open({
                type: 2,
                title: '跟踪项目',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../order/order.html?status=0',
                success: function(layero, index){

                }
            });
        });

        $("#openSuccess").on("click", () => {
            layer.open({
                type: 2,
                title: '跟踪项目',
                maxmin: true,
                area: [top.detailWidth, top.detailHeight],
                shadeClose: true,
                content: '../order/order.html?status=1',
                success: function(layero, index){

                }
            });
        });

    });
</script>
</body>