1111

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

@@ -90,6 +90,12 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(jz1+az1);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            if(jkxlDetailFee.getWbsCode().equals("10000000")){
+                jkxlDetailFee.setJzFee(jz2);
+                jkxlDetailFee.setAzFee(az2);
+                jkxlDetailFee.setTotalFee(jz1+az1);
+                jkxlDetailFee.setQtFee(qtTotal);
+            }
             if(jkxlDetailFee.getWbsCode().equals("24000000")){
                 jkxlDetailFee.setTotalFee(qtTotal);
             }
@@ -119,6 +125,12 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(jz1+az1);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            if(jkxlDetailFee.getWbsCode().equals("10000000")){
+                jkxlDetailFee.setJzFee(jz2);
+                jkxlDetailFee.setAzFee(az2);
+                jkxlDetailFee.setTotalFee(jz1+az1);
+                jkxlDetailFee.setQtFee(qtTotal);
+            }
             if(jkxlDetailFee.getWbsCode().equals("49100000")){
                 jkxlDetailFee.setTotalFee(jz1);
                 jkxlDetailFee.setJzFee(jz2);
@@ -157,6 +169,11 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setAzFee(az1);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            if(jkxlDetailFee.getWbsCode().equals("10000000")){
+                jkxlDetailFee.setTotalFee(az1);
+                jkxlDetailFee.setAzFee(az1);
+                jkxlDetailFee.setQtFee(qtTotal);
+            }
             if(jkxlDetailFee.getWbsCode().equals("39000000")){
                 jkxlDetailFee.setTotalFee(az1);
                 jkxlDetailFee.setAzFee(az1);
@@ -166,9 +183,9 @@ public List<JkxlDetailFee> findList(String id,String type){
             }
         }
     }
-    for (int i=0;i<list.size();i++){
-        list.get(i).setIndex(i+1);
-    }
+//    for (int i=0;i<list.size();i++){
+//        list.get(i).setIndex(i+1);
+//    }
     return list;
 
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -41,6 +41,7 @@
 		</where>
 		order by a.create_date DESC
 	</select>
+
 	
 	<select id="findList" resultType="WbsProject">
 		SELECT

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

@@ -154,6 +154,9 @@ public class ProjectController extends BaseController {
         //分别写入项目
         for(int j=0;j<wbsItems.size();j++){
             List<JkxlDetailFee> jkxlDetailFees = overheadLineService.findList(wbsItems.get(j).getId(),wbsItems.get(j).getType());
+            for (int i=0;i<jkxlDetailFees.size();i++){
+                jkxlDetailFees.get(i).setIndex(i+1);
+            }
             exportUtil.setDataList(jkxlDetailFees,j+1);
         }
         exportUtil.write(response,fileName).dispose();
@@ -209,6 +212,9 @@ public class ProjectController extends BaseController {
                 }
                 count++;
                 List<JkxlDetailFee> list2 = getNewList(jkxlDetailFees);
+                for (int i=0;i<list2.size();i++){
+                    list2.get(i).setIndex(i+1);
+                }
                 exportUtil.setDataList(list2,count);
             }