2022/7/8 代码优化

src/main/java/com/jeeplus/modules/projectmaterialstorage/web/ProjectMaterialStorageController.java

@@ -28,6 +28,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -258,17 +259,20 @@ public class ProjectMaterialStorageController extends BaseController {
      * 查看，增加，编辑客户管理表单页面
      */
     @RequestMapping(value = "formTwoPage")
-    public String form(ProjectMaterialStorage projectMaterialStorage, Model model) {
-        if(StringUtils.isBlank(projectMaterialStorage.getId())){
-            ProjectMaterialStorage projectMaterialStorage1=new ProjectMaterialStorage();
-            model.addAttribute("projectMaterialStorage", projectMaterialStorage1);
+    public String form(ProjectMaterialStorage projectMaterialStorage, Model model,String isAdd) {
+        ProjectMaterialStorage projectMaterialStorage2 = new ProjectMaterialStorage();
+        if(StringUtils.isNotBlank(projectMaterialStorage.getId())){
+           projectMaterialStorage2  = projectMaterialStorageService.get(projectMaterialStorage.getId());
+        }else{
+            model.addAttribute("isAdd",isAdd);
+//            model.addAttribute("projectMaterialStorage", projectMaterialStorage2);
+//            addMessage(redirectAttributes, "参数获取失败，请联系管理员");
             return "modules/projectMaterialStorage/projectMaterialStorageTwoForm";
         }
         if(StringUtils.isNotBlank(projectMaterialStorage.getProjectNumber())){
-            ProjectMaterialStorage projectMaterialStorage2 = projectMaterialStorageService.get(projectMaterialStorage.getId());
+
             model.addAttribute("projectMaterialStorage", projectMaterialStorage2);
         }
-        model.addAttribute("projectMaterialStorage", projectMaterialStorage);
 
         return "modules/projectMaterialStorage/projectMaterialStorageTwoForm";
     }
@@ -350,8 +354,17 @@ public class ProjectMaterialStorageController extends BaseController {
      * 单对象保存
      */
     @RequestMapping(value = "signleSave")
-    public String signleSave(ProjectMaterialStorage projectMaterialStorage, Model model, RedirectAttributes redirectAttributes,String pageId) throws Exception {
+    public String signleSave(ProjectMaterialStorage projectMaterialStorage, Model model, RedirectAttributes redirectAttributes,String pageId,String isAdd) throws Exception {
 
+//       非1为添加  type为1时修改；
+        if( isAdd.equals("0")){
+            projectMaterialStorage.setIsNewRecord(true);
+            String projectNumber = projectMaterialStorage.getProjectName().substring(0,projectMaterialStorage.getProjectName().indexOf(","));
+            projectMaterialStorage.setProjectNumber(projectNumber);
+        }
+        if(projectMaterialStorage.getProjectNumber()==null){
+            projectMaterialStorage = projectMaterialStorageService.get(projectMaterialStorage.getId());
+        }
 //      判断项目名称、材料名称、价格是否为空
         if(projectMaterialStorage.getProjectNumber()==null && projectMaterialStorage.getMaterialName() ==null && projectMaterialStorage.getPrice() == null ){
             addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
@@ -365,7 +378,8 @@ public class ProjectMaterialStorageController extends BaseController {
             addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
             return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
         }
-        projectMaterialStorage.setIsNewRecord(true);
+
+
         projectMaterialStorageService.save(projectMaterialStorage);
         RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectMaterialStorage.getProjectNumber());
 //           修改2代表已处理

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageList.jsp

@@ -404,7 +404,7 @@
 				<div class="nav-btns">
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
-						<table:addRow url="${ctx}/project/projectMaterialStorage/formTwoPage" title="添加材料"></table:addRow><!-- 增加按钮 -->
+						<table:addRow url="${ctx}/project/projectMaterialStorage/formTwoPage?isAdd=0" title="添加材料"></table:addRow><!-- 增加按钮 -->
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						</div>
 <%--					<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">--%>
@@ -469,7 +469,7 @@
                 ,{field:'op',align:'center',title:"操作",width:240,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-                         xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectMaterialStorage/formTwoPage?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                         xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectMaterialStorage/formTwoPage?id=" + d.id+"&&isAdd=1" +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 						 xml+="<a href=\"${ctx}/project/projectMaterialStorage/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该材料信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 
 

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageTwoForm.jsp

@@ -85,15 +85,14 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectMaterialStorage" action="${ctx}/project/projectMaterialStorage/signleSave" method="post" class="layui-form">
+		<form:form id="inputForm" modelAttribute="projectMaterialStorage" action="${ctx}/project/projectMaterialStorage/signleSave?isAdd=${isAdd}" method="post" class="layui-form">
 			<form:hidden path="id"/>
-
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>材料详情</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>项目名称</label>
 					<div class="layui-input-block">
-						<sys:gridselectprojectmaterial url="${ctx}/project/projectMaterialStorage/selectproject" id="project" name="projectNumber"  value="${projectMaterialStorage.projectName}"  title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
+						<sys:gridselectprojectmaterial url="${ctx}/project/projectMaterialStorage/selectproject" id="project" name="projectName"  value="${projectMaterialStorage.projectName}"  title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
 													  labelValue="${projectMaterialStorage.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  ></sys:gridselectprojectmaterial>
 					</div>
 				</div>