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

@@ -45,77 +45,19 @@ public class OverheadLineController extends BaseController {
   private ItemService itemService;
 
 
-  /**
-   * 首页跳转
-   */
-  @RequestMapping("/index")
-  public String toImport(){
-    return "modules/sg/free/indexProject";
-  }
-
-  /**
-   *数据导入
-   */
-//  @RequestMapping("/import")
-//  public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {
-//    String projectName = request.getParameter("name");     //项目名称
-//    String projectId = request.getParameter("projectId");    //工程ID
-//    String type = request.getParameter("type");     //工程类型
-//    String id = getId();
-//    try {
-//      //保存数据到数据库
-//      overheadLineService.saveJk(file,projectName,id,projectId,type);
-//    } catch (RuntimeException e) {
-//      addMessage(redirectAttributes, "导入失败,"+e.getMessage());
-//      return "redirect:/a/project/list";
-//    }   catch (Exception e){
-//      addMessage(redirectAttributes, "导入失败");
-//      return "redirect:/a/project/list";
-//    }
-//    addMessage(redirectAttributes, "导入成功");
-//    return "redirect:/a/jkxl/list?id="+id;
-//  }
-
 
   @RequestMapping("/list")
   public String list(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
     String type = request.getParameter("type");
-    WbsItem wbsItem = new WbsItem();
-    JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
-    wbsItem.setId(id);
-    wbsItem.setType(type);
-    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";
-  }
-
-
-  @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);
+    if(projectId != null) {
+      wbsItem.setProjectId(projectId);
+    }
     jkxlAdjustFee.setId(id);
     List<WbsItem> list1 = new ArrayList<>();
     list1.add(wbsItem);
@@ -137,6 +79,7 @@ public class OverheadLineController extends BaseController {
   }
 
 
+
   /**
    *金额分摊调整
    */

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

@@ -40,19 +40,6 @@ public class ProjectController extends BaseController {
     private OverheadLineService overheadLineService;
 
 
-//    @ModelAttribute
-//    public WbsProject get(@RequestParam(required=false) String id) {
-//        WbsProject entity = null;
-//        if (StringUtils.isNotBlank(id)){
-//            entity = projectService.get(id);
-//        }
-//        if (entity == null){
-//            entity = new WbsProject();
-//        }
-//        return entity;
-//    }
-
-
     @RequestMapping(value = {"list", ""})
     public String list(WbsSelection wbsSelection, HttpServletRequest request, HttpServletResponse response, Model model) {
        List<WbsProject> list =  projectService.findList(wbsSelection);

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

@@ -21,7 +21,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -59,7 +58,7 @@ public class ProjectTemController extends BaseController {
      *数据导入
      */
     @RequestMapping("/import")
-    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model)throws Exception {
+    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {
         String projectName = request.getParameter("projectName");     //项目名称
         String itemName = request.getParameter("itemName");     //项目名称
         String type = request.getParameter("type");     //工程类型
@@ -86,7 +85,7 @@ public class ProjectTemController extends BaseController {
             return "redirect:/a/project/tem/index";
         }
         addMessage(redirectAttributes, "导入成功");
-        return "redirect:/a/jkxl/temlist?id="+id+"&type="+type+"&projectId="+projectId;
+        return "redirect:/a/project/tem/list?projectId="+projectId;
     }
 
 

src/main/webapp/webpage/modules/sg/free/alongst.jsp

@@ -76,41 +76,6 @@
                 },
              </c:forEach>
                 </c:if>
-                // {
-                //     "id":"2",
-                //     "wbsys": "杆塔工程",
-                //     "wbsCode": "39200000",
-                //     "bl":'',
-                //     "fee":''
-                // },
-                // {
-                //     "id":"3",
-                //     "wbsys": "接地工程",
-                //     "wbsCode": "39300000",
-                //     "bl":'',
-                //     "fee":''
-                // },
-                // {
-                //     "id":"4",
-                //     "wbsys": "架线工程",
-                //     "wbsCode": "39400000",
-                //     "bl":'',
-                //     "fee":''
-                // },
-                // {
-                //     "id":"5",
-                //     "wbsys": "附件安装工程",
-                //     "wbsCode": "39500000",
-                //     "bl":'',
-                //     "fee":''
-                // },
-                // {
-                //     "id":"6",
-                //     "wbsys": "辅助工程",
-                //     "wbsCode": "39600000",
-                //     "bl":'',
-                //     "fee":''
-                // }
             ]
             ,page: false
         });

src/main/webapp/webpage/modules/sg/free/avgpage.jsp

@@ -105,6 +105,14 @@
 
     function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             $("#inputForm").submit();
+        <%--$.ajax({--%>
+            <%--type:"post",--%>
+            <%--url:"${ctx}/jkxl/fttz",--%>
+            <%--data:$("#inputForm").serialize(),--%>
+            <%--success:function(result){--%>
+                <%--// parent.location.reload();--%>
+            <%--}--%>
+        <%--});--%>
     }
 </script>
 </html>

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -40,12 +40,10 @@
     <div style="margin-right: 20px">
 <c:forEach items="${map.list1}" var="data1" varStatus="index">
     <c:if test="${ empty data1.projectId}">
-        <%--<a class="layui-btn" href="${ctx}/project/tolist">返回</a>--%>
-        <a class="layui-btn" href="javascript:history.go(-1)">返回</a>
+        <a class="layui-btn" href="${ctx}/project/tolist">返回</a>
     </c:if>
     <c:if test="${ not empty data1.projectId}">
         <a class="layui-btn" href="${ctx}/project/tem/tolist?projectId=${data1.projectId}">返回</a>
-        <%--<a class="layui-btn" href="javascript:history.go(-1)">返回</a>--%>
     </c:if>
 </c:forEach>
     </div>