|
|
@@ -43,7 +43,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
- * 数据维护
|
|
|
+ * 年度物资上报明细
|
|
|
*/
|
|
|
@Controller
|
|
|
@RequestMapping(value = "${adminPath}/managementcenter/materialinfo")
|
|
|
@@ -67,7 +67,7 @@ public class MaterialInfoController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 列表页面
|
|
|
+ * 年度物资上报明细 列表页面
|
|
|
*/
|
|
|
@RequiresPermissions("managementcenter:materialinfo:list")
|
|
|
@RequestMapping(value = {"list", ""})
|
|
|
@@ -76,101 +76,100 @@ public class MaterialInfoController extends BaseController {
|
|
|
return "modules/sg/managementcenter/materialinfo/materialInfoList";
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 列表数据
|
|
|
+ /**
|
|
|
+ * 年度物资上报明细 列表数据
|
|
|
*/
|
|
|
- @ResponseBody
|
|
|
- @RequiresPermissions("managementcenter:materialinfo:list")
|
|
|
- @RequestMapping(value = "data")
|
|
|
- public Map<String, Object> data(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
- MaterialInfo materialInfo1 = new MaterialInfo();//存入session数值
|
|
|
- materialInfo1.setProjectName(materialInfo.getProjectName());
|
|
|
- MaterialProject materialProject = new MaterialProject();
|
|
|
- materialProject.setProjectStatus("");
|
|
|
- materialProject.setReserveCode(materialInfo.getReserveCode());
|
|
|
- MaterialProject materialProject1 = new MaterialProject();
|
|
|
- materialProjectService.getSearch(materialProject,materialProject1);
|
|
|
- List<MaterialProject> list = materialProjectService.findList(materialProject);
|
|
|
- String[] projectNames = new String[list.size()];
|
|
|
- for (int i = 0; i < list.size(); i++) {
|
|
|
- if (null!=list.get(i).getReserveProjectName()&&!"".equals(list.get(i).getReserveProjectName())){
|
|
|
- projectNames[i] = list.get(i).getReserveProjectName();
|
|
|
- }
|
|
|
+ @ResponseBody
|
|
|
+ @RequiresPermissions("managementcenter:materialinfo:list")
|
|
|
+ @RequestMapping(value = "data")
|
|
|
+ public Map<String, Object> data(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
+ MaterialInfo materialInfo1 = new MaterialInfo();//存入session数值
|
|
|
+ materialInfo1.setProjectName(materialInfo.getProjectName());
|
|
|
+ MaterialProject materialProject = new MaterialProject();
|
|
|
+ materialProject.setProjectStatus("");
|
|
|
+ materialProject.setReserveCode(materialInfo.getReserveCode());
|
|
|
+ MaterialProject materialProject1 = new MaterialProject();
|
|
|
+ materialProjectService.getSearch(materialProject,materialProject1);
|
|
|
+ List<MaterialProject> list = materialProjectService.findList(materialProject);
|
|
|
+ String[] projectNames = new String[list.size()];
|
|
|
+ for (int i = 0; i < list.size(); i++) {
|
|
|
+ if (null!=list.get(i).getReserveProjectName()&&!"".equals(list.get(i).getReserveProjectName())){
|
|
|
+ projectNames[i] = list.get(i).getReserveProjectName();
|
|
|
}
|
|
|
- if (null!=list&&list.size()>0){
|
|
|
- materialInfo.setProjectNames(projectNames);
|
|
|
- materialInfo1.setProjectNames(projectNames);
|
|
|
- }else {
|
|
|
- if (!"".equals(materialInfo.getReserveCode())||!"".equals(materialInfo.getProjectCode())||
|
|
|
- !"".equals(materialInfo.getProjectDefine())){
|
|
|
- materialInfo.setProjectName("没有找到:请重新刷新...");
|
|
|
- materialInfo1.setProjectName("没有找到:请重新刷新...");
|
|
|
- }
|
|
|
+ }
|
|
|
+ if (null!=list&&list.size()>0){
|
|
|
+ materialInfo.setProjectNames(projectNames);
|
|
|
+ materialInfo1.setProjectNames(projectNames);
|
|
|
+ }else {
|
|
|
+ if (!"".equals(materialInfo.getReserveCode())||!"".equals(materialInfo.getProjectCode())||
|
|
|
+ !"".equals(materialInfo.getProjectDefine())){
|
|
|
+ materialInfo.setProjectName("没有找到:请重新刷新...");
|
|
|
+ materialInfo1.setProjectName("没有找到:请重新刷新...");
|
|
|
}
|
|
|
-
|
|
|
- HttpSession session = request.getSession();
|
|
|
- session.setAttribute("materialInfoSelect",materialInfo1);
|
|
|
- Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response), materialInfo);
|
|
|
- return getBootstrapData(page);
|
|
|
}
|
|
|
+ HttpSession session = request.getSession();
|
|
|
+ session.setAttribute("materialInfoSelect",materialInfo1);
|
|
|
+ Page<MaterialInfo> page = materialInfoService.findPage(new Page<MaterialInfo>(request, response), materialInfo);
|
|
|
+ return getBootstrapData(page);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * 删除
|
|
|
- */
|
|
|
- @ResponseBody
|
|
|
- @RequiresPermissions("managementcenter:materialinfo:del")
|
|
|
- @RequestMapping(value = "delete")
|
|
|
- public AjaxJson delete(MaterialInfo materialInfo) {
|
|
|
- AjaxJson j = new AjaxJson();
|
|
|
- materialInfoService.delete(materialInfo);
|
|
|
- j.setMsg("删除成功");
|
|
|
- return j;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 批量删除
|
|
|
- */
|
|
|
- @ResponseBody
|
|
|
- @RequiresPermissions("managementcenter:materialinfo:del")
|
|
|
- @RequestMapping(value = "deleteAll")
|
|
|
- public AjaxJson deleteAll(String ids) {
|
|
|
- AjaxJson j = new AjaxJson();
|
|
|
- String idArray[] =ids.split(",");
|
|
|
- for(String id : idArray){
|
|
|
- materialInfoService.delete(materialInfoService.get(id));
|
|
|
- }
|
|
|
- j.setMsg("删除成功");
|
|
|
- return j;
|
|
|
- }
|
|
|
+// /**
|
|
|
+// * 删除
|
|
|
+// */
|
|
|
+// @ResponseBody
|
|
|
+// @RequiresPermissions("managementcenter:materialinfo:del")
|
|
|
+// @RequestMapping(value = "delete")
|
|
|
+// public AjaxJson delete(MaterialInfo materialInfo) {
|
|
|
+// AjaxJson j = new AjaxJson();
|
|
|
+// materialInfoService.delete(materialInfo);
|
|
|
+// j.setMsg("删除成功");
|
|
|
+// return j;
|
|
|
+// }
|
|
|
+//
|
|
|
+// /**
|
|
|
+// * 批量删除
|
|
|
+// */
|
|
|
+// @ResponseBody
|
|
|
+// @RequiresPermissions("managementcenter:materialinfo:del")
|
|
|
+// @RequestMapping(value = "deleteAll")
|
|
|
+// public AjaxJson deleteAll(String ids) {
|
|
|
+// AjaxJson j = new AjaxJson();
|
|
|
+// String idArray[] =ids.split(",");
|
|
|
+// for(String id : idArray){
|
|
|
+// materialInfoService.delete(materialInfoService.get(id));
|
|
|
+// }
|
|
|
+// j.setMsg("删除成功");
|
|
|
+// return j;
|
|
|
+// }
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * 导入Excel数据
|
|
|
- */
|
|
|
- @ResponseBody
|
|
|
- @RequiresPermissions("managementcenter:materialinfo:import")
|
|
|
- @RequestMapping(value = "import")
|
|
|
- public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
|
|
|
- String batch = request.getParameter("batch"); //物料批次
|
|
|
- String itemBatch = request.getParameter("itemBatch"); //项目批次
|
|
|
- AjaxJson j = new AjaxJson();
|
|
|
- try {
|
|
|
- materialInfoService.export(file,batch,itemBatch);
|
|
|
- j.setMsg("导入成功");
|
|
|
- } catch (Exception e) {
|
|
|
- j.setSuccess(false);
|
|
|
- j.setMsg("导入失败！失败信息："+e.getMessage());
|
|
|
- }
|
|
|
- return j;
|
|
|
- }
|
|
|
+// /**
|
|
|
+// * 导入Excel数据
|
|
|
+// */
|
|
|
+// @ResponseBody
|
|
|
+// @RequiresPermissions("managementcenter:materialinfo:import")
|
|
|
+// @RequestMapping(value = "import")
|
|
|
+// public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
|
|
|
+// String batch = request.getParameter("batch"); //物料批次
|
|
|
+// String itemBatch = request.getParameter("itemBatch"); //项目批次
|
|
|
+// AjaxJson j = new AjaxJson();
|
|
|
+// try {
|
|
|
+// materialInfoService.saveData(file,batch,itemBatch);
|
|
|
+// j.setMsg("导入成功");
|
|
|
+// } catch (Exception e) {
|
|
|
+// j.setSuccess(false);
|
|
|
+// j.setMsg("导入失败！失败信息："+e.getMessage());
|
|
|
+// }
|
|
|
+// return j;
|
|
|
+// }
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 多文件导入
|
|
|
+ * 年度物资上报明细 多文件导入
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequiresPermissions("managementcenter:materialinfo:import")
|
|
|
@@ -181,7 +180,7 @@ public class MaterialInfoController extends BaseController {
|
|
|
AjaxJson j = new AjaxJson();
|
|
|
try {
|
|
|
for(int i=0;i<file.length;i++) {
|
|
|
- materialInfoService.export(file[i], batch,itemBatch);
|
|
|
+ materialInfoService.saveData(file[i], batch,itemBatch);
|
|
|
}
|
|
|
j.setMsg("导入成功");
|
|
|
} catch (Exception e) {
|
|
|
@@ -192,20 +191,20 @@ public class MaterialInfoController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * 导入文件页面
|
|
|
- * @return
|
|
|
- */
|
|
|
- @RequestMapping(value = "importExcel")
|
|
|
- public String importExcel(Model model) {
|
|
|
- List<MaterialProject> list = materialProjectService.findBatch();
|
|
|
- model.addAttribute("batch",list);
|
|
|
- return "modules/sg/managementcenter/materialinfo/importexcel";
|
|
|
- }
|
|
|
+// /**
|
|
|
+// * 导入文件页面
|
|
|
+// * @return
|
|
|
+// */
|
|
|
+// @RequestMapping(value = "importExcel")
|
|
|
+// public String importExcel(Model model) {
|
|
|
+// List<MaterialProject> list = materialProjectService.findBatch();
|
|
|
+// model.addAttribute("batch",list);
|
|
|
+// return "modules/sg/managementcenter/materialinfo/importexcel";
|
|
|
+// }
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 多文件导出页面
|
|
|
+ * 年度物资上报明细 多文件导入页面
|
|
|
*/
|
|
|
@RequestMapping(value = "/importMore/Form")
|
|
|
public String importMoreForm(Model model){
|
|
|
@@ -218,7 +217,6 @@ public class MaterialInfoController extends BaseController {
|
|
|
* 导出excel文件
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
-// @RequiresPermissions("test:one:dialog:leave1:export")
|
|
|
@RequestMapping(value = "export")
|
|
|
public AjaxJson exportFile(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response) {
|
|
|
AjaxJson j = new AjaxJson();
|
|
|
@@ -240,59 +238,64 @@ public class MaterialInfoController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * 项目验证
|
|
|
- */
|
|
|
-
|
|
|
- @ResponseBody
|
|
|
- @RequestMapping(value = "importValidation")
|
|
|
- public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch,String itemBatch){
|
|
|
- AjaxJson j = new AjaxJson();
|
|
|
- try {
|
|
|
- ImportExcel mo = new ImportExcel(file,1,"模块表");
|
|
|
- Row row = mo.getRow(0);
|
|
|
- String projectName1 = (String) mo.getCellValue(row, 1);
|
|
|
- String projectName = projectName1.trim();
|
|
|
- MaterialProject materialProject = new MaterialProject();
|
|
|
- materialProject.setReserveProjectName(projectName);
|
|
|
- List<MaterialProject> list = materialProjectService.findList(materialProject);
|
|
|
- if(list != null && list.size()>0){
|
|
|
- j.setSuccess(true);
|
|
|
- }else {
|
|
|
- materialInfoService.export(file,batch,itemBatch);
|
|
|
- j.setSuccess(true);
|
|
|
- j.setErrorCode("0");
|
|
|
- j.setMsg("导入成功");
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- j.setSuccess(false);
|
|
|
- j.setMsg("导入失败！失败信息："+e.getMessage());
|
|
|
- }
|
|
|
- return j;
|
|
|
- }
|
|
|
+// /**
|
|
|
+// * 项目验证
|
|
|
+// */
|
|
|
+//
|
|
|
+// @ResponseBody
|
|
|
+// @RequestMapping(value = "importValidation")
|
|
|
+// public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch,String itemBatch){
|
|
|
+// AjaxJson j = new AjaxJson();
|
|
|
+// try {
|
|
|
+// ImportExcel mo = new ImportExcel(file,1,"模块表");
|
|
|
+// Row row = mo.getRow(0);
|
|
|
+// String projectName1 = (String) mo.getCellValue(row, 1);
|
|
|
+// String projectName = projectName1.trim();
|
|
|
+// MaterialProject materialProject = new MaterialProject();
|
|
|
+// materialProject.setReserveProjectName(projectName);
|
|
|
+// List<MaterialProject> list = materialProjectService.findList(materialProject);
|
|
|
+// if(list != null && list.size()>0){
|
|
|
+// j.setSuccess(true);
|
|
|
+// }else {
|
|
|
+// materialInfoService.saveData(file,batch,itemBatch);
|
|
|
+// j.setSuccess(true);
|
|
|
+// j.setErrorCode("0");
|
|
|
+// j.setMsg("导入成功");
|
|
|
+// }
|
|
|
+// } catch (Exception e) {
|
|
|
+// j.setSuccess(false);
|
|
|
+// j.setMsg("导入失败！失败信息："+e.getMessage());
|
|
|
+// }
|
|
|
+// return j;
|
|
|
+// }
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 多文件验证
|
|
|
+ * 年度物资上报明细 多文件导入验证
|
|
|
+ * 若年度上报统计中已经存在某些项目，则返回消息由操作者选择是否进行覆盖，否则直接导入物资明细及项目信息
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "importValidations")
|
|
|
public AjaxJson importValidations(@RequestParam("file")MultipartFile[] file,String batch,String itemBatch) {
|
|
|
AjaxJson j = new AjaxJson();
|
|
|
- List<MaterialProject> materialProjects = new ArrayList<>();
|
|
|
+ List<MaterialProject> list = new ArrayList<>();
|
|
|
try {
|
|
|
+ //获取项目名称列表
|
|
|
for(int i = 0;i<file.length;i++) {
|
|
|
- ImportExcel mo = new ImportExcel(file[i], 1, "模块表");
|
|
|
- ImportExcel m1 = new ImportExcel(file[i], 1, "领料清单");
|
|
|
- Row row = mo.getRow(0);
|
|
|
- String projectName1 = (String) mo.getCellValue(row, 1);
|
|
|
- String projectName = projectName1.trim();
|
|
|
- MaterialProject materialProject = new MaterialProject();
|
|
|
- materialProject.setReserveProjectName(projectName);
|
|
|
- materialProjects.add(materialProject);
|
|
|
+ ImportExcel module = new ImportExcel(file[i], 1, "模块表");
|
|
|
+ Row row = module.getRow(0);
|
|
|
+ Object obj = module.getCellValue(row, 1);
|
|
|
+ if(obj==null){
|
|
|
+ throw new RuntimeException("找不到项目名称！");
|
|
|
+ }
|
|
|
+ String projectName = ((String) obj).trim();
|
|
|
+ MaterialProject project = new MaterialProject();
|
|
|
+ project.setReserveProjectName(projectName);
|
|
|
+ list.add(project);
|
|
|
}
|
|
|
- List<MaterialProject> list = materialProjectService.findByList(materialProjects);
|
|
|
- if(list != null && list.size()>0){
|
|
|
+ List<MaterialProject> projects = materialProjectService.findByList(list);
|
|
|
+ //判断是否有已存在项目
|
|
|
+ if(projects != null && projects.size()>0){
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
for(MaterialProject materialProject : list){
|
|
|
stringBuilder.append(materialProject.getReserveProjectName()+",");
|
|
|
@@ -301,7 +304,7 @@ public class MaterialInfoController extends BaseController {
|
|
|
j.setSuccess(true);
|
|
|
}else {
|
|
|
for(int k=0;k<file.length;k++) {
|
|
|
- materialInfoService.export(file[k], batch,itemBatch);
|
|
|
+ materialInfoService.saveData(file[k], batch,itemBatch);
|
|
|
}
|
|
|
j.setSuccess(true);
|
|
|
j.setErrorCode("0");
|
user5