材料库部分代码提交

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

@@ -4,7 +4,6 @@ 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;
@@ -88,17 +87,8 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
         }
 //        如果列表长度和set长度不符合，代表有不符合条件的参数
         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())){
-
-                            stringBuilder.append(" 在第"+i+"行的材料名、价格或单位重复");
-                            map.put("failure",stringBuilder);
-                        }
-                    }
-                }
-            }
+            stringBuilder.append(" 数据中存在重复材料，无法进行添加");
+            map.put("failure",stringBuilder);
             return map;
         }
 //        数据库判断
@@ -106,7 +96,7 @@ public class ProjectMaterialStorageService extends CrudService<ProjectMaterialSt
             //材料列表数据库重复判断
             ProjectMaterialStorageImport projectMaterialStorageImport = projectMaterialStorageImports.get(j);
             if(projectMaterialStorageDao.selectCountAboutProjectMaterialStorage(projectMaterialStorageImport)!=0){
-                stringBuilder.append("第"+j+"行的材料名、价格、单位重复,请重新添加");
+                stringBuilder.append("第"+j+"行的材料已存在,请勿重复添加");
                 flag = true;
             }
         }

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

@@ -17,8 +17,6 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -31,8 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 
 @Controller
@@ -99,7 +99,7 @@ public class ProjectMaterialStorageController extends BaseController {
         while (iterator.hasNext()){
 
            ProjectMaterialStorageImport projectMaterialStorageImport = iterator.next();
-            if(projectMaterialStorageImport.getPrice() == null || projectMaterialStorageImport.getMaterialName() == null || projectMaterialStorageImport.getUnit()== null){
+            if(projectMaterialStorageImport.getPrice() == null || projectMaterialStorageImport.getMaterialName() == null || projectMaterialStorageImport.getUnit()== null || "1".equals(projectMaterialStorageImport.getDelFlag())){
                 iterator.remove();
             }else {
                 projectMaterialStorageList.add(projectMaterialStorageImport);

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

@@ -179,8 +179,9 @@
 	<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)
+		values
 		<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})
+		(#{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>