#

Junjie

2023-09-08 2439c81ef23336c119eb755db0d0d1d0fff4ada5

#

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

@@ -7,7 +7,6 @@
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CompanyTargetService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.utils.WordUtils;
import com.zy.crm.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,8 +50,9 @@
        Double progressMoney = orderService.selectMoneyByYearAndStatus(year, 0);
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
        //全年交易率
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        //全年完成率
//        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 100;

        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(progressMoney));//全年未交易成功金额
@@ -71,30 +71,31 @@
        SimpleDateFormat format = new SimpleDateFormat("yyyy");
        String year = format.format(date);

        User user = getUser();
        String yearTarget = "0";//获取个人全年目标数据
        if (user.getTarget() != null) {
            yearTarget = formatter.format(Double.parseDouble(user.getTarget()));
        Double yearTarget = 0D;//获取个人全年目标数据
        CompanyTarget person = companyTargetService.selectPersonByYear(year, getUserId());
        if (person != null) {
            yearTarget = Double.parseDouble(person.getTarget());
        }
        map.put("yearTarget", yearTarget);//全年交易目标
        map.put("yearTarget", formatter.format(yearTarget));//全年交易目标

        //获取全年交易成功金额
        Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 1);
        Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
        //获取全年未交易成功金额
        Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 0);
        Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 0);
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 2);
        //全年交易率
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 2);
        //全年完成率
//        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / yearTarget) * 100;

        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(progressMoney));//全年未交易成功金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率

        //获取全年跟踪数量
        Integer progressCount = orderService.selectCountByUserYearAndStatus(user.getId(), year, 0);
        Integer progressCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 0);
        //获取全年成交数量
        Integer successCount = orderService.selectCountByUserYearAndStatus(user.getId(), year, 1);
        Integer successCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 1);
        map.put("progressCount", progressCount);
        map.put("successCount", successCount);


 src/main/java/com/zy/crm/system/entity/User.java

@@ -92,11 +92,6 @@
     */
    private Integer status;

    /**
     * 个人全年目标
     */
    private String target;

    public Long getId() {
        return id;
    }
@@ -268,13 +263,5 @@

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getTarget() {
        return target;
    }

    public void setTarget(String target) {
        this.target = target;
    }
}

 src/main/resources/mapper/UserMapper.xml

@@ -16,7 +16,6 @@
        <result column="sex" property="sex" />
        <result column="create_time" property="createTime" />
        <result column="status" property="status" />
        <result column="target" property="target" />

    </resultMap>


 src/main/webapp/views/detail.html

@@ -76,12 +76,6 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">个人全年目标</label>
                    <div class="layui-input-inline">
                        <input name="target" class="layui-input" type="text" placeholder="请输入" autocomplete="off">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">联系方式</label>
                    <div class="layui-input-inline">
                        <input name="mobile" class="layui-input" type="text" placeholder="请输入" autocomplete="off">

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

@@ -304,7 +304,7 @@
                    }

                    div += "<td>" + data[i].username + "</td>"
                    div += "<td>" + data[i].money + "</td>"
                    div += "<td>" + data[i].money + "万元</td>"
                    div += "</tr>"

                    $("#staffRankId").append(div)

 src/main/webapp/views/order/order.html

@@ -170,9 +170,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">项目预算金额: </label>
                    <label class="layui-form-label layui-form-required">预算金额(万元): </label>
                    <div class="layui-input-block">
                        <input type="number" class="layui-input" name="money" placeholder="请输入项目预算金额" lay-vertype="tips" lay-verify="required" autocomplete="off">
                        <input type="number" class="layui-input" name="money" placeholder="请输入预算金额(万元)" lay-vertype="tips" lay-verify="required" autocomplete="off">
                    </div>
                </div>
                <div class="layui-form-item">