Commit 8cfe2516 authored by zhengjuzi's avatar zhengjuzi

项目全景监控统计图

parent 51ef7f2c
......@@ -29,4 +29,21 @@ public interface ProjectMapper extends BaseMapper<Project> {
ProjectDto getDetail(Long sequenceNbr);
//项目模糊筛选
IPage<ProjectDto> queryProjectPage(IPage<ProjectDto> page, Project project, String roleName, String companyId,Set<String> codes);
List<String> projectScheduleSuperviseName(Long companyId);
List<String> projectScheduleSuperviseNum(Long companyId);
List<String> projectScheduleInspectionName(Long companyId);
List<String> projectScheduleInspectionNum(Long companyId);
String projectBuiltDept(Long companyId);
String projectUnderConstructionDept(Long companyId);
String projectBuiltUnit(Long companyId);
String projectUnderConstructionUnit(Long companyId);
}
......@@ -398,6 +398,40 @@ public class ProjectController extends BaseController {
/**
* 项目进度
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "项目进度", notes = "项目进度")
@GetMapping(value = "/projectSchedule")
public ResponseModel <Map<String,List<String>>> projectSchedule(){
return ResponseHelper.buildResponse(projectServiceImpl.projectSchedule());
}
/**
* 项目概况
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "项目概况", notes = "项目概况")
@GetMapping(value = "/projectOverview")
public ResponseModel<List<Map<String,String>>> projectOverview(){
return ResponseHelper.buildResponse(projectServiceImpl.projectOverview());
}
/**
* 当前辖区的在建项目
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "当前辖区的在建项目", notes = "当前辖区的在建项目")
@GetMapping(value = "/projectInProgress")
public ResponseModel<Long> projectInProgress(){
return ResponseHelper.buildResponse(projectServiceImpl.projectInProgress());
}
}
......@@ -22,10 +22,7 @@ import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* 项目信息表服务实现类
......@@ -351,7 +348,71 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
}
@BusinessIdentify
public Map<String, List<String>> projectSchedule() {
Map<String, List<String>> map = new HashMap<>();
ReginParams ReginParams = orgService.getReginParams();
String companyType = ReginParams.getBusinessInfo().getCompanyType();
Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
if (OrgEnum.监察部门.getKey().equals(companyType)) {
List<String> strings1 = projectMapper.projectScheduleSuperviseName(companyId);
map.put("axisData",strings1);
List<String> strings2 = projectMapper.projectScheduleSuperviseNum(companyId);
map.put("seriesData",strings2);
return map;
} else if (OrgEnum.监检机构.getKey().equals(companyType)) {
List<String> strings1 = projectMapper.projectScheduleInspectionName(companyId);
map.put("axisData",strings1);
List<String> strings2 = projectMapper.projectScheduleInspectionNum(companyId);
map.put("seriesData",strings2);
return map;
}
return null;
}
public List<Map<String,String>> projectOverview() {
List<Map<String,String>> list = new LinkedList<>();
ReginParams ReginParams = orgService.getReginParams();
String companyType = ReginParams.getBusinessInfo().getCompanyType();
Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
if (OrgEnum.监察部门.getKey().equals(companyType)) {
Map<String,String> map1 = new HashMap<>();
Map<String,String> map2 = new HashMap<>();
String aLong1 = projectMapper.projectBuiltDept(companyId);
String aLong2 = projectMapper.projectUnderConstructionDept(companyId);
map1.put("name","已建");
map1.put("value",aLong1);
map2.put("name","在建");
map2.put("value",aLong2);
list.add(map1);
list.add(map2);
return list;
} else if (OrgEnum.监检机构.getKey().equals(companyType)) {
Map<String,String> map1 = new HashMap<>();
Map<String,String> map2 = new HashMap<>();
String aLong1 = projectMapper.projectBuiltUnit(companyId);
String aLong2 = projectMapper.projectUnderConstructionUnit(companyId);
map1.put("name","已建");
map1.put("value",aLong1);
map2.put("name","在建");
map2.put("value",aLong2);
list.add(map1);
list.add(map2);
return list;
}
return null;
}
public Long projectInProgress() {
List<Map<String,String>> list = new LinkedList<>();
ReginParams ReginParams = orgService.getReginParams();
String companyType = ReginParams.getBusinessInfo().getCompanyType();
Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
if (OrgEnum.监察部门.getKey().equals(companyType)) {
return Long.parseLong(projectMapper.projectUnderConstructionDept(companyId));
} else if (OrgEnum.监检机构.getKey().equals(companyType)) {
return Long.parseLong(projectMapper.projectUnderConstructionUnit(companyId));
}
return null;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment