|
@@ -79,6 +79,15 @@ public class MaterialProjectController extends BaseController {
|
|
@RequestMapping(value = "data")
|
|
@RequestMapping(value = "data")
|
|
public Map<String, Object> data(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public Map<String, Object> data(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
materialProject.setProjectStatus("");
|
|
materialProject.setProjectStatus("");
|
|
|
|
+ MaterialProject materialProject1 = new MaterialProject();
|
|
|
|
+ materialProject1.setProjectStatus("");
|
|
|
|
+ materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
|
|
|
|
+ materialProject1.setProjectName(materialProject.getProjectName());
|
|
|
|
+ materialProject1.setProjectCode(materialProject.getProjectCode());
|
|
|
|
+ materialProject1.setReserveCode(materialProject.getReserveCode());
|
|
|
|
+ materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
|
|
|
|
+ materialProject1.setProjectDefine(materialProject.getProjectDefine());
|
|
|
|
+ materialProject1.setProjectBatch(materialProject.getProjectBatch());
|
|
String strProject = "";
|
|
String strProject = "";
|
|
if (!materialProject.getReserveProjectName().equals("")){
|
|
if (!materialProject.getReserveProjectName().equals("")){
|
|
strProject+=materialProject.getReserveProjectName()+",";
|
|
strProject+=materialProject.getReserveProjectName()+",";
|
|
@@ -104,9 +113,10 @@ public class MaterialProjectController extends BaseController {
|
|
String[] split = strProject.split(",");
|
|
String[] split = strProject.split(",");
|
|
if (split.length>1){
|
|
if (split.length>1){
|
|
materialProject.setProjectStatus("0");
|
|
materialProject.setProjectStatus("0");
|
|
|
|
+ materialProject1.setProjectStatus("0");
|
|
}
|
|
}
|
|
HttpSession session = request.getSession();
|
|
HttpSession session = request.getSession();
|
|
- session.setAttribute("materialPro",materialProject);
|
|
|
|
|
|
+ session.setAttribute("materialPro",materialProject1);
|
|
Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response), materialProject);
|
|
Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response), materialProject);
|
|
return getBootstrapData(page);
|
|
return getBootstrapData(page);
|
|
}
|
|
}
|