返回显示的保存条数 修改

src/main/java/com/jeeplus/modules/supply/materialLibrary/service/MaterialLibraryService.java

@@ -107,7 +107,8 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
             modifyHandmadeVindicateListTwo(codeList);
         }
 
-
+        //提前保存读取的list的长度
+        int size = list.size();
 
         //批量新增  分批次新增
         if(list.size()!=0) {
@@ -115,7 +116,7 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
         }
         returnMap.keySet().removeIf(key -> key == "msg");
         returnMap.put("success",true);
-        returnMap.put("msg","已成功导入 "+list.size()+" 条物料库记录");
+        returnMap.put("msg","已成功导入 "+size+" 条物料库记录");
         return returnMap;
     }
 

src/main/java/com/jeeplus/modules/supply/materialsProvidedByAForReview/entity/MaterialsProvidedByAForReview.java

@@ -73,7 +73,7 @@ public class MaterialsProvidedByAForReview extends DataEntity<MaterialsProvidedB
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    @ExcelField(title="送审id", align=2, sort=8)
+    @ExcelField(title="送审Id", align=2, sort=8)
     public String getSubmittalsId() {
         return submittalsId;
     }

src/main/java/com/jeeplus/modules/supply/materialsProvidedByAForReview/service/MaterialsProvidedByAForReviewService.java

@@ -103,7 +103,9 @@ public class MaterialsProvidedByAForReviewService extends CrudService<MaterialsP
             return map;
         }
 
-
+        //提前保存读取的list的长度
+        int size = list.size();
+        map.put("size",size);
 
         //批量处理
         disposeMaterialsProvidedByAForReviewList(list);

src/main/java/com/jeeplus/modules/supply/materialsProvidedByAForReview/web/MaterialsProvidedByAForReviewController.java

@@ -110,7 +110,7 @@ public class MaterialsProvidedByAForReviewController extends BaseController {
             Map<String,Object> map = materialsProvidedByAForReviewService.disposeMaterialsProvidedByAForReview(list);
             Boolean bool = (Boolean) map.get("success");
             if(bool){
-                j.setMsg("已成功导入 " + list.size() +" 条甲供材报审记录");
+                j.setMsg("已成功导入 " + map.get("size").toString() +" 条甲供材报审记录");
             }else{
                 j.setSuccess(false);
                 j.setMsg(map.get("message").toString());

src/main/java/com/jeeplus/modules/supply/projectInformation/service/ProjectInformationService.java

@@ -136,6 +136,8 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
             modifyHandmadeVindicateListTwo(codeList);
         }
 
+        //提前保存读取的list的长度
+        int size = list.size();
 
         //批量新增  分批次新增
         if(list.size()!=0) {
@@ -145,7 +147,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
 
         returnMap.keySet().removeIf(key -> key == "msg");
         returnMap.put("success",true);
-        returnMap.put("msg","已成功导入 "+list.size()+" 条项目信息记录");
+        returnMap.put("msg","已成功导入 "+size+" 条项目信息记录");
         return returnMap;
     }
 

src/main/java/com/jeeplus/modules/supply/projectInformation/web/ProjectInformationController.java

@@ -5,13 +5,10 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.supply.materialLibrary.entity.MaterialLibrary;
-import com.jeeplus.modules.supply.materialLibrary.service.MaterialLibraryService;
 import com.jeeplus.modules.supply.projectInformation.entity.ProjectInformation;
 import com.jeeplus.modules.supply.projectInformation.service.ProjectInformationService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -54,7 +51,7 @@ public class ProjectInformationController extends BaseController {
     /**
      * 项目列表页面
      */
-//    @RequiresPermissions("supply:projectInformation:list")
+    @RequiresPermissions("supply:projectInformation:list")
     @RequestMapping(value = {"list", ""})
     public String list(ProjectInformation projectInformation, Model model) {
         model.addAttribute("projectInformation",projectInformation);

src/main/webapp/webpage/modules/supply/materialsProvidedByAForReview/supplyMaterialsProvidedByAForReviewList.js

@@ -121,7 +121,7 @@
                 }
                 ,{
                     field: 'submittalsId',
-                    title: '送审id',
+                    title: '送审Id',
                     width:150,
                     sortName: 'submittalsId'
                 }

src/main/webapp/webpage/modules/supply/materialsProvidedByAForReview/supplyMaterialsProvidedByAForReviewList.jsp

@@ -30,7 +30,7 @@
 					<form:input path="projectDefinition" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
 				<div class="col-xs-12 col-sm-4 col-md-4">
-					<label class="label-item single-overflow pull-left" title="送审id：">送审id：</label>
+					<label class="label-item single-overflow pull-left" title="送审Id：">送审Id：</label>
 					<form:input path="submittalsId" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>