提示修改

src/main/java/com/jeeplus/modules/workmaterialcollect/dao/WorkMaterialCollectTypeDao.java

@@ -24,4 +24,7 @@ public interface WorkMaterialCollectTypeDao extends CrudDao<WorkMaterialCollectT
 
     //根据id修改状态
     public void updateStatusId(String id);
+
+    //逻辑删除
+    public Integer updateEngId(String id);
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectEngineerService.java

@@ -97,9 +97,12 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     public void updateCollectEngineer(WorkMaterialCollectEngineer workMaterialCollectEngineer){
         //存在的id
         List<String> strings = new ArrayList<String>();
-        for (WorkMaterialCollectType work:workMaterialCollectEngineer.getWorkMaterialCollectTypes()){
-            if (null!=work.getId()){
-                strings.add(work.getId());
+        //把存在id 的工程类型存在在strings list当中
+        if (null!=workMaterialCollectEngineer.getWorkMaterialCollectTypes()){
+            for (WorkMaterialCollectType work:workMaterialCollectEngineer.getWorkMaterialCollectTypes()){
+                if (null!=work.getId()){
+                    strings.add(work.getId());
+                }
             }
         }
         //查找项目集合
@@ -116,13 +119,14 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
         for (WorkMaterialCollectType workMaterialCollectType1:workType){
             flag = true;
             for (int i = 0; i < strings.size(); i++) {
+                //如果存在集合中id 等于 strings中id
                 if (workMaterialCollectType1.getId().equals(strings.get(i))){
                     flag = false;
 //                    strings.remove(i);
 //                    i--;
                 }
             }
-            if (flag){
+            if (flag){//如果不存在删除
                 workMaterialCollectTypeDao.delete(workMaterialCollectType1);
                 workattachment = new Workattachment();
                 workattachment.setId(workMaterialCollectType1.getId());
@@ -134,8 +138,15 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
 
     @Transactional(readOnly = false)
     public void saveAddWorkEng(WorkMaterialCollectEngineer workMaterialCollectEngineer){
+        String area = workMaterialCollectEngineer.getProjectSite();
+        area = area.substring(area.indexOf(",")+1);
+        //获取基本保存信息
+        workMaterialCollectEngineer.setProjectSite(area);
+        //获取修改状态
         workMaterialCollectEngineer.preUpdate();
+        //修改项目
         workMaterialCollectEngineerDao.update(workMaterialCollectEngineer);
+        //获取类型
         List<WorkMaterialCollectType> workMaterialCollectTypes = workMaterialCollectEngineer.getWorkMaterialCollectTypes();
         Workattachment workattachment = null;
         String uploadType = "";
@@ -204,7 +215,7 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
     public void deleteWorkInformation(WorkMaterialCollectEngineer workMaterialCollectEngineer){
         WorkMaterialCollectEngineer workEngineer = workMaterialCollectEngineerDao.get(workMaterialCollectEngineer.getId());
         //删除项目名称表
-        workMaterialCollectEngineerDao.delete(workEngineer);
+        workMaterialCollectEngineerDao.deleteByLogic(workEngineer);
         //查找项目类型表
         WorkMaterialCollectType workMaterialCollectType = new WorkMaterialCollectType();
         workMaterialCollectType.setEngineerId(workEngineer.getId());
@@ -216,7 +227,6 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
             }
         }
         //删除类型表
-        workMaterialCollectTypeDao.deleteEngId(workEngineer.getId());
-
+        workMaterialCollectTypeDao.updateEngId(workEngineer.getId());
     }
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectTotalService.java

@@ -137,6 +137,22 @@ public class WorkMaterialCollectTotalService extends CrudService<WorkMaterialCol
         return workMaterialCollectTotalList;
     }
 
+    //验证数据问题
+    public String getCheck(List<WorkMaterialCollectTotal> materialCollects){
+        String str = "";
+        boolean flag = true;
+        for (WorkMaterialCollectTotal workMaterialCollectTotal:materialCollects){
+            if (flag){
+                if (null == workMaterialCollectTotal.getExcludingTax()){
+                    flag = false;
+                    str += "除税市场价不能为空且必须为数字!";
+                    break;
+                }
+            }
+        }
+        return str;
+    }
+
     //导入后追加工程,项目信息
     @Transactional(readOnly = false)
     public void getAdditionalInformation(List<WorkMaterialCollectTotal> workMaterialCollectTotals,String itemHideId, String projecTypeId,String remarks){

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialCollectEngineerController.java

@@ -133,7 +133,7 @@ public class WorkMaterialCollectEngineerController extends BaseController {
     @RequestMapping(value = "save")
     public String save(WorkMaterialCollectEngineer workMaterialCollectEngineer,Model model, RedirectAttributes redirectAttributes){
         //判断修改还是删除
-        try{
+//        try{
             if (!"".equals(workMaterialCollectEngineer.getId())){
                 //修改
                 workMaterialCollectEngineerService.updateCollectEngineer(workMaterialCollectEngineer);
@@ -141,9 +141,9 @@ public class WorkMaterialCollectEngineerController extends BaseController {
                 //保存
                 workMaterialCollectEngineerService.saveCollectEngineer(workMaterialCollectEngineer);
             }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
         //获取工程类型集合
         return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineer/?repage";
     }

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialCollectTotalController.java

@@ -73,6 +73,11 @@ public class WorkMaterialCollectTotalController extends BaseController {
             StringBuilder failureMsg = new StringBuilder();
             ImportExcel ei = new ImportExcel(file, 1, 0);
             List<WorkMaterialCollectTotal> materialCollects = ei.getDataList(WorkMaterialCollectTotal.class);
+            String check = workMaterialCollectTotalService.getCheck(materialCollects);
+            if (!"".equals(check)){
+                addMessage(redirectAttributes, "导入客户信息失败！失败信息："+check);
+                return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
+            }
             List<WorkMaterialCollectTotal> duplicateRemoval = workMaterialCollectTotalService.getDuplicateRemoval(materialCollects);
 //            List<WorkMaterialCollectTotal> materialCollects = workMaterialCollectTotalService.getMaterialCollectImportExcel(ei);
             workMaterialCollectTotalService.getAdditionalInformation(duplicateRemoval,itemHideId,projectTypeId,remarks);
@@ -96,6 +101,7 @@ public class WorkMaterialCollectTotalController extends BaseController {
         }
 //        ajaxJson.setSuccess(false);
 //        ajaxJson.setMsg("上传失败");
+        addMessage(redirectAttributes, "上传成功!");
         return "redirect:"+ Global.getAdminPath()+"/workMaterialCollect/engineerSure/?repage";
     }
 //    @ResponseBody

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialModelListController.java

@@ -31,6 +31,7 @@ public class WorkMaterialModelListController {
     private WorkMaterialCollectEngineerService workMaterialCollectEngineerService;
     @Autowired
     private WorkMaterialCollectTypeService workMaterialCollectTypeService;
+
     @ResponseBody
     @RequestMapping(value = "list.do")
     public List<WorkMaterialCollectTotal> list(String itemName,WorkMaterialCollectTotal workMaterialCollectTotal, Model model){