查询某个项目今日PM10报警/预警情况

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java

@@ -266,7 +266,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         Integer standardType = MapUtils.getInteger(map, "standardType", 0);
         Integer projectType = MapUtils.getInteger(map, "projectType", 1);
         if (tempCompany != null) {
-            if (tempCompany.getCompanyType() == 1) {
+            if (tempCompany.getCompanyType() == 1) { //总部
                 map.put("headquartersSn", MapUtils.getString(map, "sn"));
                 map.put("companyType", "2");
                 List<EntityMap> fistComapnyList = companyMapper.getFirstCompanyList(map);

src/main/java/com/zhgd/xmgl/modules/environment/controller/DustNoiseDataController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.environment.entity.DustNoiseData;
+import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo;
 import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java

@@ -3,13 +3,18 @@ package com.zhgd.xmgl.modules.environment.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO;
+import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo;
+import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
+import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -89,4 +94,29 @@ public class EnvironmentAlarmController {
      public Result<Map<String, Object>> selectEnvironmentAlarmCountTotal(@RequestBody Map<String, Object> map) {
          return Result.success(environmentAlarmService.selectEnvironmentAlarmCountTotal(map));
      }
+
+     /**
+      * 查询项目今日报警/预警情况
+      *
+      * @return
+      */
+     @ApiOperation(value = "查询项目今日报警/预警情况", notes = "查询项目今日报警/预警情况", httpMethod = "POST")
+     @PostMapping(value = "/queryProjectTodayAlarmInfo")
+     public Result<ProjectTodayAlarmInfoVo> queryProjectTodayAlarmInfo(@RequestBody @Validated QueryProjectTodayAlarmInfoQO qo) {
+         return Result.success(environmentAlarmService.queryProjectTodayAlarmInfo(qo));
+     }
+
+
+     /**
+      * 查询某个项目今日PM10报警/预警情况
+      *
+      * @return
+      */
+     @ApiOperation(value = "查询某个项目今日PM10报警/预警情况", notes = "查询某个项目今日PM10报警/预警情况", httpMethod = "POST")
+     @PostMapping(value = "/queryProjectTodayAlarmInfoDetail")
+     public Result<ProjectTodayAlarmInfoDetailVo> queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) {
+         return Result.success(environmentAlarmService.queryProjectTodayAlarmInfoDetail(qo));
+     }
+
+
  }

src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java

@@ -0,0 +1,16 @@
+package com.zhgd.xmgl.modules.environment.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(description = "今日PM10数据")
+public class Pm10TodayData {
+    @ApiModelProperty(value = "数据上传时间")
+    private Date uploadDate;
+    @ApiModelProperty(value = "PM10数据")
+    private Double pm10;
+}

src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java

@@ -0,0 +1,12 @@
+package com.zhgd.xmgl.modules.environment.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询某个项目今日PM10报警/预警情况")
+public class ProjectTodayAlarmInfoDetailQO {
+    @ApiModelProperty(value = "所属项目SN")
+    private String projectSn;
+}

src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailVo.java

@@ -0,0 +1,18 @@
+package com.zhgd.xmgl.modules.environment.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(description = "查询某个项目今日PM10报警/预警情况")
+public class ProjectTodayAlarmInfoDetailVo {
+    @ApiModelProperty(value = "pm10今日报警次数")
+    private Integer pm10DeviceTodayAlarmSum;
+    @ApiModelProperty(value = "pm10今日预警次数")
+    private Integer pm10DeviceTodayPreAlarmSum;
+
+    private List<Pm10TodayData> pm10TodayDataList;
+}

src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoVo.java

@@ -0,0 +1,19 @@
+package com.zhgd.xmgl.modules.environment.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("项目今日报警/预警情况")
+public class ProjectTodayAlarmInfoVo {
+    @ApiModelProperty(value = "项目报警数量")
+    private Integer projectAlarmNum;
+    @ApiModelProperty(value = "项目预警数量")
+    private Integer projectPreAlarmNum;
+    @ApiModelProperty(value = "项目今日预警/报警数量")
+    private List<ProjectTodayAlarmNum> projectTodayAlarmNums;
+
+}

src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmNum.java

@@ -0,0 +1,15 @@
+package com.zhgd.xmgl.modules.environment.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ProjectTodayAlarmNum {
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+    private Integer todayAlarmNum;
+    private Integer todayPreAlarmNum;
+}

src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java

@@ -5,9 +5,10 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.environment.entity.*;
+import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -38,4 +39,11 @@ public interface EnvironmentAlarmMapper extends BaseMapper<EnvironmentAlarm> {
     Map<String, Object> selectTodayEnvironmentAlarmCount(Map<String, Object> map);
 
     List<Map<String, Object>> selectEnvironmentDevTodayAlarmCount(Map<String, Object> map);
+
+    List<ProjectTodayAlarmNum> queryProjectTodayAlarmNum(QueryProjectTodayAlarmInfoQO qo);
+
+    List<Pm10TodayData> queryDeviceTodayAvgData(ProjectTodayAlarmInfoDetailQO qo);
+
+    ProjectTodayAlarmInfoDetailVo queryDeviceTodayAlramSum(ProjectTodayAlarmInfoDetailQO qo);
+
 }

src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper">
 
     <select id="queryEnvironmentAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT a.*,b.alarm_type alarm_type_name,c.device_name,date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S') temp_alarm_time
+        SELECT a.*,b.alarm_type alarm_type_name,c.device_name,date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S')
+        temp_alarm_time
         FROM
         environment_alarm a
         LEFT JOIN environment_alarm_type b ON b.id =a.alarm_type_id
@@ -323,4 +324,39 @@
           and w1.project_sn = #{projectSn}
         group by w1.device_id
     </select>
+    <select id="queryProjectTodayAlarmNum"
+            resultType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmNum">
+        SELECT SUM(IF(ea.type = 1, 1, 0)) today_pre_alarm_num,
+               SUM(IF(ea.type = 0, 1, 0)) today_alarm_num,
+               a.project_name
+        FROM project a
+                 INNER JOIN company cp ON a.company_sn = cp.company_sn
+                 INNER JOIN company b ON cp.parent_id = b.company_id
+                 LEFT JOIN company f ON b.parent_id = f.company_id
+                 LEFT JOIN environment_alarm ea ON ea.project_sn = a.project_sn
+        WHERE DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
+        GROUP BY a.project_sn
+    </select>
+    <select id="queryDeviceTodayAvgData" resultType="com.zhgd.xmgl.modules.environment.entity.Pm10TodayData"
+            parameterType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO">
+        SELECT AVG(dnd.pm10),
+               dnd.upload_date
+        FROM dust_noise_data dnd
+        WHERE dnd.project_sn = #{projectSn}
+          AND DATE_FORMAT(dnd.upload_date, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
+        GROUP BY dnd.upload_date;
+    </select>
+    <select id="queryDeviceTodayAlramSum"
+            resultType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo">
+        SELECT IFNULL(SUM(
+                              IF
+                                  (ea.type = 1, 1, 0)), 0) pm10_device_today_alarm_sum,
+               IFNULL(SUM(
+                              IF
+                                  (ea.type = 0, 1, 0)), 0) pm10_device_today_pre_alarm_sum
+        FROM environment_alarm ea
+        WHERE DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
+          AND ea.alarm_type_id = 2
+          AND ea.project_sn = #{projectSn}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java

@@ -3,10 +3,9 @@ package com.zhgd.xmgl.modules.environment.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
-import com.zhgd.xmgl.modules.environment.entity.DustNoiseData;
+import com.zhgd.xmgl.modules.environment.entity.*;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev;
+import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 
 import java.util.List;
 import java.util.Map;
@@ -30,4 +29,8 @@ public interface IEnvironmentAlarmService extends IService<EnvironmentAlarm> {
     Map<String,Object> selectEnvironmentAlarmCountTotal(Map<String, Object> map);
 
     void saveEnvironmentAlarmImage(JSONObject json);
+
+    ProjectTodayAlarmInfoVo queryProjectTodayAlarmInfo(QueryProjectTodayAlarmInfoQO qo);
+
+    ProjectTodayAlarmInfoDetailVo queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo);
 }

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java

@@ -4,30 +4,27 @@ import cn.xuyanwu.spring.file.storage.FileInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.async.AsyncEnvironment;
 import com.zhgd.xmgl.modules.basicdata.entity.Notice;
+import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
+import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
 import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
 import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper;
-import com.zhgd.xmgl.modules.environment.entity.DustNoiseData;
+import com.zhgd.xmgl.modules.environment.entity.*;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev;
-import com.zhgd.xmgl.modules.environment.entity.EnvironmentWarning;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
-import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
-import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
+import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 import com.zhgd.xmgl.util.DateUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
@@ -824,4 +821,33 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
             }
         }
     }
