20191355

src/main/java/com/jeeplus/modules/sg/entity/JkxlData.java

@@ -22,7 +22,7 @@ public class JkxlData {
     private Double measuresFee3;
     private Double otherCost;
     private Double fees;
-    private Double tax;
+    private Double tex;
     private Double totalFee;
 
     private String wbsId;
@@ -31,7 +31,25 @@ public class JkxlData {
     private String parentNode;
     private String mountMatter;
     private String mountServer;
+    private String subjectAllocate;
+    private String state;
 
+    @ExcelField(title="科目分配元素", align=2, sort=5)
+    public String getSubjectAllocate() {
+        return subjectAllocate;
+    }
+
+    public void setSubjectAllocate(String subjectAllocate) {
+        this.subjectAllocate = subjectAllocate;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 
     public Double getMeasuresFee3() {
         return measuresFee3;
@@ -102,7 +120,7 @@ public class JkxlData {
         this.wbsCode = wbsCode;
     }
 
-    @ExcelField(title="科目分配元素", align=2, sort=5)
+    @ExcelField(title="总计", align=2, sort=8)
     public Double getTotalFee() {
         return totalFee;
     }
@@ -247,11 +265,11 @@ public class JkxlData {
         this.fees = fees;
     }
 
-    public Double getTax() {
-        return tax;
+    public Double getTex() {
+        return tex;
     }
 
-    public void setTax(Double tax) {
-        this.tax = tax;
+    public void setTex(Double tex) {
+        this.tex = tex;
     }
 }

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -13,6 +13,7 @@
          a.describe,
          a.short_id as wbsCode,
          a.parent_node as parentNode,
+         a.state,
          b.id,
          b.original_total_cost as originalTotalCost,
          b.original_rg_cost as originalRgCost,
@@ -29,9 +30,8 @@
          b.tex as tex,
          b.fees as fees,
          b.total_fee as totalFee
-         FROM sg_wbs_elements a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
-         WHERE b.id = #{id}
-         order by a.short_id
+         FROM sg_wbs_elements_data a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
+         and b.id = #{id}
 	</select>
 
 
@@ -41,11 +41,13 @@
          a.project_id as projectId,
          a.describe,
          a.short_id as wbsCode,
+         a.subject_allocate as subjectAllocate,
          a.mount_matter as mountMatter,
          a.mount_server as mountServer,
          b.total_fee as totalFee
          FROM sg_wbs_elements a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
-         WHERE a.id = #{id}
+         and b.id = #{id}
+         order by short_id
 	</select>
 
 
@@ -84,7 +86,7 @@
 		 #{measuresFee2},
 		 #{otherCost},
 		 #{fees},
-		 #{tax},
+		 #{tex},
 		 #{totalFee}
 		)
 	</insert>

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -20,10 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * 架空线路
@@ -66,22 +63,30 @@ public class JkxlController extends BaseController {
   @RequestMapping("/list")
   public String list(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
+    JkxlData jkxlData = new JkxlData();
+    jkxlData.setId(id);
+    List<JkxlData> list1 = new ArrayList<>();
+    list1.add(jkxlData);
     List<JkxlData> list = jkxlService.getList(id);
-    model.addAttribute("list",list);
+    HashMap map = new HashMap();
+    map.put("list1",list1);
+    map.put("list",list);
+    model.addAttribute("map",map);
     return "modules/sg/free/wbslist";
   }
 
   @RequestMapping("/export")
-  public String export(HttpServletRequest request, HttpServletResponse response,Model model,RedirectAttributes redirectAttributes){
+  public String export(HttpServletRequest request, HttpServletResponse response,Model model,RedirectAttributes redirectAttributes) {
     String id = request.getParameter("id");
     try{
       String fileName = "架空线路"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
       List<JkxlData> list = jkxlService.findList(id);
-      new ExportExcel(null,JkxlData.class).setDataList(list).dispose().write(response, fileName).dispose();
+      new ExportExcel(null,JkxlData.class).setDataList(list).write(response, fileName).dispose();
+      return null;
     }catch (Exception e){
       addMessage(redirectAttributes, "导出失败");
     }
-    return "redirect:/a/jkxl/index";
+    return "redirect:/a/jkxl/list?id="+id;
   }
 
 
@@ -161,7 +166,7 @@ public class JkxlController extends BaseController {
       jkxlData.setMeasuresFee2(measuresFee2);
       jkxlData.setFees(fees);
       jkxlData.setOtherCost(otherFee);
-      jkxlData.setTax(tax);
+      jkxlData.setTex(tax);
       jkxlData.setTotalFee(totalfee);
       jkxlData.setWbsCode(BashInfo.ids[i]);
       jkxlData.setId(id);

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

@@ -27,7 +27,11 @@
         <legend>本体部分</legend>
     </fieldset>
     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
-        <button type="button" class="layui-btn layui-btn-fluid btn_out">导出</button>
+        <%--<button type="button" class="layui-btn layui-btn-fluid btn_out" onclick="export()">导出</button>--%>
+       <c:forEach items="${map.list1}" var="data1" varStatus="index">
+         <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导入</a>
+       </c:forEach>
+            <%--<table:importExcel url="${ctx}/propertycostreminder/propertyCostReminder/import"></table:importExcel>--%>
         <table id="table1" class="layui-table" lay-filter="table1"></table>
     </div>
     <!-----------其他部分--------->
@@ -105,8 +109,9 @@
 
                 ]]
                 ,data: [
-                <c:if test="${ not empty list}">
-                <c:forEach items="${list}" var="data" varStatus="index">
+                <c:if test="${ not empty map.list}">
+                <c:forEach items="${map.list}" var="data" varStatus="index">
+                    <c:if test="${data.state eq '1'}">
                 {
                     "id": "${data.wbsCode}",
                     "wbsys":"${data.describe}",
@@ -125,30 +130,11 @@
                     "csf2": "${data.measuresFee3}",
                     "qtf":"${data.otherCost}",
                     "gf":"${data.fees}",
-                    "sf":"${data.tax}",
+                    "sf":"${data.tex}",
                     "hj": "${data.totalFee}",
                     "pid": "${data.parentNode}"
-                    // "id": 1,
-                    // "wbsys":"WBS要素1",
-                    // "wbssbm": "WBS识别码",
-                    // "hjje": "合计金额",
-                    // "rgf": "人工费1",
-                    // "cbrcg": "承包人采购",
-                    // "fbrcg": "发包人采购",
-                    // "jxf1": "机械费1",
-                    // "rgf2": "人工费2",
-                    // "cbrcg2": "承包人采购2",
-                    // "fbrcg2":"承包人采购2",
-                    // "jxf2": "机械费2",
-                    // "csf_1": "措施费-1",
-                    // "csf_2": "措施费-2",
-                    // "csf2": "措施费2",
-                    // "qtf":"其他费",
-                    // "gf":"规费",
-                    // "sf":"税金",
-                    // "hj": "合计",
-                    // "pid": -1
                 },
+                    </c:if>
                 </c:forEach>
                 </c:if>
             ],
@@ -189,27 +175,20 @@
 //                  {field: 'pid', title: 'pid'},
                 ]]
                 ,data: [
-                <%--<c:if test="${ not empty page.list}">--%>
-                <%--<c:forEach items="${page.list}" var="data" varStatus="index">--%>
-                <%--<c:if test="${index.index != 0}">,</c:if>--%>
+                <c:if test="${ not empty map.list}">
+                <c:forEach items="${map.list}" var="data" varStatus="index">
+                <c:if test="${data.state eq '0'}">
                 {
-                    "d_id": 1,
-                    "wbsys": "wbs要素",
-                    "wbssbm": "wbs识别码",
-                    "money": "888888",
-                    "d_pid": -1
+                    "d_id": "${data.wbsCode}",
+                    "wbsys": "${data.describe}",
+                    "wbssbm": "${data.wbsCode}",
+                    "money": "${data.totalFee}",
+                    "d_pid": "${data.parentNode}"
 
                 },
-                    {
-                        "d_id": 2,
-                        "wbsys": "wbs要素",
-                        "wbssbm": "wbs识别码",
-                        "money": "888888",
-                        "d_pid": 1
-
-                    },
-                <%--</c:forEach>--%>
-                <%--</c:if>--%>
+                    </c:if>
+                </c:forEach>
+                </c:if>
             ],
                 done: function () {
                     layer.closeAll('loading');