2022/7/5 保存优化

src/main/java/com/jeeplus/modules/projectmaterialstorage/dao/ProjectMaterialStorageDao.java

@@ -6,6 +6,10 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.project.entity.Project;
 import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
+import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorageImport;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -25,5 +29,14 @@ public interface ProjectMaterialStorageDao extends CrudDao<ProjectMaterialStorag
     /**
      * 查询同项目名称、价格、材料名称的数量
      */
-    public Integer selectCountAboutProjectMaterialStorage(ProjectMaterialStorage projectMaterialStorage);
+    public Integer selectCountAboutProjectMaterialStorage(ProjectMaterialStorageImport projectMaterialStorage);
+
+
+
+
+
+    /**
+     * 材料库处理的批量插入
+     */
+    public Integer batchInsert(@Param("projectMaterialStorageImportList")List<ProjectMaterialStorageImport> projectMaterialStorageImportList);
 }

src/main/java/com/jeeplus/modules/projectmaterialstorage/service/ProjectMaterialStorageService.java

@@ -3,14 +3,19 @@ package com.jeeplus.modules.projectmaterialstorage.service;
 
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
+import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.projectmaterialstorage.dao.ProjectMaterialStorageDao;
 import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorage;
+import com.jeeplus.modules.projectmaterialstorage.entity.ProjectMaterialStorageImport;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+
 /**
  * 项目表Service
  * @author gx
@@ -63,17 +68,54 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
     /**
      * 查询同项目名称、价格、材料名称的数量是否只有一个
      */
-    public Boolean qureyCountAboutProjectMaterialStorage(ProjectMaterialStorage projectMaterialStorage){
+    public String qureyCountAboutProjectMaterialStorage(List<ProjectMaterialStorageImport> projectMaterialStorageImports){
+        int i =0;
+        HashMap map = new HashMap();
+        StringBuffer stringBuffer2 = new StringBuffer();
+        List<String> list = new ArrayList();
+        Set set = new HashSet();
+        Boolean flag = false;
         //材料列表自身重复判断
+        for (ProjectMaterialStorageImport projectMaterialStorageImport: projectMaterialStorageImports){
+            StringBuffer stringBuffer = new StringBuffer();
+            String str = new String();
+            str = projectMaterialStorageImport.getMaterialName()+projectMaterialStorageImport.getPrice()+projectMaterialStorageImport.getUnit();
+            list.add(str);
+            stringBuffer.append(projectMaterialStorageImport.getMaterialName()).append(projectMaterialStorageImport.getPrice())
+                    .append(projectMaterialStorageImport.getUnit());
+            set.add(str);
+            i++;
+        }
+        if(projectMaterialStorageImports.size() != set.size()){
+            if(list.size()>0){
+                for(int k =0;k< list.size();k++){
+                    for(int j =0;j<list.size();j++){
+                        if(list.get(k).toString().equals(list.get(j).toString())){
+                            stringBuffer2.append(" 在第"+i+"个的材料名、价格或单位重复");
+                        }
+                    }
+                }
+            }
+            return stringBuffer2.toString();
+        }
+        for(int j=0;j<projectMaterialStorageImports.size();j++){
+            //材料列表数据库重复判断
+            ProjectMaterialStorageImport projectMaterialStorageImport = projectMaterialStorageImports.get(j);
+            if(projectMaterialStorageDao.selectCountAboutProjectMaterialStorage(projectMaterialStorageImport)!=0){
+                list.add("第"+j+"个的材料名、价格、单位重复,请重新添加");
+                flag = true;
+            }
+        }
+        if(!flag){
+            //如果重复，重复的材料名称以String形式抛出到前端  join方法
+            return  "successful";
+        }else {
+            return StringUtils.join(list,",");
+        }
+
 
-        //材料列表数据库重复判断
 
-        //如果重复，重复的材料名称以String形式抛出到前端
 
-        if(projectMaterialStorageDao.selectCountAboutProjectMaterialStorage(projectMaterialStorage) != 0){
-            return false;
-        }
-        return true;
     }
 
     /**
@@ -95,4 +137,18 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
         }
         return "修改失败";
     }
+
+
+    /**
+     * 批量保存或更新
+     * @param
+     */
+    @Transactional(readOnly = false)
+    public void batchSave(List<ProjectMaterialStorageImport> projectMaterialStorageImports) {
+        for(ProjectMaterialStorageImport projectMaterialStorageImport:projectMaterialStorageImports){
+            projectMaterialStorageImport.setId(IdGen.uuid());
+            projectMaterialStorageImport.preInsert();
+        }
+       projectMaterialStorageDao.batchInsert(projectMaterialStorageImports);
+    }
 }

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

