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/project/mapper/xml/ProjectMapper.xml

@@ -46,18 +46,22 @@
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a   left join sys_user b on a.create_by = b.id
 		<where>
+		    <if test="projectId !=null and projectId != ''">
+				a.id = #{projectId} AND
+			</if>
 			<if test="projectName != null and projectName != ''">
-				AND a.project_name LIKE CONCAT(CONCAT('%',#{projectName},'%'))
+				a.project_name LIKE CONCAT(CONCAT('%',#{projectName},'%')) AND
 			</if>
 			<if test="createBy != null  and createBy != ''">
-				AND b.name LIKE CONCAT(CONCAT('%',#{createBy},'%'))
+				 b.name LIKE CONCAT(CONCAT('%',#{createBy},'%')) AND
 			</if>
 			<if test="projectStartDate != null and projectEndDate != ''">
-				AND a.create_date &gt;= #{projectStartDate}
+				 a.create_date &gt;= #{projectStartDate} AND
 			</if>
 			<if test="projectEndDate != null and projectEndDate != ''">
-				AND a.create_date &lt;= #{projectEndDate}
+				 a.create_date &lt;= #{projectEndDate} AND
 			</if>
+			1 = 1
 		</where>
 		 ORDER BY a.update_date DESC
 

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

@@ -50,42 +50,10 @@ public class ProjectTemController extends BaseController {
     public String list(WbsSelection wbsSelection, HttpServletRequest request, HttpServletResponse response, Model model) {
        List<WbsProject> list =  projectService.findList(wbsSelection);
        model.addAttribute("list",list);
-        return "modules/sg/project/management";
+        return "modules/sg/project/manageList";
     }
 
 
-    @RequestMapping("/form")
-    public String form(WbsProject wbsProject, Model model) {
-        WbsProject wbsProject1 = projectService.get(wbsProject.getId());
-        List<WbsProject> list = new ArrayList<>();
-        list.add(wbsProject1);
-        model.addAttribute("list", list);
-        String view = "updateItemForm";
-        String tabId = request.getParameter("tabId");
-        if("1".equals(tabId)){
-            view = "lookItemForm";
-        }
-        return "modules/sg/project/"+view;
-    }
-
-    //项目保存
-    @ResponseBody
-    @RequestMapping("/save")
-    public AjaxJson save(WbsProject wbsProject, Model model, RedirectAttributes redirectAttributes){
-        AjaxJson j = new AjaxJson();
-        //数据验证
-        String errMsg = beanValidator(wbsProject);
-        if (StringUtils.isNotBlank(errMsg)){
-            j.setSuccess(false);
-            j.setMsg(errMsg);
-            return j;
-        }
-        //新增或编辑表单保存
-        projectService.save(wbsProject);//保存
-        j.setSuccess(true);
-        addMessage(redirectAttributes, "保存成功");
-        return j;
-    }
 
     /**
      *数据导入
@@ -96,13 +64,13 @@ public class ProjectTemController extends BaseController {
         String itemName = request.getParameter("itemName");     //项目名称
         String type = request.getParameter("type");     //工程类型
         String id = getId();
+        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();
         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);
@@ -118,98 +86,15 @@ public class ProjectTemController extends BaseController {
             return "redirect:/a/project/tem/index";
         }
         addMessage(redirectAttributes, "导入成功");
-        return "redirect:/a/jkxl/list?id="+id+"&type="+type;
-    }
-
-    //导出
-    @RequestMapping("/export")
-    public String toList(HttpServletRequest request,Model model,HttpServletResponse response) throws IOException {
-        String id = request.getParameter("id");
-        WbsProject wbsProject = projectService.get(id);
-        String fileName = wbsProject.getProjectName()+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-        List<WbsItem> wbsItems = wbsProject.getWbsItems();
-        String[] sts = new String[wbsItems.size()+1];
-        sts[0] = "合计";
-        for (int i=0;i<wbsItems.size();i++){
-            sts[i+1] = wbsItems.get(i).getItemName();
-        }
-        List<JkxlDetailFee> list = new ArrayList<>();
-        for(WbsItem wbsItem :wbsItems){
-            List<JkxlDetailFee> jkxlDetailFees = overheadLineService.findList(wbsItem.getId(),wbsItem.getType());
-            list.addAll(jkxlDetailFees);
-        }
-        //集合去重合并
-        List<JkxlDetailFee> list1 = getNewList(list);
-        //加序号
-        for (int i=0;i<list1.size();i++){
-            list1.get(i).setIndex(i+1);
-        }
-        ExportUtil exportUtil = new ExportUtil(null, JkxlDetailFee.class,sts);
-        //写合计
-        exportUtil.setDataList(list1,0);
-        //分别写入项目
-        for(int j=0;j<wbsItems.size();j++){
-            List<JkxlDetailFee> jkxlDetailFees = overheadLineService.findList(wbsItems.get(j).getId(),wbsItems.get(j).getType());
-            exportUtil.setDataList(jkxlDetailFees,j+1);
-        }
-        exportUtil.write(response,fileName).dispose();
-        return "redirect:/a/project/list";
+        return "redirect:/a/jkxl/temlist?id="+id+"&type="+type+"&projectId="+projectId;
     }
 
 
     /**
-     * 数据去重合并
-     * @param list
+     * 返回
+     * @param request
      * @return
      */
-    private List<JkxlDetailFee> getNewList(List<JkxlDetailFee> list) {
-       List<JkxlDetailFee> list1 = new ArrayList<>();
-       for(JkxlDetailFee jkxlDetailFee: list){
-           String wbsCode = jkxlDetailFee.getWbsCode();
-           if(!list1.contains(jkxlDetailFee)){
-               list1.add(jkxlDetailFee);
-           }else {
-               for(JkxlDetailFee jkxlDetailFee1 : list1){
-                   if(jkxlDetailFee1.getWbsCode().equals(wbsCode)){
-                      double azFee = jkxlDetailFee1.getAzFee()!=null? jkxlDetailFee1.getAzFee():0.00;
-                      double azFee1 = jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
-                       double qtFee = jkxlDetailFee1.getQtFee()!=null? jkxlDetailFee1.getQtFee():0.00;
-                       double qtFee1 = jkxlDetailFee.getQtFee()!=null? jkxlDetailFee.getQtFee():0.00;
-                       double totalFee = jkxlDetailFee1.getTotalFee()!=null? jkxlDetailFee1.getTotalFee():0.00;
-                       double totalFee1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
-                       double jsFee = jkxlDetailFee1.getJsFee()!=null? jkxlDetailFee1.getJsFee():0.00;
-                       double jsFee1 = jkxlDetailFee.getJsFee()!=null? jkxlDetailFee.getJsFee():0.00;
-                       double cFee = jkxlDetailFee1.getcFee()!=null? jkxlDetailFee1.getcFee():0.00;
-                       double cFee1 = jkxlDetailFee.getcFee()!=null? jkxlDetailFee.getcFee():0.00;
-                       jkxlDetailFee1.setAzFee(azFee+azFee1);
-                       jkxlDetailFee1.setQtFee(qtFee+qtFee1);
-                       jkxlDetailFee1.setTotalFee(totalFee+totalFee1);
-                       jkxlDetailFee1.setJsFee(jsFee+jsFee1);
-                       jkxlDetailFee1.setcFee(cFee+cFee1);
-                   }
-               }
-           }
-       }
-       //按照wbs码排序
-        Collections.sort(list1, new Comparator<JkxlDetailFee>() {
-            @Override
-            public int compare(JkxlDetailFee o1, JkxlDetailFee o2) {
-                return o1.getWbsCode().compareTo(o2.getWbsCode());
-            }
-        });
-        return list1;
-    }
-
-    //项目删除
-    @ResponseBody
-    @RequestMapping(value = "delete")
-    public AjaxJson delete(WbsProject wbsProject) {
-        AjaxJson j = new AjaxJson();
-        projectService.delete(wbsProject);
-        j.setMsg("删除项目成功");
-        return j;
-    }
-
     @RequestMapping(value = "tolist")
     public String toList(HttpServletRequest request){
         String projectId = request.getParameter("projectId");

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

@@ -38,7 +38,16 @@
 <body style="background-color: white ;height: 100%">
     <sys:message content="${message}"/>
     <div style="margin-right: 20px">
-        <a class="layui-btn" href="${ctx}/project/tolist">返回</a>
+<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>
+    </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>
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
         <legend>结算汇总表</legend>

src/main/webapp/webpage/modules/sg/project/addItem2Form.jsp

@@ -26,7 +26,7 @@
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md12">
             <div class="layui-card">
-                <form id="inputForm"class="layui-form" action="${ctx}/project/import" method="post" enctype="multipart/form-data">
+                <form id="inputForm"class="layui-form" action="${ctx}/project/tem/import" method="post" enctype="multipart/form-data">
                     <div class="layui-card-body" style="margin-top: 2px;">
                         <%--<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">--%>
                             <%--<legend style="font-size: 15px;">选择工程</legend>--%>
@@ -35,7 +35,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">*工程名称</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="" lay-verify="title" class="layui-input">
+                                    <input type="text" name="projectName" lay-verify="title" class="layui-input">
                                 </div>
                             </div>
                         </div>
@@ -43,7 +43,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">*项目名称</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" name="name"  class="layui-input" id="inputwrite">
+                                        <input type="text" name="itemName"  class="layui-input" id="inputwrite">
                                     </div>
                                 </div>
                             </div>

src/main/webapp/webpage/modules/sg/project/manageList.jsp

@@ -58,7 +58,9 @@
                         <div class="layui-btn-group">
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-meself" onclick="addProject()"><i class="layui-icon"></i>新建</button>
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-meself"  onclick="refresh()"><img class="layui-meself-img1" src="${ctxp}/icon/refush.png" alt="">&nbsp;刷新</button>
-                            <button type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="#"><img class="layui-meself-img1" src="${ctxp}/icon/daochu2.png" alt="">&nbsp;导出</button>
+                            <c:forEach items="${list}" var="data1" varStatus="index">
+                            <a type="button" class="layui-btn layui-btn-warm  layui-btn-meself" href="${ctx}/project/export?id=${data1.id}"><img class="layui-meself-img1" src="${ctxp}/icon/daochu2.png" alt="">&nbsp;导出</a>
+                            </c:forEach>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
                     </div>
@@ -97,35 +99,32 @@
                             ////对操作进行初始化
                             var xml = "";
                             if(d.status==1){
-                                <%--xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"--%>
-                                    <%--+"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"--%>
-                                    <%--+"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>";--%>
-                                xml += "<a class='layui-btn layui-btn-primary layui-btn-xs'>查看</a>"
-                                    +"<a class='layui-btn layui-btn-xs'>修改</a>"
+                                xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
+                                    +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                     +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>";
                             }
                             if(d.status==2){
                                 xml +="<span class='myspan'>操作</span>";
                             }
                             if(d.status==3){
-                                <%--xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>";--%>
-                                xml +="<a class='layui-btn layui-btn-xs'>编辑</a>";
+                                xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>";
                             }
 
                             return xml;
                         }}
                 ]],
                 "data": [
+                    <c:if test="${ not empty list}">
+                    <c:forEach items="${list}" var="data" varStatus="index">
                     {
-                        "id": "1",
-                        "gcmc":"某线路工程",
-                        "xmsl": "3",
-                        "cjsq": "2018/8/14",
-                        "djr":"home",
+                        "id": "${data.id}",
+                        "gcmc":"${data.projectName}",
+                        "xmsl": "${data.number}",
+                        "cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",
+                        "djr":"${data.userName}",
                         "status":"1",
                         "pid": -1
                     },
-
                     {
                         "id": "2",
                         "gcmc":"项目名称",
@@ -133,110 +132,25 @@
                         "cjsq": "项目划分",
                         "djr":"创建时间",
                         "status":"2",
-                        "pid": 1
-                    },
-
-                    {
-                        "id": "7",
-                        "gcmc":"项目名称",
-                        "xmsl": "施工单位",
-                        "cjsq": "项目类型",
-                        "djr":"创建时间",
-                        "status":"2",
-                        "pid": 6
-                    },
-                    {
-                        "id": "3",
-                        "gcmc":"某项目",
-                        "xmsl": "某施工单位一",
-                        "cjsq": "架空线路",
-                        "djr":"2018/8/14",
-                        "status":"3",
-                        "pid": 2
-                    },
-                    {
-                        "id": "4",
-                        "gcmc":"某项目",
-                        "xmsl": "某施工单位一",
-                        "cjsq": "架空线路",
-                        "djr":"2018/8/14",
-                        "status":"3",
-                        "pid": 2
-                    },
-                    {
-                        "id": "5",
-                        "gcmc":"某项目",
-                        "xmsl": "某施工单位一",
-                        "cjsq": "架空线路",
-                        "djr":"2018/8/14",
-                        "status":"3",
-                        "pid": 2
-                    },
-                    {
-                        "id": "6",
-                        "gcmc":"某线路工程二",
-                        "xmsl": "1",
-                        "cjsq": "2018/8/15",
-                        "djr":"home1",
-                        "status":"1",
-                        "pid": -1
-                    },
-
-                    {
-                        "id": "8",
-                        "gcmc":"某项目",
-                        "xmsl": "某施工单位一",
-                        "cjsq": "架空线路",
-                        "djr":"2018/8/14",
-                        "status":"3",
-                        "pid": 7
+                        "pid": "${data.id}"
                     },
+                    </c:forEach>
+                    </c:if>
+                    <c:forEach items="${list}" var="item" varStatus="index">
+                      <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
                     {
-                        "id": "9",
-                        "gcmc":"某项目",
+                        "id": "${items.id}",
+                        "type":"${items.type}",
+                        "gcmc":"${items.itemName}",
                         "xmsl": "某施工单位一",
-                        "cjsq": "架空线路",
-                        "djr":"2018/8/14",
+                        <%--"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
+                        "cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,
+                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
                         "status":"3",
-                        "pid": 7
+                        "pid": "${items.projectId}"
                     },
-                    <%--<c:if test="${ not empty list}">--%>
-                    <%--<c:forEach items="${list}" var="data" varStatus="index">--%>
-                    <%--{--%>
-                        <%--"id": "${data.id}",--%>
-                        <%--"gcmc":"${data.projectName}",--%>
-                        <%--"xmsl": "${data.number}",--%>
-                        <%--"cjsq": "<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd"/>",--%>
-                        <%--"djr":"${data.userName}",--%>
-                        <%--"status":"1",--%>
-                        <%--"pid": -1--%>
-                    <%--},--%>
-                    <%--{--%>
-                        <%--"id": "2",--%>
-                        <%--"gcmc":"项目名称",--%>
-                        <%--"xmsl": "施工单位",--%>
-                        <%--"cjsq": "项目划分",--%>
-                        <%--"djr":"创建时间",--%>
-                        <%--"status":"2",--%>
-                        <%--"pid": "${data.id}"--%>
-                    <%--},--%>
-                    <%--</c:forEach>--%>
-                    <%--</c:if>--%>
-                    <%--<c:forEach items="${list}" var="item" varStatus="index">--%>
-                      <%--<c:forEach items="${item.wbsItems}" var="items" varStatus="index">--%>
-                    <%--{--%>
-                        <%--"id": "${items.id}",--%>
-                        <%--"type":"${items.type}",--%>
-                        <%--"gcmc":"${items.itemName}",--%>
-                        <%--"xmsl": "某施工单位一",--%>
-                        <%--&lt;%&ndash;"cjsq": <c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,&ndash;%&gt;--%>
-                        <%--"cjsq":<c:if test="${items.type eq '1'}">"架空线路"</c:if><c:if test="${items.type eq '2'}">"电缆线路"</c:if>,--%>
-                        <%--"djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",--%>
-                        <%--"status":"3",--%>
-                        <%--"pid": "${items.projectId}"--%>
-                    <%--},--%>
-                    <%--</c:forEach>--%>
-                    <%--</c:forEach>--%>
+                    </c:forEach>
+                    </c:forEach>
                 ],
 
                 done: function () {
@@ -292,10 +206,10 @@
     function refresh(){
         window.location.reload();
     }
-    function addProject(){
+    function addProject(target){
         layer.open({
             type: 2,
-            title: '添加工程',
+            title: '添加项目',
             area: ['43%', '90%'],
             shade: 0.8,
             shadeClose: true,