+
+
+    @Override
+    public ProjectTodayAlarmInfoVo queryProjectTodayAlarmInfo(QueryProjectTodayAlarmInfoQO qo) {
+        List<ProjectTodayAlarmNum> list = environmentAlarmMapper.queryProjectTodayAlarmNum(qo);
+        ProjectTodayAlarmInfoVo vo = new ProjectTodayAlarmInfoVo();
+        vo.setProjectTodayAlarmNums(list);
+        if (!CollectionUtils.isEmpty(list)) {
+            int projectAlarmNum = 0;
+            int projectPreAlarmNum = 0;
+            for (ProjectTodayAlarmNum num : list) {
+                projectPreAlarmNum += num.getTodayAlarmNum();
+            }
+            vo.setProjectAlarmNum(projectAlarmNum);
+            vo.setProjectPreAlarmNum(projectPreAlarmNum);
+        }
+        return vo;
+    }
+
+    @Override
+    public ProjectTodayAlarmInfoDetailVo queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) {
+        ProjectTodayAlarmInfoDetailVo vo = environmentAlarmMapper.queryDeviceTodayAlramSum(qo);
+        if (vo == null) {
+            vo = new ProjectTodayAlarmInfoDetailVo();
+        }
+        List<Pm10TodayData> pm10TodayDatas = environmentAlarmMapper.queryDeviceTodayAvgData(qo);
+        vo.setPm10TodayDataList(pm10TodayDatas);
+        return vo;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java

@@ -11,7 +11,7 @@ import com.zhgd.xmgl.modules.project.entity.Project;
 import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo;
 import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectTypeVo;
 import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
-import com.zhgd.xmgl.modules.project.enums.ProgressSanjiangProjectEnum;
+import com.zhgd.xmgl.modules.project.enums.SanjiangProgressProjectEnum;
 import com.zhgd.xmgl.modules.project.service.IProjectService;
 import com.zhgd.xmgl.util.MessageUtil;
 import io.swagger.annotations.Api;
@@ -319,8 +319,8 @@ public class ProjectController {
      */
     @ApiOperation(value = "查询每个不同项目进度的名称、数量", notes = "查询每个不同项目进度的名称、数量", httpMethod = "GET")
     @GetMapping(value = "/groupBy/projectProgress")
-    public Result<List<GroupByProjectProgressVo>> groupByProjectProgress(Map<String, Object> map) {
+    public Result<List<GroupByProjectProgressVo>> groupByProjectProgress() {
-        return Result.success(projectService.groupByProjectProgress(map));
+        return Result.success(projectService.groupByProjectProgress());
     }
 
     /**
@@ -331,8 +331,8 @@ public class ProjectController {
      */
     @ApiOperation(value = "查询三江的所有项目进度", notes = "查询三江的所有项目进度", httpMethod = "GET")
     @GetMapping(value = "/getProjectProgress")
-    public Result<List<ProgressSanjiangProjectEnum>> getProjectProgress() {
+    public Result<List<SanjiangProgressProjectEnum>> getProjectProgress() {
-        return Result.success(Arrays.asList(ProgressSanjiangProjectEnum.values()));
+        return Result.success(Arrays.asList(SanjiangProgressProjectEnum.values()));
     }
 
 }

src/main/java/com/zhgd/xmgl/modules/project/entity/qo/QueryProjectTodayAlarmInfoQO.java

@@ -0,0 +1,18 @@
+package com.zhgd.xmgl.modules.project.entity.qo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(description = "查询项目今日报警/预警情况")
+public class QueryProjectTodayAlarmInfoQO {
+    @ApiModelProperty(value = "账号类型，1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号，6项目子账号，7项目部账号")
+    @NotNull
+    private java.lang.Integer accountType;
+    @ApiModelProperty(value = "userId")
+    @NotNull
+    private java.lang.Long userId;
+}

src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java

@@ -6,5 +6,6 @@ import lombok.Data;
 @Data
 public class GroupByProjectProgressVo {
     private Integer count;
-    private String projectProgress;
+    private String projectProgressName;
+    private Integer projectProgress;
 }

src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * 三江项目进度枚举
  */
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-public enum ProgressSanjiangProjectEnum {
+public enum SanjiangProgressProjectEnum {
     /**
      * 三江项目进度：总坪施工
      */
@@ -76,7 +76,7 @@ public enum ProgressSanjiangProjectEnum {
     private Integer id;
     private String type;
 
-    private ProgressSanjiangProjectEnum(Integer id, String type) {
+    private SanjiangProgressProjectEnum(Integer id, String type) {
         this.id = id;
         this.type = type;
     }

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java

@@ -82,5 +82,5 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<GroupByProjectTypeVo> groupByProjectType(Map<String, Object> map);
 
-    List<GroupByProjectProgressVo> groupByProjectProgress(Map<String, Object> map);
+    List<GroupByProjectProgressVo> groupByProjectProgress();
 }

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml

@@ -656,8 +656,7 @@
         HAVING
             p.custom_project_type is NOT null
     </select>
-    <select id="groupByProjectProgress" resultType="com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo"
+    <select id="groupByProjectProgress" resultType="com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo">
-            parameterType="java.util.Map">
         SELECT COUNT(p.project_id) AS count,p.project_progress
         FROM
             `project` p

src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java

@@ -66,5 +66,5 @@ public interface IProjectService extends IService<Project> {
 
     List<GroupByProjectTypeVo> groupByProjectType(Map<String, Object> map);
 
-    List<GroupByProjectProgressVo> groupByProjectProgress(Map<String, Object> map);
+    List<GroupByProjectProgressVo> groupByProjectProgress();
 }

src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java

@@ -35,6 +35,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectConfig;
 import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo;
 import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectTypeVo;
 import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO;
+import com.zhgd.xmgl.modules.project.enums.SanjiangProgressProjectEnum;
 import com.zhgd.xmgl.modules.project.mapper.ProjectConfigMapper;
 import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
@@ -54,10 +55,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目
@@ -503,8 +506,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public List<GroupByProjectProgressVo> groupByProjectProgress(Map<String, Object> map) {
+    public List<GroupByProjectProgressVo> groupByProjectProgress() {
-        return projectMapper.groupByProjectProgress(map);
+        List<GroupByProjectProgressVo> projectProgressVos = projectMapper.groupByProjectProgress();
+        if (!CollectionUtils.isEmpty(projectProgressVos)) {
+            Map<Integer, GroupByProjectProgressVo> idNameMap = projectProgressVos.stream().collect(Collectors.toMap(o -> o.getProjectProgress(), o->o));
+            for (SanjiangProgressProjectEnum e : SanjiangProgressProjectEnum.values()) {
+                GroupByProjectProgressVo vo = idNameMap.get(e.getId());
+                if (vo == null) {
+                    GroupByProjectProgressVo groupByProjectProgressVo = new GroupByProjectProgressVo();
+                    groupByProjectProgressVo.setCount(0);
+                    groupByProjectProgressVo.setProjectProgressName(e.getType());
+                    groupByProjectProgressVo.setProjectProgress(e.getId());
+                    projectProgressVos.add(groupByProjectProgressVo);
+                } else {
+                    vo.setProjectProgressName(e.getType());
+                }
+            }
+        }
+        return projectProgressVos;
     }
 
 }