1111

src/main/java/com/jeeplus/modules/sg/project/entity/WbsItem.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.Date;
+import java.util.Objects;
 
 public class WbsItem extends DataEntity<WbsItem> {
     private String id; //项目ID
@@ -112,4 +113,13 @@ public class WbsItem extends DataEntity<WbsItem> {
     public void setProjectNo(String projectNo) {
         this.projectNo = projectNo;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof WbsItem)) return false;
+        WbsItem wbsItem = (WbsItem) o;
+        return Objects.equals(unit, wbsItem.unit);
+    }
+
 }

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

@@ -169,10 +169,16 @@ public class ProjectController extends BaseController {
         WbsProject wbsProject = projectService.get(id);
         String fileName = wbsProject.getProjectNo()+wbsProject.getProjectName()+".xlsx";
         List<WbsItem> wbsItems = wbsProject.getWbsItems();
-        String[] sts = new String[wbsItems.size()+1];
+        List<WbsItem> wbsItems1 = new ArrayList<>();
+        for(WbsItem wbsItem : wbsItems){
+            if(!wbsItems1.contains(wbsItem)){
+                wbsItems1.add(wbsItem);
+            }
+        }
+        String[] sts = new String[wbsItems1.size()+1];
         sts[0] = "合计";
-        for (int i=0;i<wbsItems.size();i++){
-            sts[i+1] = wbsItems.get(i).getUnit();
+        for (int i=0;i<wbsItems1.size();i++){
+            sts[i+1] = wbsItems1.get(i).getUnit();
         }
         List<JkxlDetailFee> list = new ArrayList<>();
         for(WbsItem wbsItem :wbsItems){
@@ -189,6 +195,7 @@ public class ProjectController extends BaseController {
         //写合计
         exportUtil.setDataList(list1,0);
         //分别写入项目
+        int count = 0;
         for(int j=0;j<wbsItems.size();j++){
             String unit = wbsItems.get(j).getUnit();
             if(unit != null) {
@@ -200,8 +207,9 @@ public class ProjectController extends BaseController {
                         jkxlDetailFees.addAll(jkxl);
                     }
                 }
+                count++;
                 List<JkxlDetailFee> list2 = getNewList(jkxlDetailFees);
-                exportUtil.setDataList(list2,j+1);
+                exportUtil.setDataList(list2,count);
             }
 
         }

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

@@ -26,8 +26,8 @@
     <div style="margin-top: 20px">
      <c:forEach items="${map.list1}" var="data1" varStatus="index">
     <div style="margin-left: 30px;float: left;font-size: 15px">
-        <label>当前工程：</label>&nbsp;&nbsp;
-        <label>工程编号：${data1.itemNo}</label>
+        <label>当前工程：${data1.projectName}</label>&nbsp;&nbsp;
+        <label>工程编号：${data1.projectNo}</label>
         <div style="height: 5px"></div>
         <label>当前结算书：${data1.itemName}</label>
         <div style="height: 7px"></div>

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

@@ -63,7 +63,7 @@
         $.ajax({
             type: "post",
             url: "${ctx}/project/save",
-            data:{projectName:div1_value},
+            data:{projectName:div1_value,projectNo:div2_value},
             dataType: "json",
             success: function(data){
                 if(data.success){

src/main/webapp/webpage/modules/sg/project/management.js

@@ -54,7 +54,7 @@ layui.config({
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加结算书</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteProject('"+d.id+"')\">删除</a>"
                                 // +"<br>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">单体工程导出</a>"
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/exportone?id=" + d.id+"\">单体工程导出</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a><div>";
 
                         }

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -66,6 +66,7 @@ function okSubmit() {
         return false;
     }
     formdata.set("projectName",inputval); //添加工程名称到表单中
+    formdata.set("projectNo",dt_number); //添加工程名称到表单中
 
     //获取输入的项目名称
     var div1 =  document.getElementsByClassName("mydiv1");