@@ -78,63 +78,50 @@ public class ProjectMaterialStorageController extends BaseController {
     }
 
 
-    @RequiresPermissions(value={"project:projectMaterialStorage:add","project:projectMaterialStorage:edit"},logical = Logical.OR)
+//    @RequiresPermissions(value={"project:projectMaterialStorage:add","project:projectMaterialStorage:edit"},logical = Logical.OR)
     @RequestMapping(value = "save")
     public String save(ProjectMaterialStorage projectMaterialStorage, Model model, RedirectAttributes redirectAttributes,String pageId) throws Exception {
         int i = 1;
         List<ProjectMaterialStorageImport> projectMaterialStorageList = projectMaterialStorage.getProjectMaterialStorageList();
-//        对于list的长度进行判断，判断小于0就根据来的位置进行返回
+        //        对于list的长度进行判断，判断小于0就根据来的位置进行返回
         if(projectMaterialStorageList.size()<=0){
             addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
 //            pageId 1代表这是从工程咨询进来的 2是从造价审核进来的
             if("1".equals(pageId)){
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
-            }
-            if("2".equals(pageId)){
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
             }
             return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
         }
-        for(ProjectMaterialStorageImport projectMaterialStorageImport:projectMaterialStorageList){
-            ProjectMaterialStorage materialStorage  = new ProjectMaterialStorage();
-            materialStorage.setMaterialName(projectMaterialStorageImport.getMaterialName());
-            materialStorage.setPrice(projectMaterialStorageImport.getPrice());
-            materialStorage.setProjectNumber(projectMaterialStorage.getProjectNumber());
+        for(int k=0;k<projectMaterialStorageList.size();k++){
+            if(projectMaterialStorageList.get(k).getMaterialName() ==null&& projectMaterialStorageList.get(k).getPrice()==null && projectMaterialStorageList.get(k).getUnit()==null){
+                projectMaterialStorageList.remove(k);
+            }
+            projectMaterialStorageList.get(k).setProjectNumber(projectMaterialStorage.getProjectNumber());
+            projectMaterialStorageList.get(k).setIsNewRecord(true);
             //       判断项目名称、材料名称、价格是否为空
-            if(materialStorage.getProjectNumber()==null && materialStorage.getMaterialName() ==null && materialStorage.getPrice() == null ){
+            if(projectMaterialStorageList.get(k).getProjectNumber()==null || projectMaterialStorageList.get(k).getMaterialName() ==null || projectMaterialStorageList.get(k).getPrice() == null ){
                 addMessage(redirectAttributes, "第"+i+"个项目名称、材料名称、价格等获取失败，请重试");
                 if("1".equals(pageId)){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
-                }
-                if("2".equals(pageId)){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
                 }
                 return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
             }
-            //        进行项目名称、材料名称、价格重复的判断
-            if(!projectMaterialStorageService.qureyCountAboutProjectMaterialStorage(materialStorage)){
-                addMessage(redirectAttributes, "当前的项目名称、材料名称、价格重复，请重试");
-                if("1".equals(pageId)){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
-                }
-                if("2".equals(pageId)){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
-                }
-                return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+        }
+        if(!"successful".equals(projectMaterialStorageService.qureyCountAboutProjectMaterialStorage(projectMaterialStorageList))){
+            addMessage(redirectAttributes, projectMaterialStorageService.qureyCountAboutProjectMaterialStorage(projectMaterialStorageList));
+            if("1".equals(pageId)){
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
             }
-            materialStorage.setIsNewRecord(true);
-            projectMaterialStorageService.save(materialStorage);
-            RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectMaterialStorage.getProjectNumber());
-//           修改2代表已处理
-            ruralProjectRecords.setprojectMaterialStorageStatus("2");
-            projectMaterialStorageService.modifyProjectMaterialStorageStatus(ruralProjectRecords);
+            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
         }
 
+        projectMaterialStorageService.batchSave(projectMaterialStorageList);
+        RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectMaterialStorage.getProjectNumber());
+//           修改2代表已处理
+        ruralProjectRecords.setprojectMaterialStorageStatus("2");
+        projectMaterialStorageService.modifyProjectMaterialStorageStatus(ruralProjectRecords);
         if("1".equals(pageId)){
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
-        }
-        if("1".equals(pageId)){
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
         }
         return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
     }
@@ -167,7 +154,8 @@ public class ProjectMaterialStorageController extends BaseController {
            if(projectMaterialStorageService.delectBylogic(projectMaterialStorage) != 1){
                addMessage(redirectAttributes, "删除失败，请重试");
            }
-            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+            return "redirect:"+Global.getAdminPath()+"/project/" +
+                    "/?repage";
         }
 
 
@@ -346,4 +334,41 @@ public class ProjectMaterialStorageController extends BaseController {
         model.addAttribute("projectRecords",projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectMessageList";
     }
+
+    /**
+     * 单对象保存
+     */
+    @RequestMapping(value = "signleSave")
+    public String signleSave(ProjectMaterialStorage projectMaterialStorage, Model model, RedirectAttributes redirectAttributes,String pageId) throws Exception {
+
+//      判断项目名称、材料名称、价格是否为空
+        if(projectMaterialStorage.getProjectNumber()==null && projectMaterialStorage.getMaterialName() ==null && projectMaterialStorage.getPrice() == null ){
+            addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
+            if("1".equals(pageId)){
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
+            }
+            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+        }
+//        进行项目名称、材料名称、价格重复的判断
+        if(projectMaterialStorage.getProjectNumber()==null && projectMaterialStorage.getMaterialName() ==null && projectMaterialStorage.getPrice() == null ){
+            addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
+            if("1".equals(pageId)){
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
+            }
+            return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+        }
+        projectMaterialStorage.setIsNewRecord(true);
+        projectMaterialStorageService.save(projectMaterialStorage);
+        RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectMaterialStorage.getProjectNumber());
+//           修改2代表已处理
+        ruralProjectRecords.setprojectMaterialStorageStatus("2");
+
+        projectMaterialStorageService.modifyProjectMaterialStorageStatus(ruralProjectRecords);
+        if("1".equals(pageId)){
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
+        }
+        return "redirect:"+Global.getAdminPath()+"/project/projectMaterialStorage/?repage";
+    }
+
+
 }

