diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java index 7c6c0f182..4393962e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java @@ -8,8 +8,10 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncProject; import com.zhgd.xmgl.entity.vo.ZwProjectDataVo; import com.zhgd.xmgl.modules.project.entity.Project; -import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType; +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.service.IProjectService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -21,6 +23,7 @@ import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -304,7 +307,32 @@ public class ProjectController { */ @ApiOperation(value = "查询每个不同工程类别的名称、数量", notes = "查询每个不同工程类别的名称、数量", httpMethod = "GET") @GetMapping(value = "/groupBy/projectType") - public Result> groupByProjectType(Map map) { + public Result> groupByProjectType(Map map) { return Result.success(projectService.groupByProjectType(map)); } + + /** + * 查询每个不同项目进度的名称、数量 + * + * @param + * @return + */ + @ApiOperation(value = "查询每个不同项目进度的名称、数量", notes = "查询每个不同项目进度的名称、数量", httpMethod = "GET") + @GetMapping(value = "/groupBy/projectProgress") + public Result> groupByProjectProgress(Map map) { + return Result.success(projectService.groupByProjectProgress(map)); + } + + /** + * 查询三江的所有项目进度 + * + * @param + * @return + */ + @ApiOperation(value = "查询三江的所有项目进度", notes = "查询三江的所有项目进度", httpMethod = "GET") + @GetMapping(value = "/getProjectProgress") + public Result> getProjectProgress() { + return Result.success(Arrays.asList(ProgressSanjiangProjectEnum.values())); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java index d676922ad..3d2bf8987 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java @@ -239,4 +239,6 @@ public class Project implements Serializable { @ApiModelProperty(value = "自定义的工程类别") private java.lang.String customProjectType; + @ApiModelProperty(value = "项目进度") + private Integer projectProgress; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java new file mode 100644 index 000000000..94b39f3a2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java @@ -0,0 +1,10 @@ +package com.zhgd.xmgl.modules.project.entity.vo; + +import io.swagger.models.auth.In; +import lombok.Data; + +@Data +public class GroupByProjectProgressVo { + private Integer count; + private String projectProgress; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectType.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectTypeVo.java similarity index 65% rename from src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectType.java rename to src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectTypeVo.java index 6c83a1584..aa2baa779 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectType.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectTypeVo.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.project.entity.vo; import lombok.Data; @Data -public class GroupByProjectType { - private int count; +public class GroupByProjectTypeVo { + private Integer count; private String customProjectType; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java b/src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java new file mode 100644 index 000000000..5bc716324 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java @@ -0,0 +1,101 @@ +package com.zhgd.xmgl.modules.project.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 三江项目进度枚举 + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum ProgressSanjiangProjectEnum { + /** + * 三江项目进度：总坪施工 + */ + GENERAL_PING_CONSTRUCTION(1, "总坪施工"), + /** + * 三江项目进度：绿化 + */ + GREENING(2, "绿化"), + /** + * 三江项目进度：安装工程 + */ + INSTALLATION_WORKS(3, "安装工程"), + /** + * 三江项目进度：交安 + */ + TRAFFIC_SECURITY(4, "交安"), + /** + * 三江项目进度：主体封顶 + */ + THE_MAIN_BODY_IS_CAPPED(5, "主体封顶"), + /** + * 三江项目进度：路面(路沿) + */ + PAVEMENT_CURB(6, "路面(路沿)"), + /** + * 三江项目进度：主体施工 + */ + MAIN_CONSTRUCTION(7, "主体施工"), + /** + * 三江项目进度：路面(沥青) + */ + PAVEMENT_ASPHALT(8, "路面(沥青)"), + /** + * 三江项目进度：基础工程 + */ + BASIC_ENGINEERING(9, "基础工程"), + /** + * 三江项目进度：路面(水稳) + */ + PAVEMENT_WATER_STABILIZATION(10, "路面(水稳)"), + /** + * 三江项目进度：垫层完成 + */ + THE_CUSHION_IS_COMPLETE(11, "垫层完成"), + /** + * 三江项目进度：市政管网 + */ + MUNICIPAL_PIPE_NETWORK(12, "市政管网"), + /** + * 三江项目进度：桩基 + */ + PILE_FOUNDATION(13, "桩基"), + /** + * 三江项目进度：桥涵 + */ + BRIDGE(14, "桥涵"), + /** + * 三江项目进度：土方开挖 + */ + EARTHWORK_EXCAVATION(15, "土方开挖"), + /** + * 三江项目进度：土石方 + */ + EARTHWORK(16, "土石方"), + ; + + private Integer id; + private String type; + + private ProgressSanjiangProjectEnum(Integer id, String type) { + this.id = id; + this.type = type; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java index 1dc7c2e35..720cd34e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.entity.Project; -import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType; +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 org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,5 +80,7 @@ public interface ProjectMapper extends BaseMapper { */ ProjectDurationVO getProjectDuration(String projectSn); - List groupByProjectType(Map map); + List groupByProjectType(Map map); + + List groupByProjectProgress(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml index e554e7c6d..673211af3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml @@ -647,7 +647,7 @@ left join project_extend pe on p.project_sn = pe.project_sn where p.project_sn = #{projectSn} - SELECT COUNT(p.project_id) AS count,p.custom_project_type FROM `project` p @@ -656,4 +656,14 @@ HAVING p.custom_project_type is NOT null + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java index ffa3a75df..c71d2bd4b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java @@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.entity.vo.ZwProjectDataVo; import com.zhgd.xmgl.modules.project.entity.Project; -import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType; +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 java.util.List; @@ -63,5 +64,7 @@ public interface IProjectService extends IService { */ ProjectDurationVO getProjectDuration(String projectSn); - List groupByProjectType(Map map); + List groupByProjectType(Map map); + + List groupByProjectProgress(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java index 6253016d1..82790e002 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java @@ -32,7 +32,8 @@ import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService; import com.zhgd.xmgl.modules.massrebound.service.IFunctionRoomService; import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.ProjectConfig; -import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectType; +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.mapper.ProjectConfigMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; @@ -496,9 +497,14 @@ public class ProjectServiceImpl extends ServiceImpl impl } @Override - public List groupByProjectType(Map map) { - List groupByProjectTypes = projectMapper.groupByProjectType(map); - return groupByProjectTypes; + public List groupByProjectType(Map map) { + List groupByProjectTypeVos = projectMapper.groupByProjectType(map); + return groupByProjectTypeVos; + } + + @Override + public List groupByProjectProgress(Map map) { + return projectMapper.groupByProjectProgress(map); } }