Home Explore Help
Register Sign In
chengqiang
/
sg_finalAcountAuto
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

xs 5 years ago
parent
8d7211c89d 7b88a29c81
commit
10c603a14b
3 changed files with 7 additions and 20 deletions
Unified View Show Diff Stats
  1. 5 9
      src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java
  2. 2 10
      src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java
  3. 0 1
      src/main/webapp/webpage/modules/sg/project/management.jsp

+ 5 - 9
src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java
View File 

@@ -120,10 +120,9 @@ public class ProjectController extends BaseController {
 
      */
 
      */
 
     @RequestMapping("/import")
 
     @RequestMapping("/import")
 
     public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) throws IOException, InvalidFormatException {
 
     public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) throws IOException, InvalidFormatException {
 
-//        String type = wbsItem.getType();   //项目类型
 
         String id = getId();
 
         String id = getId();
 
         wbsItem.setId(id);
 
         wbsItem.setId(id);
 
-//        try {
 
+        try {
 
            //判断结算数类型并保存数据到数据库
 
            //判断结算数类型并保存数据到数据库
 
              String str = projectService.save(file,wbsItem);
 
              String str = projectService.save(file,wbsItem);
 
              if(str.equals(BashInfo.INVALIDFORMAT)){
 
              if(str.equals(BashInfo.INVALIDFORMAT)){
 
@@ -131,13 +130,10 @@ public class ProjectController extends BaseController {
 
              }
 
              }
 
              addMessage(redirectAttributes, "导入成功");
 
              addMessage(redirectAttributes, "导入成功");
 
              return "redirect:/a/jkxl/list?id="+id+"&type="+str;
 
              return "redirect:/a/jkxl/list?id="+id+"&type="+str;
 
-//        } catch (RuntimeException e) {
 
-//            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
 
-//            return "redirect:/a/project/list";
 
-//        }   catch (Exception e){
 
-//            addMessage(redirectAttributes, "导入失败");
 
-//            return "redirect:/a/project/list";
 
-//        }
 
+        }   catch (Exception e){
 
+            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
 
+            return "redirect:/a/project/list";
 
+        }
 
     }
 
     }
 
 
 
     //导出
 
     //导出

+ 2 - 10
src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java
View File 

@@ -99,14 +99,9 @@ public class ProjectTemController extends BaseController {
 
                     throw new RuntimeException(str);
 
                     throw new RuntimeException(str);
 
                 }
 
                 }
 
             }
 
             }
 
-        } catch (RuntimeException e) {
 
-            map.put("code",0);
 
-            map.put("msg","导入失败，"+fileName+e.getMessage());
 
-            projectService.delete(wbsProject);
 
-            return map;
 
         }  catch (Exception e){
 
         }  catch (Exception e){
 
             map.put("code",0);
 
             map.put("code",0);
 
-            map.put("msg","导入失败");
 
+            map.put("msg","导入失败，"+fileName+e.getMessage());
 
             projectService.delete(wbsProject);
 
             projectService.delete(wbsProject);
 
             return map;
 
             return map;
 
         }
 
         }
 
@@ -133,11 +128,8 @@ public class ProjectTemController extends BaseController {
 
             }
 
             }
 
             addMessage(redirectAttributes, "导入成功");
 
             addMessage(redirectAttributes, "导入成功");
 
             return "redirect:/a/jkxl/list?id="+id+"&type="+str+"&projectId="+projectId;
 
             return "redirect:/a/jkxl/list?id="+id+"&type="+str+"&projectId="+projectId;
 
-        } catch (RuntimeException e) {
 
-            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
 
-            return "redirect:/a/project/tem/list?projectId="+projectId;
 
         }   catch (Exception e){
 
         }   catch (Exception e){
 
-            addMessage(redirectAttributes, "导入失败");
 
+            addMessage(redirectAttributes, "导入失败，"+e.getMessage());
 
             return "redirect:/a/project/tem/list?projectId="+projectId;
 
             return "redirect:/a/project/tem/list?projectId="+projectId;
 
         }
 
         }
 
     }
 
     }

+ 0 - 1
src/main/webapp/webpage/modules/sg/project/management.jsp
View File 

@@ -1,6 +1,5 @@
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
 <%@ include file="/webpage/include/taglib.jsp"%>
 
 <%@ include file="/webpage/include/taglib.jsp"%>
 
-<%@ include file="/webpage/include/bootstraptable.jsp"%>
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
 <head>
 
 <head>