Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java

@@ -338,6 +338,7 @@ public class ExportExcel {
 		headerFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
 		headerFont.setColor(IndexedColors.BLACK.getIndex());
 		style.setFont(headerFont);
+		style.setFillForegroundColor(HSSFColor.WHITE.index);
 		styles.put("header", style);
 		return styles;
 	}

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

@@ -166,6 +166,7 @@ public class OverheadLineService {
        settlementService.save(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,cbperson,id);
       //获取补增值税税率调整差额和扣减甲供材超供材料费
        double[] wsbFees = ExcelUtil.getDoubleArray(total, new String[]{BashInfo.BZZSSL,BashInfo.KJJGCC},1,2);
+       double csFee = ExcelUtil.getDouble(gzhz,BashInfo.HZ_CH,1,2);
        double[] originalTotalFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,2); //获取合计费
        double[] zjgcFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,3);  //获取直接工程费
        double[][] originalFees = ExcelUtil.getDoubleArrays(importExcel,BashInfo.MX_ALL,2, new int[]{13, 14, 15, 17}); //获取原始费用
@@ -287,6 +288,13 @@ public class OverheadLineService {
        jkxlAdjustFee2.setType(BashInfo.CE);
        jkxlAdjustFee2.setFee(gxFee);
        feeAdjustService.save(jkxlAdjustFee2);
+       if(csFee!= 0.00){
+           JkxlAdjustFee jkxlAdjustFee3 = new JkxlAdjustFee();
+           jkxlAdjustFee3.setId(id);
+           jkxlAdjustFee3.setType(BashInfo.HZ_CH);
+           jkxlAdjustFee3.setFee(csFee);
+           feeAdjustService.save(jkxlAdjustFee3);
+       }
    }
 
 

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

@@ -52,6 +52,8 @@ public class BashInfo {
     public static final String HZ_JXGC = "架线工程";
     public static final String HZ_FJAZGC = "附件安装工程";
     public static final String HZ_FZ = "辅助工程";
+    public static final String HZ_CH = "措施项目";
+
 
     public static final String TZ_RGF = "人工费";
     public static final String TZ_CBRCG = "承包分采购";

src/main/java/com/jeeplus/modules/sg/project/util/ExportUtil.java

@@ -9,6 +9,7 @@ import com.jeeplus.common.utils.Reflections;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -416,6 +417,7 @@ public class ExportUtil {
 		headerFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
 		headerFont.setColor(IndexedColors.BLACK.getIndex());
 		style.setFont(headerFont);
+		style.setFillForegroundColor(HSSFColor.WHITE.index);
 		styles.put("header", style);
 		return styles;
 	}

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

@@ -172,4 +172,9 @@ public class ProjectController extends BaseController {
         return j;
     }
 
+    @RequestMapping(value = "tolist")
+    public String toList(){
+        return "redirect:/a/project/list";
+    }
+
 }

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

@@ -50,7 +50,7 @@
     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
        <c:forEach items="${map.list1}" var="data1" varStatus="index">
          <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导出</a>
-           <%--<a class="layui-btn" href="${ctx}/jkxl/import?id=${data1.id}">导入</a>--%>
+           <a class="layui-btn" href="${ctx}/project/tolist">返回</a>
        </c:forEach>
             <%--<table:importExcel url="${ctx}/propertycostreminder/propertyCostReminder/import"></table:importExcel>--%>
         <table id="table1" class="layui-table" lay-filter="table1"></table>

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

@@ -194,7 +194,7 @@
                 treeLinkage: false,
                 elem: '#table1',
                 cols: [[
-                    {field: 'gcmc',width:300,title: '工程名称',width:200},
+                    {field: 'gcmc',width:200,title: '工程名称'},
                     {field:'xmsl',width:180,title:"项目数量"},
                     {field:'cjsq',width:200,title: '创建时期'},
                     {field:'djr',width:200,title:'登记人'},