提交代码

zmk

2024-10-23 3f47c88e7cb4e53b3637620794420181f47b5a5e

 javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java

@@ -166,7 +166,7 @@
    public AjaxResult totalProcess() {
        AjaxResult ajaxResult = AjaxResult.success();
        Hole hole = holeService.selectHoleTotalProcess();
        Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
        Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 4);
        ajaxResult.put("pointerData", data);
        return ajaxResult;
    }
@@ -181,13 +181,22 @@
        AjaxResult ajaxResult = AjaxResult.success();
        List<Hole> holes = holeService.selectHoleProjectProcess();
        Map<String, Double> holeMap = new HashMap<>();
        Map<String,Double> rateMap = new HashMap<>();
        for (Hole hole : holes) {
            Double val =0.0d;
            if(ObjectUtil.isNotEmpty(hole.getFootageCpl()) && ObjectUtil.isNotEmpty(hole.getFootage())) {
            Double FootageCpl= hole.getFootageCpl();
            Double Footage= hole.getFootage();
            if(ObjectUtil.isNotEmpty(FootageCpl) && ObjectUtil.isNotEmpty(Footage)) {
                val = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
                val = Arith.round(val * 100, 2);
            }
            holeMap.put(hole.getProjectId(), val);

            if(ObjectUtil.isNotEmpty(FootageCpl)){
                rateMap.put(hole.getProjectId(), Footage-FootageCpl) ;
            }else{
                rateMap.put(hole.getProjectId(), Footage) ;
            }
        }

        List<Project> projects = projectService.selectProjectList(new Project());
@@ -205,12 +214,12 @@
                vo.setValue(val);
                vo.setLng(projects.get(i).getLng());
                vo.setLat(projects.get(i).getLat());

                vo.setNex(rateMap.get(ids));

                if (val == null) {
                    vo.setValue(0.0d);
                }
                String []statusName ={"协调中","待开工","进行中"};
                String []statusName ={"协调中","待开工","进行中","完工"};
                String status = projects.get(i).getStatus();
                if(status.equals("0")){
                    vo.setStatus(statusName[0]);
@@ -219,7 +228,7 @@
                }else if(status.equals("2")){
                    vo.setStatus(statusName[2]);
                }else{
                    vo.setStatus("未知");
                    vo.setStatus("完工");
                }
                vos.add(vo);
            }
@@ -392,4 +401,14 @@
        return ajaxResult;
    }

    @ResponseBody
    @GetMapping("/system/stat/sumProjectHoleLog")
    public AjaxResult sumProjectHoleLog(String projectId) {
        AjaxResult ajaxResult =  AjaxResult.success();
        HoleLog  holeLog= new HoleLog();
        holeLog.setProjectId(projectId);
        List<DrillDateVo> drillDateList = holeLogService.SUMProjectHoleLog(holeLog);
        ajaxResult.put("drillDateList",drillDateList);
        return ajaxResult;
    }
}