src/main/resources/mappings/modules/projectMaterialStorage/ProjectMaterialStorageDao.xml

@@ -170,10 +170,17 @@
 		where project_number = #{projectNumber}
 		and material_name = #{materialName}
 		and price = #{price}
+		and project_number = #{projectNumber}
 	</select>
 
 
 
 
-
+	<insert id="batchInsert">
+		insert into project_material_storage
+		(id,create_date,del_flag,material_name,price,remarks,project_number,update_by,update_date,create_by,unit)
+		<foreach collection="projectMaterialStorageImportList" item="data" separator=",">
+		 values	(#{data.id},#{data.createDate},#{data.delFlag},#{data.materialName},#{data.price},' ',#{data.projectNumber},#{data.updateBy.id},#{data.updateDate},#{data.createBy.id},#{data.unit})
+		</foreach>
+	</insert>
 </mapper>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -407,6 +407,7 @@ END) as projectScale*/
 		,cb.case_create_by as "caseCreateBy"
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
 		,rprr.ZiXunBDE as "ziXunBDE"
+		,a.project_material_storage_status as "projectMaterialStorageStatus"
 		FROM rural_project_records a
 		left join case_base cb on a.id = cb.project_id
 		LEFT JOIN sys_area area ON area.id = a.area_id

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

