|
@@ -1167,7 +1167,7 @@ public class ProjectController extends BaseController {
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "materialDataPicking")
|
|
|
- public Map<String, Object> materialDataPicking(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
+ public Map<String, Object> c(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
/* //运行提前施工
|
|
|
project1.setPreConstruction(1);
|
|
|
//未进行施工流程
|
|
@@ -1186,7 +1186,6 @@ public class ProjectController extends BaseController {
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "ysDataPicking")
|
|
|
public Map<String, Object> ysDataPicking(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
- project.setAdvanceStatus("2");
|
|
|
project.setConstructionStatus("0");
|
|
|
project.setPreConstruction("1");
|
|
|
BasicInformation basicInformation = new BasicInformation();
|
|
@@ -1231,6 +1230,7 @@ public class ProjectController extends BaseController {
|
|
|
public Map<String, Object> dataAdvance(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
/* project1.setPreConstruction(0);
|
|
|
project1.setConstructionUnitManage(UserUtils.getUser().getLoginName());//施工项目经理*/
|
|
|
+ project.setPreConstruction("0");
|
|
|
BasicInformation basicInformation = new BasicInformation();
|
|
|
project.setBasicInformation(basicInformation);
|
|
|
Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
|