Merge remote-tracking branch 'origin/master'

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

@@ -68,26 +68,16 @@ public class OverheadLineService {
            double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
            double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
            double azFee = rgFee + cbrFee + jxFee;
-
            if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21") || jkxlDetailFee.getWbsCode().substring(0,3).equals("491")){
                jkxlDetailFee.setJzFee(azFee);
                jkxlDetailFee.setSbgzFee(qtFee);
-           } else {
+           } else if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23") || jkxlDetailFee.getWbsCode().substring(0,3).equals("493") || jkxlDetailFee.getWbsCode().substring(0,2).equals("39")){
                jkxlDetailFee.setQtFee(qtFee);
                jkxlDetailFee.setAzFee(azFee);
            }
        }
+       //变电站导出
        if(type.equals("3")) {
-//           List<JkxlDetailFee> jzlist = new ArrayList<>();
-//           List<JkxlDetailFee> azlist = new ArrayList<>();
-//           for(JkxlDetailFee jkxlDetailFee : list){
-//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21")){
-//                  jzlist.add(jkxlDetailFee);
-//               }
-//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23")){
-//                   azlist.add(jkxlDetailFee);
-//               }
-//           }
            double jz1 = 0.00;
            double az1 = 0.00;
            double jz2 = 0.00;
@@ -95,56 +85,125 @@ public class OverheadLineService {
            double jz3 = 0.00;
            double az3 = 0.00;
            for (JkxlDetailFee jkxlDetailFee : list) {
-//               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
-//                   jz1 = jkxlDetailFee.getTotalFee();
-//                   jz2 = jkxlDetailFee.getAzFee();
-//                   jz3 = jkxlDetailFee.getQtFee();
-//               }
-//               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
-//                   az1 = jkxlDetailFee.getTotalFee();
-//                   az2 = jkxlDetailFee.getAzFee();
-//                   az3 = jkxlDetailFee.getQtFee();
-//               }
-//               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
-//                   qtTotal += jkxlDetailFee.getTotalFee();
-//               }
+               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
+                   jz1 = jkxlDetailFee.getTotalFee();
+                   jz2 = jkxlDetailFee.getJzFee();
+                   jz3 = jkxlDetailFee.getSbgzFee();
+               }
+               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
+                   az1 = jkxlDetailFee.getTotalFee();
+                   az2 = jkxlDetailFee.getAzFee();
+                   az3 = jkxlDetailFee.getQtFee();
+               }
+               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
+                   qtTotal += jkxlDetailFee.getTotalFee();
+               }
            }
-           btTotal = jz1 + az1;
-           azTotal = jz2 + az2;
-           otherTotal = jz3 + az3;
-       } else {
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               if(jkxlDetailFee.getWbsCode().equals("20000000")){
+                   jkxlDetailFee.setJzFee(jz2);
+                   jkxlDetailFee.setAzFee(az2);
+                   jkxlDetailFee.setSbgzFee(jz3);
+                   jkxlDetailFee.setQtFee(az3);
+                   jkxlDetailFee.setTotalFee(jz1+az1);
+                   jkxlDetailFee.setcFee(cFee);
+                   jkxlDetailFee.setJsFee(jz1+az1+cFee);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("24000000")){
+                   jkxlDetailFee.setTotalFee(qtTotal);
+               }
+           }
+       }
+       //电缆导出
+       if(type.equals("2")){
+           double jz1 = 0.00;
+           double az1 = 0.00;
+           double jz2 = 0.00;
+           double az2 = 0.00;
+           double jz3 = 0.00;
+           double az3 = 0.00;
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               String wbs = jkxlDetailFee.getWbsCode().substring(0,3);
+               String wbs1 = jkxlDetailFee.getWbsCode().substring(3,4);
+               if(wbs.equals("491") && !wbs1.equals("0")){
+                   jz1 += jkxlDetailFee.getTotalFee();
+                   jz2 += jkxlDetailFee.getJzFee();
+                   jz3 += jkxlDetailFee.getSbgzFee();
+               }
+               if(wbs.equals("493") && !wbs1.equals("0")){
+                   az1 += jkxlDetailFee.getTotalFee();
+                   az2 += jkxlDetailFee.getAzFee();
+                   az3 += jkxlDetailFee.getQtFee();
+               }
+               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
+                   qtTotal += jkxlDetailFee.getTotalFee();
+               }
+           }
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               if(jkxlDetailFee.getWbsCode().equals("40000000")){
+                   jkxlDetailFee.setJzFee(jz2);
+                   jkxlDetailFee.setAzFee(az2);
+                   jkxlDetailFee.setSbgzFee(jz3);
+                   jkxlDetailFee.setQtFee(az3);
+                   jkxlDetailFee.setTotalFee(jz1+az1);
+                   jkxlDetailFee.setcFee(cFee);
+                   jkxlDetailFee.setJsFee(jz1+az1+cFee);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("49100000")){
+                   jkxlDetailFee.setTotalFee(jz1);
+                   jkxlDetailFee.setJzFee(jz2);
+                   jkxlDetailFee.setSbgzFee(jz3);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("49300000")){
+                   jkxlDetailFee.setTotalFee(az1);
+                   jkxlDetailFee.setAzFee(az2);
+                   jkxlDetailFee.setQtFee(az3);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("49000000")){
+                   jkxlDetailFee.setJzFee(jz2);
+                   jkxlDetailFee.setAzFee(az2);
+                   jkxlDetailFee.setSbgzFee(jz3);
+                   jkxlDetailFee.setQtFee(az3);
+                   jkxlDetailFee.setTotalFee(jz1+az1);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("44000000")){
+                   jkxlDetailFee.setTotalFee(qtTotal);
+               }
+           }
+
+       }
+       //架空导出
+       if(type.equals("1")) {
            for (JkxlDetailFee jkxlDetailFee : list) {
                //本体费用求和
                if (jkxlDetailFee.getOriginalTotalCost() != null) {
                    btTotal += jkxlDetailFee.getTotalFee();
                    azTotal += jkxlDetailFee.getAzFee();
                    otherTotal += jkxlDetailFee.getQtFee();
-
                }
                //其他费用求和
                if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
                    qtTotal += jkxlDetailFee.getTotalFee();
                }
            }
