注释

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

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

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

@@ -1,5 +1,8 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
+/**
+ * 分摊费用
+ */
 public class FtData {
     private String id;   //项目ID
     private String code;   //分摊费用类型

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

@@ -1,5 +1,8 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
+/**
+ * 未识别费用
+ */
 public class JkxlAdjustFee {
     private String id;  //项目ID
     private String type;  //未识别费用名称

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

@@ -4,6 +4,9 @@ import com.jeeplus.common.utils.excel.annotation.ExcelField;
 
 import java.util.Objects;
 
+/**
+ * 项目数据明细
+ */
 public class JkxlDetailFee {
     private String id;  //项目ID
     private String wbsCode;  //WBS识别码

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

@@ -2,6 +2,9 @@ package com.jeeplus.modules.sg.overheadline.entity;
 
 import java.text.NumberFormat;
 
+/**
+ * 数据核验
+ */
 public class Settlement {
     private String id;//ID结算书id
     private String entryName;//费用名称

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

@@ -1,5 +1,8 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
+/**
+ * 节点信息
+ */
 public class WbsElements {
     private String id;  //wbs id
     private String shortId;  //简明id

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

@@ -2,6 +2,9 @@ package com.jeeplus.modules.sg.overheadline.entity;
 
 import java.util.Date;
 
+/**
+ * 工程信息
+ */
 public class WbsProject {
     private String id;    //项目ID
     private String name;    //项目名称

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/FeeAdjustMapper.java

@@ -7,8 +7,15 @@ import java.util.List;
 
 @MyBatisMapper
 public interface FeeAdjustMapper {
+    //获取调整数据
     List<JkxlAdjustFee> getTzFee(JkxlAdjustFee jkxlAdjustFee);
+
+    //更新调整数据
     void updateTzFee(JkxlAdjustFee jkxlAdjustFee);
+
+    //保存调整数据
     void saveTzFee(JkxlAdjustFee jkxlAdjustFee);
+
+    //删除调整数据
     void delete(String id);
 }

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/OverheadLineMapper.java

@@ -9,15 +9,31 @@ import java.util.List;
 
 @MyBatisMapper
 public interface OverheadLineMapper {
+    //获取项目明细
     List<JkxlDetailFee> getList(@Param("id") String id,@Param("type") String type);
+
+    //获取单条明细
     JkxlDetailFee getData(@Param("id")String id, @Param("wbsCode")String wbsCode);
+
+    //保存
     void save(JkxlDetailFee jkxlDetailFee);
+
+    //批量保存
     void saveList(@Param("list") List<JkxlDetailFee> list);
-    void saveProject(WbsProject project);
+
+    //获取项目明细
     List<JkxlDetailFee> findList(@Param("id") String id,@Param("type")String type);
+
+    //获取调整数据
     List<JkxlDetailFee> getAdjust(String id);
+
+    //更新项目明细
     void updateDate(JkxlDetailFee jkxlDetailFee);
+
+    //批量更新项目明细
     void updateList(@Param("list") List<JkxlDetailFee> list);
+
+    //根据ID删除项目明细
     void delete(String id);
 
 }

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

@@ -14,23 +14,33 @@ public class FeeAdjustService {
     private FeeAdjustMapper feeAdjustMapper;
 
 
-
+    /**
+     *查询
+     */
    public List<JkxlAdjustFee> getTzFee(JkxlAdjustFee jkxlAdjustFee){
        return feeAdjustMapper.getTzFee(jkxlAdjustFee);
    }
 
+    /**
+     *更新
+     */
     @Transactional
    public void   updateFee(JkxlAdjustFee jkxlAdjustFee){
        jkxlAdjustFee.setFee(0.00);
         feeAdjustMapper.updateTzFee(jkxlAdjustFee);
    }
 
-
+    /**
+     *保存
+     */
     @Transactional
     public void save(JkxlAdjustFee jkxlAdjustFee){
        feeAdjustMapper.saveTzFee(jkxlAdjustFee);
     }
 
+    /**
+     *删除
+     */
     @Transactional
     public void delete(String id){
        feeAdjustMapper.delete(id);

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

@@ -44,7 +44,7 @@ public class OverheadLineService {
 
 public List<JkxlDetailFee> findList(String id,String type){
     List<JkxlDetailFee> list = overheadLineMapper.findList(id,type);
-    double integrityFee = 0.00;
+    double integrityFee = 0.00; //诚信扣款
     WbsItem wbsItem = itemService.getState(id);
     if(wbsItem != null){
         integrityFee = wbsItem.getIntegrityFee() * -1;
@@ -59,6 +59,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23") || jkxlDetailFee.getWbsCode().substring(0,3).equals("493") || jkxlDetailFee.getWbsCode().substring(0,2).equals("39")){
             jkxlDetailFee.setAzFee(totalFee);
         }
+        //其他费用
         if(jkxlDetailFee.getTotalFee() != null && jkxlDetailFee.getFeeType().equals("0")){
             double qtFee = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
             jkxlDetailFee.setQtFee(qtFee);
@@ -73,36 +74,43 @@ public List<JkxlDetailFee> findList(String id,String type){
     //变电站导出
     if(type.equals(BashInfo.PROJECT_BDZ)) {
         for (JkxlDetailFee jkxlDetailFee : list) {
+            //建筑费和
             if (jkxlDetailFee.getWbsCode().equals("21000000")) {
                 jz1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
                 jz2 = jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
             }
+            //安装费和
             if (jkxlDetailFee.getWbsCode().equals("23000000")) {
                 az1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
                 az2 = jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
             }
+            //其他费用和
             if (jkxlDetailFee.getFeeType().equals("0")&& jkxlDetailFee.getTotalFee() != null) {
                 qtTotal += jkxlDetailFee.getTotalFee();
             }
         }
         qtTotal = qtTotal + integrityFee;
         for (JkxlDetailFee jkxlDetailFee : list) {
+            //WBS首层数据
             if(jkxlDetailFee.getWbsCode().equals("20000000")){
                 jkxlDetailFee.setJzFee(jz2);
                 jkxlDetailFee.setAzFee(az2);
                 jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS变电站合计
             if(jkxlDetailFee.getWbsCode().equals("10000000")){
                 jkxlDetailFee.setJzFee(jz2);
                 jkxlDetailFee.setAzFee(az2);
                 jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS变电站其他费用合计
             if(jkxlDetailFee.getWbsCode().equals("24000000")){
                 jkxlDetailFee.setTotalFee(qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS变电站工程结算审核费（诚信扣款）
             if(jkxlDetailFee.getWbsCode().equals("24260000")){
                 jkxlDetailFee.setTotalFee(integrityFee);
                 jkxlDetailFee.setQtFee(integrityFee);
@@ -114,50 +122,61 @@ public List<JkxlDetailFee> findList(String id,String type){
         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()!=null? jkxlDetailFee.getTotalFee():0.00;
                 jz2 += jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
             }
+            //安装和
             if(wbs.equals("493") && !wbs1.equals("0")){
                 az1 += jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
                 az2 += jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
             }
+            //其他费用和
             if (jkxlDetailFee.getFeeType().equals("0")&& jkxlDetailFee.getTotalFee() != null) {
                 qtTotal += jkxlDetailFee.getTotalFee();
             }
         }
+        //诚信扣款
         qtTotal = qtTotal + integrityFee;
         for (JkxlDetailFee jkxlDetailFee : list) {
+            //WBS电缆和
             if(jkxlDetailFee.getWbsCode().equals("40000000")){
                 jkxlDetailFee.setJzFee(jz2);
                 jkxlDetailFee.setAzFee(az2);
                 jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS首层
             if(jkxlDetailFee.getWbsCode().equals("10000000")){
                 jkxlDetailFee.setJzFee(jz2);
                 jkxlDetailFee.setAzFee(az2);
                 jkxlDetailFee.setTotalFee(jz1+az1+qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS电缆建筑
             if(jkxlDetailFee.getWbsCode().equals("49100000")){
                 jkxlDetailFee.setTotalFee(jz1);
                 jkxlDetailFee.setJzFee(jz2);
             }
+            //WBS电缆安装
             if(jkxlDetailFee.getWbsCode().equals("49300000")){
                 jkxlDetailFee.setTotalFee(az1);
                 jkxlDetailFee.setAzFee(az2);
 
             }
+            //WBS电缆本体工程
             if(jkxlDetailFee.getWbsCode().equals("49000000")){
                 jkxlDetailFee.setJzFee(jz2);
                 jkxlDetailFee.setAzFee(az2);
                 jkxlDetailFee.setTotalFee(jz1+az1);
             }
+            //WBS电缆其他费用
             if(jkxlDetailFee.getWbsCode().equals("44000000")){
                 jkxlDetailFee.setTotalFee(qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //诚信扣款
             if(jkxlDetailFee.getWbsCode().equals("44260000")){
                 jkxlDetailFee.setTotalFee(integrityFee);
                 jkxlDetailFee.setQtFee(integrityFee);
@@ -179,24 +198,29 @@ public List<JkxlDetailFee> findList(String id,String type){
         }
         qtTotal = qtTotal + integrityFee;
         for (JkxlDetailFee jkxlDetailFee : list) {
+            //WBS架空合计
             if(jkxlDetailFee.getWbsCode().equals("30000000")){
                 jkxlDetailFee.setTotalFee(az1+qtTotal);
                 jkxlDetailFee.setAzFee(az1);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS首层
             if(jkxlDetailFee.getWbsCode().equals("10000000")){
                 jkxlDetailFee.setTotalFee(az1+qtTotal);
                 jkxlDetailFee.setAzFee(az1);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS架空本体工程
             if(jkxlDetailFee.getWbsCode().equals("39000000")){
                 jkxlDetailFee.setTotalFee(az1);
                 jkxlDetailFee.setAzFee(az1);
             }
+            //WBS架空其他费用
             if(jkxlDetailFee.getWbsCode().equals("34000000")){
                 jkxlDetailFee.setTotalFee(qtTotal);
                 jkxlDetailFee.setQtFee(qtTotal);
             }
+            //WBS架空诚信扣款
             if(jkxlDetailFee.getWbsCode().equals("34260000")){
                 jkxlDetailFee.setTotalFee(integrityFee);
                 jkxlDetailFee.setQtFee(integrityFee);

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

@@ -31,9 +31,7 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-/**
- * 架空线路
- */
+
 @Controller
 @RequestMapping(value = "${adminPath}/jkxl")
 public class OverheadLineController extends BaseController {
@@ -49,7 +47,9 @@ public class OverheadLineController extends BaseController {
   private ProjectService projectService;
 
 
-
+  /**
+   *数据展示
+   */
   @RequestMapping("/list")
   public String list(HttpServletRequest request,Model model){
     String id = request.getParameter("id");
@@ -74,6 +74,7 @@ public class OverheadLineController extends BaseController {
     List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
     //数据校验展示
     List<Settlement> list3 = settlementService.selectSettlementService(id,type);
+    //差额计算
     List<Settlement> list4 = disposeData(list,list3,list2);
     HashMap map = new HashMap();
     map.put("list1",list1);
@@ -594,9 +595,11 @@ public class OverheadLineController extends BaseController {
         double tzFee = Double.valueOf(ddtzData.getFee());
         String wbsCode = ddtzData.getWbsCode();
         double totalFee = overheadLineService.getDate(id,wbsCode).getTotalFee();
+        //增加
         if(state.equals("1")){
           totalFee = totalFee+tzFee;
         }
+        //减少
         if(state.equals("2")){
           totalFee = totalFee-tzFee;
         }
@@ -604,6 +607,7 @@ public class OverheadLineController extends BaseController {
         jkxlDetailFee.setId(id);
         jkxlDetailFee.setWbsCode(wbsCode);
         jkxlDetailFee.setTotalFee(totalFee);
+        //更新明细表费用
         overheadLineService.updataDate(jkxlDetailFee);
       }
       //更新未识别费用表
@@ -639,6 +643,7 @@ public class OverheadLineController extends BaseController {
         String wbsCode = ddtzData.getWbsCode();
         JkxlDetailFee jkxlDetailFee1 = overheadLineService.getDate(id,wbsCode);
         List<JkxlDetailFee> list1 = new ArrayList<>();
+        //递归获取需要更新的数据存入集合
         JkxlDetailFee jkxlDetailFee2 = getParent(jkxlDetailFee1,list,list1);
         list1.add(jkxlDetailFee1);
         for(JkxlDetailFee jkxlDetailFee3 : list1) {
@@ -656,6 +661,7 @@ public class OverheadLineController extends BaseController {
 //          jkxlDetailFee.setId(id);
 //          jkxlDetailFee.setWbsCode(wbsCode);
           jkxlDetailFee3.setTotalFee(totalFee);
+          //更新明细表费用
           overheadLineService.updataDate(jkxlDetailFee3);
         }
 
@@ -673,6 +679,7 @@ public class OverheadLineController extends BaseController {
     return "redirect:/a/jkxl/list?id="+id+"&type="+itemType;
   }
 
+  //递归获取节点
   private JkxlDetailFee getParent(JkxlDetailFee jkxlDetailFee,List<JkxlDetailFee> list,List<JkxlDetailFee> list1){
     if(jkxlDetailFee.getParentNode().equals("-1")){
       return jkxlDetailFee;
@@ -696,10 +703,10 @@ public class OverheadLineController extends BaseController {
    *导出
    */
   @RequestMapping("/export")
-  public String export(HttpServletRequest request, HttpServletResponse response,Model model,RedirectAttributes redirectAttributes) throws IOException {
+  public String export(HttpServletRequest request, HttpServletResponse response,Model model,RedirectAttributes redirectAttributes) {
     String id = request.getParameter("id");
     String type = request.getParameter("type");
-//    try{
+    try{
       WbsItem wbsItem = itemService.get(id);
       String file = wbsItem.getItemName();
       String fileName = file+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
@@ -709,10 +716,10 @@ public class OverheadLineController extends BaseController {
       }
       //导出
       new ExportExcel(null, JkxlDetailFee.class).setDataList(list).write(response, fileName).dispose();
-//      return null;
-//    }catch (Exception e){
-//      addMessage(redirectAttributes, "导出失败");
-//    }
+      return null;
+    }catch (Exception e){
+      addMessage(redirectAttributes, "导出失败");
+    }
      addMessage(redirectAttributes, "导出成功");
     return "redirect:/a/jkxl/list?id="+id+"&type="+type;
   }
@@ -743,6 +750,7 @@ public class OverheadLineController extends BaseController {
     if(type.equals(BashInfo.PROJECT_BDZ)){
       double[][] zFees = new double[14][2];
        for(JkxlDetailFee jkxlDetailFee : list){
+         //建筑部分求和
           if(jkxlDetailFee.getWbsCode().equals("21000000")){
             zFees[0][0] = jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
             zFees[1][0] = jkxlDetailFee.getZjgcFee()!=null? jkxlDetailFee.getZjgcFee():0.00;
@@ -760,6 +768,7 @@ public class OverheadLineController extends BaseController {
             zFees[12][0] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
             zFees[13][0] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
           }
+          //安装部分求和
          if(jkxlDetailFee.getWbsCode().equals("23000000")){
            zFees[0][1] = jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
            zFees[1][1] = jkxlDetailFee.getZjgcFee()!=null? jkxlDetailFee.getZjgcFee():0.00;
@@ -778,6 +787,7 @@ public class OverheadLineController extends BaseController {
            zFees[13][1] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
          }
        }
+       //合并建筑和安装部分
       JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
       jkxlDetailFee.setOriginalTotalCost(new BigDecimal(zFees[0][0]+zFees[0][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       jkxlDetailFee.setZjgcFee(new BigDecimal(zFees[1][0]+zFees[1][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
@@ -812,11 +822,13 @@ public class OverheadLineController extends BaseController {
       return list3;
 
     }
+    //架空线路和电缆求和
     double total1 = 0.00;
     for (JkxlDetailFee jkxlDetailFee :list2){
       total1 += jkxlDetailFee.getTotalFee();
     }
     double [] zFee = new double[14];
+    //各项费用求和
     for(JkxlDetailFee jkxlDetailFee :list1){
       zFee[0] += jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
       zFee[1] += jkxlDetailFee.getZjgcFee()!=null? jkxlDetailFee.getZjgcFee():0.00;
@@ -875,6 +887,7 @@ public class OverheadLineController extends BaseController {
 
   }
 
+  //数据核验，各项差额计算
   private List<Settlement> disposeData(List<JkxlDetailFee> list, List<Settlement> list3,List<JkxlAdjustFee> list2) {
     double originalTotal  = 0.00;
     double otherCost =0.00;
@@ -886,6 +899,7 @@ public class OverheadLineController extends BaseController {
     double originalCbrCost = 0.00;
     double ce1 = 0.00;
     double qt = 0.00;
+    //总计算差额
     for(JkxlAdjustFee jkxlAdjustFee : list2){
       if(jkxlAdjustFee.getType().equals(BashInfo.CE)){
         ce1 = jkxlAdjustFee.getFee();
@@ -907,36 +921,43 @@ public class OverheadLineController extends BaseController {
       }
     }
     for(Settlement settlement : list3){
+      //分部分项工程费差额
       if(settlement.getEntryName().contains(BashInfo.JS_FBFX)){
         double ce = Math.abs(settlement.getMoney() - originalTotal);
         settlement.setTotalFee(originalTotal);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //发包人材料采购费
       if(settlement.getEntryName().contains("发包人") || settlement.getEntryName().contains("招标人")){
         double ce = Math.abs(settlement.getMoney() - originalFbrCost);
         settlement.setTotalFee(originalFbrCost);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //措施费差额
       if(settlement.getEntryName().contains(BashInfo.JS_CSXM)){
         double ce = Math.abs(settlement.getMoney() - measuresFee);
         settlement.setTotalFee(measuresFee);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //规费差额
       if(settlement.getEntryName().contains(BashInfo.JS_GF)){
         double ce = Math.abs(settlement.getMoney() - fees);
         settlement.setTotalFee(fees);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //税金差额
       if(settlement.getEntryName().contains(BashInfo.JS_SJ)){
         double ce = Math.abs(settlement.getMoney() - tex);
         settlement.setTotalFee(tex);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //其他费用差额
       if(settlement.getEntryName().contains(BashInfo.JS_QTXM)){
         double ce = Math.abs(settlement.getMoney() - otherCost-qt);
         settlement.setTotalFee(otherCost+qt);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+      //结算差额
       if(settlement.getEntryName().contains("结算") || settlement.getEntryName().contains("报价") || settlement.getEntryName().contains("下浮后") || settlement.getEntryName().contains("最高")){
         settlement.setTotalFee(totalFee);
         settlement.setDifference(new BigDecimal(ce1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());

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

@@ -6,6 +6,9 @@ import com.jeeplus.core.persistence.DataEntity;
 import java.util.Date;
 import java.util.Objects;
 
+/**
+ * 项目信息
+ */
 public class WbsItem extends DataEntity<WbsItem> {
     private String id; //项目ID
     private String unit; //施工单位

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

@@ -5,6 +5,9 @@ import com.jeeplus.core.persistence.DataEntity;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 工程信息
+ */
 public class WbsProject extends DataEntity<WbsProject> {
     private String projectName;//工程名称
     private String projectNo; //工程编号

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

@@ -2,6 +2,9 @@ package com.jeeplus.modules.sg.project.entity;
 
 import java.util.Date;
 
+/**
+ * 工程项目查询条件
+ */
 public class WbsSelection {
     private String projectId;      //工程ID
     private String projectName;    //工程名称

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

@@ -12,48 +12,42 @@ import java.util.List;
 
 @MyBatisMapper
 public interface ItemMapper extends BaseMapper<WbsItem> {
+    //获取项目信息
     List<WbsItem> getList(WbsProject wbsProject);
+
+    //保存项目信息
     int insert(WbsItem wbsItem);
 
     //根据名称获取项目
     List<WbsItem> findItemByName(@Param("itemName")String itemName,@Param("projectId") String projectId);
 
+    //批量更新项目信息
     void updateList(@Param("list") List<WbsItem> list);
 
     //删除项目
     Integer updateItem(WbsItem wbsItem);
 
-    /**
-     * 根据工程id删除
-     * @param parentId 工程id
-     * @return
-     */
+    //根据工程id删除
     Integer deleteItem(String parentId);
 
-    /**
-     * 根据项目id删除结算
-     */
+    //根据项目id删除结算
     Integer deleteCount(String itemId);
 
-    /**
-     * 根据项目id删除 其他项目
-     */
+     //根据项目id删除 其他项目
     Integer deleteAdjust(String itemId);
 
-    /**
-     * 根据项目id删除 差额
-     */
+    //根据项目id删除 差额
     Integer deleteDetail(String itemId);
 
     //查找工程下所有项目
     List<WbsItem> findItem(String parentId);
 
-    /**
-     * 根据id查找当前所有项目
-     */
+    //根据id查找当前所有项目
     WbsItem findItemById(String id);
 
+    //更新诚信扣款
     void updateFee(@Param("list") List<WbsItem> list);
 
+    //获取诚信扣款状态
     WbsItem getState(String id);
 }

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

@@ -15,9 +15,13 @@ import java.util.List;
 
 @MyBatisMapper
 public interface ProjectMapper extends BaseMapper<WbsProject> {
+    //获取工程信息
     List<WbsProject> getList(WbsSelection wbsSelection);
+
+    //更新工程信息
     void updateNum(@Param("number") int number,@Param("id") String id);
-//    int update(WbsProject wbsProject);
+
+    //根据工程名获取工程
     List<WbsProject> findByName(String projectName);
 
     //工程删除

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

@@ -28,6 +28,9 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
         return super.get(id);
     }
 
+    /**
+     *获取诚信扣款状态
+     */
     public WbsItem getState(String id){
         return itemMapper.getState(id);
     }
@@ -46,6 +49,7 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     public void save(WbsItem wbsItem) {
         String projectId = wbsItem.getProjectId();
         WbsProject wbsProject = projectService.get(projectId);
+        //项目数递增
         int num = wbsProject.getNumber()+1;
         projectService.updateNum(num,projectId);
         wbsItem.setCreateDate(new Date());
@@ -91,6 +95,10 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
         return j;
     }
 
+    /**
+     * 诚信扣款
+     * @param list
+     */
     @Transactional(readOnly = false)
     public void updateFee(List<WbsItem> list){
 //        List<WbsItem> newlist = list.stream().collect(Collectors.collectingAndThen(Collectors.
@@ -99,7 +107,11 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
        itemMapper.updateFee(list1);
     }
 
-
+    /**
+     * 更新扣款状态
+     * @param list
+     * @return
+     */
     private List<WbsItem> getNew(List<WbsItem> list){
         for(int i=0;i<list.size();i++){
             String unitType = list.get(i).getUnitType();

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

@@ -217,15 +217,13 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     //分页查询
     public Page<WbsProject> findPage(Page<WbsProject> page, WbsProject wbsProject) {
+        //数据权限过滤
         dataRuleFilter(wbsProject);
         wbsProject.setPage(page);
-//        User user = UserUtils.getUser();
-//        if(!user.getId().equals("1")){
-//            wbsProject.setCreateBy(user);
-//        }
         List<WbsProject> list =  projectMapper.findList(wbsProject);
         long count = page.getCount();
         Integer pageNo = page.getPageNo();
+        //根据工程ID查询项目信息
         for(WbsProject wbsProject1 : list){
             String id = wbsProject1.getId();
             wbsProject.setProjectId(id);
@@ -300,6 +298,7 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         return projectMapper.findProjectById(id);
     }
 
+    //删除工程
     @Transactional(readOnly = false)
     public AjaxJson deleteProject(WbsProject wbsProject){
         AjaxJson j = new AjaxJson();

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

@@ -50,7 +50,9 @@ public class ProjectController extends BaseController {
     private ItemService itemService;
 
 
-
+    /**
+     * 工程项目数据
+     */
     @RequestMapping(value = {"list", ""})
     public String list(WbsProject wbsProject, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<WbsProject> page = projectService.findPage(new Page<WbsProject>(request, response), wbsProject);
@@ -58,7 +60,9 @@ public class ProjectController extends BaseController {
         return "modules/sg/project/management";
     }
 
-
+    /**
+     *编辑查看页面
+     */
     @RequestMapping("/form")
     public String form(WbsProject wbsProject, Model model) {
         WbsProject wbsProject1 = projectService.get(wbsProject.getId());
@@ -92,6 +96,13 @@ public class ProjectController extends BaseController {
         return j;
     }
 
+    /**
+     * 工程项目信息修改
+     * @param wbsProject  工程信息
+     * @param ids  项目ID
+     * @param units 项目供应商
+     * @return
+     */
     @ResponseBody
     @RequestMapping("/update")
     public Map update(WbsProject wbsProject,String ids,String units){
@@ -236,6 +247,7 @@ public class ProjectController extends BaseController {
             }
 
         }
+        //写入EXCAL
         exportUtil.write(response,fileName).dispose();
         return "redirect:/a/project/list";
     }
@@ -255,9 +267,12 @@ public class ProjectController extends BaseController {
     }
 
 
-
     /**
      * 诚信扣款
+     * @param ids  项目ID
+     * @param fees  项目费用
+     * @param unitTypes  单位工程
+     * @return
      */
     @ResponseBody
     @RequestMapping("withhold")
@@ -272,6 +287,7 @@ public class ProjectController extends BaseController {
             for(int i=0;i<idss.length;i++){
                 wbsItem = new WbsItem();
                 wbsItem.setId(idss[i]);
+                //是否扣款 （1：扣 0：不扣）
                 wbsItem.setState("1");
                 String unitType = unitTypess[i];
                 if(unitType.equals("null")){
@@ -372,7 +388,7 @@ public class ProjectController extends BaseController {
     }
 
     /**
-     * 删除
+     * 删除工程
      */
     @RequestMapping("/deleteProject")
     @ResponseBody

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

@@ -43,7 +43,9 @@ public class ProjectTemController extends BaseController {
     private SubstationService substationService;
 
 
-
+    /**
+     *首页跳转
+     */
     @RequestMapping("/index")
     public String toIndex(){
         return "modules/sg/projecttem/addItem2Form";
@@ -66,13 +68,18 @@ public class ProjectTemController extends BaseController {
     }
 
 
-
     /**
-     *文件多个导入
+     * 多文件导入
+     * @param file 文件数组
+     * @param projectName 单体工程名称
+     * @param projectNo  单体工程编号
+     * @param itemNames 结算书名称
+     * @param units  供应商
+     * @return
      */
     @ResponseBody
     @RequestMapping("/import")
-    public HashMap importFile(@RequestParam(value = "file")MultipartFile[] file,String projectName,String projectNo,String[] itemNames,String[] units,String[] itemNo) throws IOException, InvalidFormatException {
+    public HashMap importFile(@RequestParam(value = "file")MultipartFile[] file,String projectName,String projectNo,String[] itemNames,String[] units) {
         HashMap map = new HashMap();
         WbsProject wbsProject = new WbsProject();
         wbsProject.setProjectName(projectName);
@@ -91,9 +98,10 @@ public class ProjectTemController extends BaseController {
                      wbsItem.setUnit(units[i]);
                     }
                 }
-//            保存数据到数据库
+                //获取唯一ID
                 String id = getId();
                 wbsItem.setId(id);
+                //分析保存
                 String str = projectService.save(file[i],wbsItem);
                 if(str.equals(BashInfo.INVALIDFORMAT)){
                     throw new RuntimeException(str);
@@ -113,7 +121,13 @@ public class ProjectTemController extends BaseController {
 
 
     /**
-     *文件导入
+     * 单个文件导入
+     * @param file  文件
+     * @param wbsItem 项目信息
+     * @param redirectAttributes
+     * @param request
+     * @param model
+     * @return
      */
     @RequestMapping("/importfile")
     public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {

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

@@ -37,7 +37,11 @@ public class SubstationService {
     private ItemService itemService;
 
 
-
+    /**
+     * 变电站工程分析保存
+     * @param file   项目文件
+     * @param wbsItem 项目信息
+     */
    @Transactional(readOnly = false)
     public void save(MultipartFile file,WbsItem wbsItem) throws IOException, InvalidFormatException {
         String id = wbsItem.getId();

src/main/java/com/jeeplus/modules/sg/substation/util/SubstationInfo.java

@@ -548,7 +548,7 @@ public class SubstationInfo {
 
 
     /**
-     *
+     * 获取基础数据
      */
     public static List<JkxlDetailFee> getBashInfo(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
         double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
@@ -971,7 +971,7 @@ public class SubstationInfo {
 
 
     /**
-     * 控制直流
+     * 控制直流基础数据
      */
     public static List<JkxlDetailFee> getKzzl(ImportExcel importExcel,ImportExcel importExcel1){
         String[] str = KZZLSTR;
@@ -1036,7 +1036,7 @@ public class SubstationInfo {
     }
 
     /**
-     * 电缆及接地
+     * 电缆及接地基础数据
      */
     public static List<JkxlDetailFee> getDljd(ImportExcel importExcel,ImportExcel importExcel1){
         List<JkxlDetailFee> list = new ArrayList<>();
@@ -1240,7 +1240,7 @@ public class SubstationInfo {
        return d;
     }
 
-
+   //与站址有关的单项工程基础数据
     public static List<JkxlDetailFee> getDxInfo(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
         int startRow = 0;
         int lastRow = importExcel.getLastDataRowNum();