Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-22 464634d38dc3579213b828264ef1af8f6e5fa3e1

Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

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

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

@@ -188,9 +188,6 @@
    @GetMapping("/system/indexDataCount")
    public AjaxResult indexDataCount() {
        IndexVo result = new IndexVo();
        result.setProjectStatus0(0);
        result.setProjectStatus0(0);
        result.setProjectStatus0(0);
        //=============================查询场地数量===============================
        List<Project> projectList = projectService.selectProjectCountByStatus();
        if (!ObjectUtils.isEmpty(projectList)) {
@@ -199,13 +196,22 @@
                    result.setProjectStatus0(item.getStatusNumber());
                }
                if (RecordType.projectStatus1.getId().equals(item.getStatus())) {
                    result.setProjectStatus0(item.getStatusNumber());
                    result.setProjectStatus1(item.getStatusNumber());
                }
                if (RecordType.projectStatus2.getId().equals(item.getStatus())) {
                    result.setProjectStatus0(item.getStatusNumber());
                    result.setProjectStatus2(item.getStatusNumber());
                }
            }
        }
        if (ObjectUtils.isEmpty(result.getProjectStatus0())) {
            result.setProjectStatus0(0);
        }
        if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
            result.setProjectStatus1(0);
        }
        if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
            result.setProjectStatus2(0);
        }
        //=============================查询进尺===============================
        Hole hole = holeService.selectHoleTotalProcess();
        result.setFootageCplCount(hole.getFootageCpl());

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html

@@ -90,14 +90,15 @@
                },
                {
                    field : 'laborUnit', 
                    title : '劳务单位'
                    title : '劳务单位',
                    visible: false
                },
                {
                    field : 'district',
                    title : '区县',
                },
                {
                    field : 'leaderName',
                    field : 'leader',
                    title : '场地负责人'
                },
                {