-       }
-       for(JkxlDetailFee jkxlDetailFee : list){
-           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") ||jkxlDetailFee.getWbsCode().equals("20000000")){
-               jkxlDetailFee.setTotalFee(btTotal+qtTotal);
-               jkxlDetailFee.setAzFee(azTotal);
-               jkxlDetailFee.setQtFee(otherTotal);
-               jkxlDetailFee.setcFee(cFee);
-               jkxlDetailFee.setJsFee(btTotal+qtTotal+cFee);
-           }
-           if(jkxlDetailFee.getWbsCode().equals("39000000") || jkxlDetailFee.getWbsCode().equals("49000000")){
-               jkxlDetailFee.setTotalFee(btTotal);
-               jkxlDetailFee.setAzFee(azTotal);
-               jkxlDetailFee.setQtFee(otherTotal);
-           }
-           if(jkxlDetailFee.getWbsCode().equals("44000000") ||jkxlDetailFee.getWbsCode().equals("34000000")){
+           for (JkxlDetailFee jkxlDetailFee : list) {
+               if(jkxlDetailFee.getWbsCode().equals("30000000")){
+                  jkxlDetailFee.setTotalFee(btTotal+qtTotal);
+                  jkxlDetailFee.setAzFee(azTotal);
+                  jkxlDetailFee.setQtFee(otherTotal);
+                  jkxlDetailFee.setcFee(cFee);
+                  jkxlDetailFee.setJsFee(btTotal+qtTotal+cFee);
+               }
+               if(jkxlDetailFee.getWbsCode().equals("39000000")){
+                  jkxlDetailFee.setTotalFee(btTotal);
+                  jkxlDetailFee.setAzFee(azTotal);
+                  jkxlDetailFee.setQtFee(otherTotal);
+               }
+              if(jkxlDetailFee.getWbsCode().equals("34000000")){
                jkxlDetailFee.setTotalFee(qtTotal);
-
-           }
-       }
+               }
+              }
+         }
        for (int i=0;i<list.size();i++){
            list.get(i).setIndex(i+1);
        }
@@ -181,6 +240,7 @@ public class OverheadLineService {
            wbsItem1.setId(id);
            wbsItem1.setItemName(name);
            wbsItem1.setType(type);
+           wbsItem1.setDelFlag("0");
            //保存项目
            itemService.save(wbsItem1);
        }
@@ -334,6 +394,7 @@ public class OverheadLineService {
             wbsItem1.setId(id);
             wbsItem1.setItemName(name);
             wbsItem1.setType(type);
+            wbsItem1.setDelFlag("0");
             //保存项目
             itemService.save(wbsItem1);
         }

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

@@ -10,7 +10,6 @@ public class WbsProject extends DataEntity<WbsProject> {
     private int number;  //项目数量
     private String userName; //创建人
     private String parentNode; //父节点
-    private String delFlag;//是否删除
 
     private List<WbsItem> wbsItems; //项目
 
@@ -69,12 +68,6 @@ public class WbsProject extends DataEntity<WbsProject> {
         this.userName = userName;
     }
 
-    @Override
-    public String getDelFlag() { return delFlag;}
-
-    @Override
-    public void setDelFlag(String delFlag) {this.delFlag = delFlag;}
-
 
     public String getProjectId() {
         return projectId;

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

@@ -31,6 +31,7 @@
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a
 		<where>
+			 a.del_flag = '0'
 			<if test="itemName != null and itemName != ''">
 				AND a.item_name LIKE CONCAT(CONCAT('%',#{itemName},'%'))
 			</if>

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

@@ -62,7 +62,7 @@
 			<if test="projectEndDate != null and projectEndDate != ''">
 				 a.create_date &lt;= #{projectEndDate} AND
 			</if>
-			1 = 1
+			a.del_flag = '0'
 		</where>
 		 ORDER BY a.update_date DESC
 

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

@@ -172,8 +172,12 @@ public class ProjectController extends BaseController {
            }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 jzFee = jkxlDetailFee1.getJzFee()!=null? jkxlDetailFee1.getJzFee():0.00;
+                       double jzFee1 = jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
+                       double sbgzFee = jkxlDetailFee1.getSbgzFee()!=null? jkxlDetailFee1.getSbgzFee():0.00;
+                       double sbgzFee1 = jkxlDetailFee.getSbgzFee()!=null? jkxlDetailFee.getSbgzFee():0.00;
+                       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;
@@ -182,6 +186,8 @@ public class ProjectController extends BaseController {
                        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.setJzFee(jzFee+jzFee1);
+                       jkxlDetailFee1.setSbgzFee(sbgzFee+sbgzFee1);
                        jkxlDetailFee1.setAzFee(azFee+azFee1);
                        jkxlDetailFee1.setQtFee(qtFee+qtFee1);
                        jkxlDetailFee1.setTotalFee(totalFee+totalFee1);

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -60,6 +60,7 @@ public class SubstationService {
             wbsItem1.setId(id);
             wbsItem1.setItemName(name);
             wbsItem1.setType(type);
+            wbsItem1.setDelFlag("0");
             //保存项目
             itemService.save(wbsItem1);
         }