@@ -85,7 +85,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectMaterialStorage" action="${ctx}/project/projectMaterialStorage/save" method="post" class="layui-form">
+		<form:form id="inputForm" modelAttribute="projectMaterialStorage" action="${ctx}/project/projectMaterialStorage/signleSave" method="post" class="layui-form">
 			<form:hidden path="id"/>
 
 			<div class="form-group layui-row first">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -1387,14 +1387,14 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{align:'center', title: '材料库',  width:110,templet:function(d){
-						var st = getProjectMaterialStorageStatus(d.projectMaterialStorageStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectMaterialStorage/form?reportedProcessInstanceId=" + d.reportedProcessInstanceId +"&&pageId=2"+ "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
+				<%--,{align:'center', title: '材料库',  width:110,templet:function(d){--%>
+				<%--		var st = getProjectMaterialStorageStatus(d.projectMaterialStorageStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectMaterialStorage/form?reportedProcessInstanceId=" + d.reportedProcessInstanceId +"&&pageId=2"+ "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -536,6 +536,63 @@
 			});
 		}
 
+		function openDialogreMaterialStorage(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					if(split.length==2){return}
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+
 		function notifyDialogre(title,url,width,height,target){
 			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
 				width='auto';
@@ -947,6 +1004,14 @@
 						}
 						return xml;
                     }}
+				,{align:'center', title: '材料库',  width:110,templet:function(d){
+						var st = getProjectMaterialStorageStatus(d.projectMaterialStorageStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectMaterialStorage/form?reportedProcessInstanceId=" + d.reportedProcessInstanceId +"&&pageId=1"+ "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
 				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
 				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
 				<%--		if(st.action)--%>
@@ -1021,11 +1086,18 @@
 						}
 
 
+
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:accessory">
 							if(0 == d.projectReportRecordStatus){
 								xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
 							}
 						</shiro:hasPermission>
+						<%--						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:projectMaterialStorage">--%>
+						//材料库处理按钮
+						if (d.projectMaterialStorageStatus==1){
+							xml+="<a href=\"#\" onclick=\"openDialogreMaterialStorage('添加项目材料信息', '${ctx}/project/projectMaterialStorage/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\"  > 材料库处理</a>";
+						}
+						<%--						</shiro:hasPermission>--%>
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminAccessory">
 							xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上传文件</a>";
 						</shiro:hasPermission>
@@ -1079,6 +1151,8 @@
                             }
                         </shiro:hasPermission>
 
+
+
 						xml+="</div>";
 						return[xml].join('');
 					}}
@@ -1141,6 +1215,7 @@
                     ,"caseType":"${projectRecords.caseType}"
                     ,"caseCreateBy":"${projectRecords.caseCreateBy}"
                     ,"caseStatus":"${projectRecords.caseStatus}"
+					,"projectMaterialStorageStatus":"${projectRecords.projectMaterialStorageStatus}"
                     ,"falg":
                     <c:choose>
                         <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -1285,9 +1285,9 @@
 						}
 						</shiro:hasPermission>
 						//材料库处理按钮
-						if (d.projectMaterialStorageStatus==1){
-							xml+="<a href=\"#\" onclick=\"openDialogreMaterialStorage('添加项目材料信息', '${ctx}/project/projectMaterialStorage/form?id=" + d.id +"&&"+"pageId=1" +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 材料库处理</a>";
-						}
+						<%--if (d.projectMaterialStorageStatus==1){--%>
+						<%--	xml+="<a href=\"#\" onclick=\"openDialogreMaterialStorage('添加项目材料信息', '${ctx}/project/projectMaterialStorage/form?id=" + d.id +"&&"+"pageId=1" +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 材料库处理</a>";--%>
+						<%--}--%>
 						xml+="</div>"
 						return xml;