Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -106,6 +106,37 @@ public class OverheadLineController extends BaseController {
   }
 
 
+  @RequestMapping("/temlist")
+  public String temlist(HttpServletRequest request,Model model){
+    String id = request.getParameter("id");
+    String type = request.getParameter("type");
+    String projectId = request.getParameter("projectId");
+    WbsItem wbsItem = new WbsItem();
+    JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
+    wbsItem.setId(id);
+    wbsItem.setType(type);
+    wbsItem.setProjectId(projectId);
+    jkxlAdjustFee.setId(id);
+    List<WbsItem> list1 = new ArrayList<>();
+    list1.add(wbsItem);
+    //查询费用明细
+    List<JkxlDetailFee> list = overheadLineService.getList(id,type);
+    //求和
+    list.addAll(getTotal(list,type));
+    //查询未识别数据
+    List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
+    //数据校验展示
+    List<Settlement> list3 = settlementService.selectSettlementService(id,type);
+    HashMap map = new HashMap();
+    map.put("list1",list1);
+    map.put("list",list);
+    map.put("list2",list2);
+    map.put("list3",list3);
+    model.addAttribute("map",map);
+    return "modules/sg/free/wbslist";
+  }
+
+
   /**
    *金额分摊调整
    */

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -58,6 +58,10 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         return super.findPage(page, wbsProject);
     }
 
+    public List<WbsProject> findByName(String projectName) {
+        return projectMapper.findByName(projectName);
+    }
+
     @Transactional(readOnly = false)
     public void save(WbsProject wbsProject) {
         super.save(wbsProject);

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -94,13 +94,15 @@ public class ProjectTemController extends BaseController {
     public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model)throws Exception {
         String projectName = request.getParameter("projectName");     //项目名称
         String itemName = request.getParameter("itemName");     //项目名称
-        String projectId = request.getParameter("projectId");    //工程ID
         String type = request.getParameter("type");     //工程类型
         String id = getId();
         try {
             WbsProject wbsProject = new WbsProject();
             wbsProject.setProjectName(projectName);
             projectService.save(wbsProject);
+            List<WbsProject> wbsProjects = projectService.findByName(projectName);
+            WbsProject wbsProject1 = wbsProjects.get(0);
+            String projectId = wbsProject1.getId();
 //            保存数据到数据库
             if(type.equals("1")) {
                 overheadLineService.saveJk(file,itemName, id, projectId, type);
@@ -110,10 +112,10 @@ public class ProjectTemController extends BaseController {
             }
         } catch (RuntimeException e) {
             addMessage(redirectAttributes, "导入失败,"+e.getMessage());
-            return "redirect:/a/project/list";
+            return "redirect:/a/project/tem/index";
         }   catch (Exception e){
             addMessage(redirectAttributes, "导入失败");
-            return "redirect:/a/project/list";
+            return "redirect:/a/project/tem/index";
         }
         addMessage(redirectAttributes, "导入成功");
         return "redirect:/a/jkxl/list?id="+id+"&type="+type;
@@ -209,8 +211,9 @@ public class ProjectTemController extends BaseController {
     }
 
     @RequestMapping(value = "tolist")
-    public String toList(){
-        return "redirect:/a/project/list";
+    public String toList(HttpServletRequest request){
+        String projectId = request.getParameter("projectId");
+        return "redirect:/a/project/tem/list?projectId="+projectId;
     }