|
@@ -94,16 +94,19 @@ public class ScheduleViewController extends BaseController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping(value = "allData")
|
|
@RequestMapping(value = "allData")
|
|
public Map<String, Object> useQuantityData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public Map<String, Object> useQuantityData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
|
+ //获取查询的项目定义号
|
|
String projectId = scheduleView.getProjectId();
|
|
String projectId = scheduleView.getProjectId();
|
|
String[] projectList = null;
|
|
String[] projectList = null;
|
|
List<String> searchList = new ArrayList<>();
|
|
List<String> searchList = new ArrayList<>();
|
|
if (!projectId.equals("")) {
|
|
if (!projectId.equals("")) {
|
|
|
|
+ //根据空格分割
|
|
projectList = projectId.split("\\s+");
|
|
projectList = projectId.split("\\s+");
|
|
for (int i = 0; i < projectList.length; i++) {
|
|
for (int i = 0; i < projectList.length; i++) {
|
|
searchList.add(projectList[i]);
|
|
searchList.add(projectList[i]);
|
|
}
|
|
}
|
|
scheduleView.setProjectList(searchList);
|
|
scheduleView.setProjectList(searchList);
|
|
}
|
|
}
|
|
|
|
+ //查询所有项目信息
|
|
Page<ScheduleView> scheduleViewPage = scheduleViewService.scheduleProjectAll(new Page<ScheduleView>(request, response), scheduleView);
|
|
Page<ScheduleView> scheduleViewPage = scheduleViewService.scheduleProjectAll(new Page<ScheduleView>(request, response), scheduleView);
|
|
List<ScheduleView> list = scheduleViewPage.getList();
|
|
List<ScheduleView> list = scheduleViewPage.getList();
|
|
for (ScheduleView c : list) {
|
|
for (ScheduleView c : list) {
|
|
@@ -111,6 +114,7 @@ public class ScheduleViewController extends BaseController {
|
|
String acquisitionStatus = c.getAcquisitionStatus();
|
|
String acquisitionStatus = c.getAcquisitionStatus();
|
|
String constructionStatus = c.getConstructionStatus();
|
|
String constructionStatus = c.getConstructionStatus();
|
|
String settStatus = c.getSettStatus();
|
|
String settStatus = c.getSettStatus();
|
|
|
|
+ //对不同流程状态进行判断重新赋值
|
|
if ("0".equalsIgnoreCase(status)) {
|
|
if ("0".equalsIgnoreCase(status)) {
|
|
c.setStatus("未发起流程");
|
|
c.setStatus("未发起流程");
|
|
} else if ("1".equalsIgnoreCase(status)) {
|
|
} else if ("1".equalsIgnoreCase(status)) {
|