代码注释更改

src/main/java/com/jeeplus/modules/sg/overheadline/entity/DdtzData.java

@@ -1,7 +1,7 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
 public class DdtzData {
-    private String id;  //ID
+    private String id;  //项目ID
     private String wbsCode;  //WBS码
     private String fee;  //费用
     private String wbsys;  //调整费用类型

src/main/java/com/jeeplus/modules/sg/overheadline/entity/FtData.java

@@ -2,10 +2,10 @@ package com.jeeplus.modules.sg.overheadline.entity;
 
 public class FtData {
     private String id;   //项目ID
-    private String code;   //分摊费用名称
+    private String code;   //分摊费用类型
     private String state;  //调整类型  1：增加  2：减少
     private Double fee;   //调整费用
-    private String type;  //分摊类型
+    private String type;  //分摊费用名称
     private String itemType;  //项目类型
     private String tableData; //表格数据
 

src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java

@@ -3,12 +3,12 @@ package com.jeeplus.modules.sg.overheadline.entity;
 import java.text.NumberFormat;
 
 public class Settlement {
-    private String id;//ID
-    private String entryName;//项目或费用名称
+    private String id;//ID结算书id
+    private String entryName;//费用名称
     private Double money;//金额
     private String remarks;//备注
-    private String status;//数据核对 0-核对一致 1-核对不一致
-    private String theAmount;//比对金额:json
+    private String status;//数据核对 0-核对一致 1-核对不一致 2-不核对
+    private String theAmount;//比对金额
     private String reason;//原因
     private String del_Flag;
     private Double totalFee;

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

@@ -336,7 +336,6 @@ public List<JkxlDetailFee> findList(String id,String type){
                 tax = (originalTotalCost + measuresFee1 + measuresFee2 + measuresFee3 + fees + otherFee) * texRate; //税金
                 totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
            }
-            //合计
            jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
            jkxlDetailFee.setOriginalRate(orRate);
            jkxlDetailFee.setOriginalRgCost(originalRgCost);

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -265,7 +265,7 @@ public class SettementUtil {
      * @param settlements 工程竣工结算list集合
      * @param builtTotal 获取架空线路工程费用汇总表 分部分项 合计
      * @param divisiontotal 获取分部分项比对数据清单
-     * @param wordtotal1 //获取措施费清单计价表1
+     * @param wordtotal1 //获取措施费清单计价表1 合计
      * @param wordtotal2 //获取措施费清单计价表2
      * @param otherTotal 获取其他项目费合计
      * @param feescount 获取规费合计
@@ -501,7 +501,7 @@ public class SettementUtil {
         return settlements;
     }
     /**
-     * 架空、电缆、变电站 竣工结算/工程投标 合计计算
+     * 架空、电缆、变电站 竣工结算 合计金额
      * @param settlements 《工程项目投标报价汇总表》/《工程项目结算汇总表》 集合
      */
     public static Double getJgjsComparison(List<Settlement> settlements){

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -134,7 +134,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getZjgcFee();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -173,7 +173,7 @@ public class OverheadLineController extends BaseController {
               double rgFee = jkxlDetailFee1.getOriginalRgCost();
               double totalFee = jkxlDetailFee1.getTotalFee();
               if(total==0.00){
-                rate = size/1;
+                rate = 1/size;
               } else {
                 rate = rgFee/total;
               }
@@ -212,7 +212,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getOriginalCbrCost();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -251,7 +251,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getOriginalFbrCost();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -290,7 +290,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getOriginalJxCost();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -329,7 +329,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getMeasuresFee1();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -368,7 +368,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getMeasuresFee2();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -407,7 +407,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getMeasuresFee3();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -446,7 +446,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getOtherCost();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -485,7 +485,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getFees();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }
@@ -524,7 +524,7 @@ public class OverheadLineController extends BaseController {
             double rgFee = jkxlDetailFee1.getTex();
             double totalFee = jkxlDetailFee1.getTotalFee();
             if(total==0.00){
-              rate = size/1;
+              rate = 1/size;
             } else {
               rate = rgFee/total;
             }

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -55,6 +55,7 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         if(ImportExcel.getSheet(jk) != null){
             wbsItem.setType("1");
             overheadLineService.saveJk(file,wbsItem);
+            //修改
             return "1";
         }
         ImportExcel dljz = new ImportExcel(file, 1, BashInfo.SHEET_JZHZB,false);   //电缆线路建筑工程费用汇总表

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

@@ -199,6 +199,7 @@ public class ProjectController extends BaseController {
         String fileName = wbsProject.getProjectNo()+wbsProject.getProjectName()+".xlsx";
         List<WbsItem> wbsItems = wbsProject.getWbsItems();
         List<WbsItem> wbsItems1 = new ArrayList<>();
+        //过滤相同供应商名称
         for(WbsItem wbsItem : wbsItems){
             if(!wbsItems1.contains(wbsItem)){
                 wbsItems1.add(wbsItem);
@@ -223,7 +224,7 @@ public class ProjectController extends BaseController {
         ExportUtil exportUtil = new ExportUtil(null, JkxlDetailFee.class,sts);
         //写合计
         exportUtil.setDataList(list1,0);
-        //分别写入项目
+        //合并相同的供应商
         int count = 0;
         for(int j=0;j<wbsItems.size();j++){
             String unit = wbsItems.get(j).getUnit();