111

src/main/java/com/jeeplus/modules/sg/financial/settlement/entity/MaintainData.java

@@ -8,6 +8,11 @@ import java.util.Date;
 
 public class MaintainData extends DataEntity<MaintainData> {
     private String projectId;     //项目定义号
+    private String designUnits;    //设计单位
+    private String constructionUnits;    //施工单位
+    private String address;    //建筑地址
+    private String property;    //建筑属性
+    private String investment;    //发文总投资
     private Date startDate;      //开工时间
     private Date endDate;        //竣工时间
     private String approvalNumber;     //审批文号
@@ -51,6 +56,46 @@ public class MaintainData extends DataEntity<MaintainData> {
         this.projectId = projectId;
     }
 
+    public String getDesignUnits() {
+        return designUnits;
+    }
+
+    public void setDesignUnits(String designUnits) {
+        this.designUnits = designUnits;
+    }
+
+    public String getConstructionUnits() {
+        return constructionUnits;
+    }
+
+    public void setConstructionUnits(String constructionUnits) {
+        this.constructionUnits = constructionUnits;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public String getInvestment() {
+        return investment;
+    }
+
+    public void setInvestment(String investment) {
+        this.investment = investment;
+    }
+
     @ExcelField(title="开工时间", align=2, sort=2)
     @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartDate() {

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -10,6 +10,11 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.project_id AS "projectId",
+		a.design_units AS "designUnits",
+		a.construction_units AS "constructionUnits",
+		a.address,
+		a.property,
+		a.investment,
 		a.start_date AS "startDate",
 		a.end_date AS "endDate",
 		a.approval_number AS "approvalNumber",
@@ -85,6 +90,11 @@
 			remarks,
 			del_flag,
 			project_id,
+			design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -107,6 +117,11 @@
 			#{remarks},
 			#{delFlag},
 			#{projectId},
+			#{designUnits},
+			#{constructionUnits},
+			#{address},
+			#{property},
+			#{investment},
 			#{startDate},
 			#{endDate},
 			#{approvalNumber},
@@ -125,7 +140,6 @@
 
     <insert id="insertList">
         replace INTO js_maintain_data(
-
 			create_by,
 			create_date,
 			update_by,
@@ -133,6 +147,11 @@
 			remarks,
 			del_flag,
 			project_id,
+		    design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -157,6 +176,11 @@
 			#{item.remarks},
 			#{item.delFlag},
 			#{item.projectId},
+			#{item.designUnits},
+			#{item.constructionUnits},
+			#{item.address},
+			#{item.property},
+			#{item.investment},
 			#{item.startDate},
 			#{item.endDate},
 			#{item.approvalNumber},
@@ -178,9 +202,12 @@
 		UPDATE js_maintain_data SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks},
+			design_units = #{designUnits},
+			construction_units = #{constructionUnits},
+			address = #{address},
+			property = #{property},
+			investment = #{investment},
 			start_date = #{startDate},
-
 			end_date = #{endDate},
 			approval_number = #{approvalNumber},
 			building_fee = #{buildingFee},

src/main/java/com/jeeplus/modules/sg/financial/settlement/util/ExcelWriter.java

@@ -1,6 +1,7 @@
 package com.jeeplus.modules.sg.financial.settlement.util;
 
 
+import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
@@ -60,12 +61,17 @@ public class ExcelWriter {
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 1, 1));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 2, 2));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 3, 3));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 4, 13));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 4, 4));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 5, 5));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 6, 6));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 7, 7));
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 8, 13));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 4, 4));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 5, 5));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 6, 6));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 7, 7));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 8, 8));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 18));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 9, 9));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 10, 10));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 11, 11));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 12, 12));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 13, 18));
         // 构建头单元格样式
         styles = createStyles(sheet.getWorkbook());
         CellStyle cellStyle = buildHeadCellStyle(sheet.getWorkbook());
@@ -79,13 +85,28 @@ public class ExcelWriter {
         Cell cell1 = row1.createCell(0);
         cell1.setCellValue("项目定义编码");
         cell1.setCellStyle(styles.get("header"));
-        Cell cell2 = row1.createCell(1);
+        Cell cella1 = row1.createCell(1);
+        cella1.setCellValue("设计单位");
+        cella1.setCellStyle(styles.get("header"));
+        Cell cellb1 = row1.createCell(2);
+        cellb1.setCellValue("施工单位");
+        cellb1.setCellStyle(styles.get("header"));
+        Cell cellc1 = row1.createCell(3);
+        cellc1.setCellValue("建筑地址");
+        cellc1.setCellStyle(styles.get("header"));
+        Cell celld1 = row1.createCell(4);
+        celld1.setCellValue("建筑属性");
+        celld1.setCellStyle(styles.get("header"));
+        Cell celle1 = row1.createCell(5);
+        celle1.setCellValue("发文总投资");
+        celle1.setCellStyle(styles.get("header"));
+        Cell cell2 = row1.createCell(6);
         cell2.setCellValue("开工时间");
         cell2.setCellStyle(styles.get("header"));
-        Cell cell3 = row1.createCell(2);
+        Cell cell3 = row1.createCell(7);
         cell3.setCellValue("竣工时间");
         cell3.setCellStyle(styles.get("header"));
-        Cell cell4 = row1.createCell(3);
+        Cell cell4 = row1.createCell(8);
         cell4.setCellValue("批准文号");
         cell4.setCellStyle(styles.get("header"));
 
@@ -93,90 +114,120 @@ public class ExcelWriter {
         Cell cella = row2.createCell(0);
         cella.setCellValue("");
         cella.setCellStyle(styles.get("header"));
-        Cell cellb = row2.createCell(1);
+        Cell cella2 = row2.createCell(1);
+        cella2.setCellValue("");
+        cella2.setCellStyle(styles.get("header"));
+        Cell cella3 = row2.createCell(2);
+        cella3.setCellValue("");
+        cella3.setCellStyle(styles.get("header"));
+        Cell cella4 = row2.createCell(3);
+        cella4.setCellValue("");
+        cella4.setCellStyle(styles.get("header"));
+        Cell cella5 = row2.createCell(4);
+        cella5.setCellValue("");
+        cella5.setCellStyle(styles.get("header"));
+        Cell cella6 = row2.createCell(5);
+        cella6.setCellValue("");
+        cella6.setCellStyle(styles.get("header"));
+        Cell cellb = row2.createCell(6);
         cellb.setCellValue("");
         cellb.setCellStyle(styles.get("header"));
-        Cell cellc = row2.createCell(2);
+        Cell cellc = row2.createCell(7);
         cellc.setCellValue("");
         cellc.setCellStyle(styles.get("header"));
-        Cell celld = row2.createCell(3);
+        Cell celld = row2.createCell(8);
         celld.setCellValue("");
         celld.setCellStyle(styles.get("header"));
 
-        Cell cellm = row2.createCell(9);
+        Cell cellm = row2.createCell(14);
         cellm.setCellValue("");
         cellm.setCellStyle(styles.get("header"));
-        Cell celln = row2.createCell(10);
+        Cell celln = row2.createCell(15);
         celln.setCellValue("");
         celln.setCellStyle(styles.get("header"));
-        Cell cello = row2.createCell(11);
+        Cell cello = row2.createCell(16);
         cello.setCellValue("");
         cello.setCellStyle(styles.get("header"));
-        Cell cellp = row2.createCell(12);
+        Cell cellp = row2.createCell(17);
         cellp.setCellValue("");
         cellp.setCellStyle(styles.get("header"));
-        Cell cellq = row2.createCell(13);
+        Cell cellq = row2.createCell(18);
         cellq.setCellValue("");
         cellq.setCellStyle(styles.get("header"));
 
         Cell celle = row3.createCell(0);
         celle.setCellValue("");
         celle.setCellStyle(styles.get("header"));
-        Cell cellf = row3.createCell(1);
+        Cell celle6 = row3.createCell(1);
+        celle6.setCellValue("");
+        celle6.setCellStyle(styles.get("header"));
+        Cell celle2 = row3.createCell(2);
+        celle2.setCellValue("");
+        celle2.setCellStyle(styles.get("header"));
+        Cell celle3 = row3.createCell(3);
+        celle3.setCellValue("");
+        celle3.setCellStyle(styles.get("header"));
+        Cell celle4 = row3.createCell(4);
+        celle4.setCellValue("");
+        celle4.setCellStyle(styles.get("header"));
+        Cell celle5 = row3.createCell(5);
+        celle5.setCellValue("");
+        celle5.setCellStyle(styles.get("header"));
+        Cell cellf = row3.createCell(6);
         cellf.setCellValue("");
         cellf.setCellStyle(styles.get("header"));
-        Cell cellg = row3.createCell(2);
+        Cell cellg = row3.createCell(7);
         cellg.setCellValue("");
         cellg.setCellStyle(styles.get("header"));
-        Cell cellh = row3.createCell(3);
+        Cell cellh = row3.createCell(8);
         cellh.setCellValue("");
         cellh.setCellStyle(styles.get("header"));
 
-        Cell cell5 = row1.createCell(4);
+        Cell cell5 = row1.createCell(9);
         cell5.setCellValue("概算数");
         cell5.setCellStyle(styles.get("header"));
-        Cell cell6 = row2.createCell(4);
+        Cell cell6 = row2.createCell(9);
         cell6.setCellValue("建筑费");
         cell6.setCellStyle(styles.get("header"));
-        Cell cell7 = row2.createCell(5);
+        Cell cell7 = row2.createCell(10);
         cell7.setCellValue("安装费");
         cell7.setCellStyle(styles.get("header"));
-        Cell cell8 = row2.createCell(6);
+        Cell cell8 = row2.createCell(11);
         cell8.setCellValue("设备购置费");
         cell8.setCellStyle(styles.get("header"));
 
-        Cell cellj = row3.createCell(4);
+        Cell cellj = row3.createCell(9);
         cellj.setCellValue("");
         cellj.setCellStyle(styles.get("header"));
-        Cell cellk = row3.createCell(5);
+        Cell cellk = row3.createCell(10);
         cellk.setCellValue("");
         cellk.setCellStyle(styles.get("header"));
-        Cell celll = row3.createCell(6);
+        Cell celll = row3.createCell(11);
         celll.setCellValue("");
         celll.setCellStyle(styles.get("header"));
 
-        Cell cell9 = row2.createCell(7);
+        Cell cell9 = row2.createCell(12);
         cell9.setCellValue("主材费");
         cell9.setCellStyle(styles.get("header"));
-        Cell cell10 = row2.createCell(8);
+        Cell cell10 = row2.createCell(13);
         cell10.setCellValue("其他费用");
         cell10.setCellStyle(styles.get("header"));
-        Cell cell11 = row3.createCell(8);
+        Cell cell11 = row3.createCell(13);
         cell11.setCellValue("设计费");
         cell11.setCellStyle(styles.get("header"));
-        Cell cell12 = row3.createCell(9);
+        Cell cell12 = row3.createCell(14);
         cell12.setCellValue("监理费");
         cell12.setCellStyle(styles.get("header"));
-        Cell cell13 = row3.createCell(10);
+        Cell cell13 = row3.createCell(15);
         cell13.setCellValue("项目前期工作费");
         cell13.setCellStyle(styles.get("header"));
-        Cell cell14 = row3.createCell(11);
+        Cell cell14 = row3.createCell(16);
         cell14.setCellValue("线路施工赔偿费");
         cell14.setCellStyle(styles.get("header"));
-        Cell cell15 = row3.createCell(12);
+        Cell cell15 = row3.createCell(17);
         cell15.setCellValue("法人管理费（余物清理费）");
         cell15.setCellStyle(styles.get("header"));
-        Cell cell16 = row3.createCell(13);
+        Cell cell16 = row3.createCell(18);
         cell16.setCellValue("合计");
         cell16.setCellStyle(styles.get("header"));
         return sheet;
@@ -285,15 +336,51 @@ public class ExcelWriter {
         }
         cell = row.createCell(cellNum++);
         cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getDesignUnits()) {
+            cell.setCellValue(maintainData.getDesignUnits());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getConstructionUnits()) {
+            cell.setCellValue(maintainData.getConstructionUnits());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getAddress()) {
+            cell.setCellValue(maintainData.getAddress());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getProperty()) {
+            cell.setCellValue(maintainData.getProperty());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getInvestment()) {
+            cell.setCellValue(maintainData.getInvestment());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
         if (null != maintainData.getStartDate()) {
-            cell.setCellValue(maintainData.getStartDate());
+            cell.setCellValue(DateUtils.formatDate(maintainData.getStartDate()));
+
         } else {
             cell.setCellValue("");
         }
         cell = row.createCell(cellNum++);
         cell.setCellStyle(styles.get("data"));
         if (null != maintainData.getEndDate()) {
-            cell.setCellValue(maintainData.getEndDate());
+            cell.setCellValue(DateUtils.formatDate(maintainData.getEndDate()));
         } else {
             cell.setCellValue("");
         }

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -264,19 +264,24 @@ public class DataMaintenanceController extends BaseController {
 			String projectId = (String) importExcel.getCellValue(row,0);
 			if(StringUtils.isNotBlank(projectId)) {
 				maintainData.setProjectId(projectId);
-			    maintainData.setStartDate(getDate(importExcel,row,1));
-			    maintainData.setEndDate(getDate(importExcel,row,2));
-				maintainData.setApprovalNumber((String) importExcel.getCellValue(row, 3));
-				maintainData.setBuildingFee(getDouble(importExcel,row,4));
-				maintainData.setInstallFee(getDouble(importExcel,row,5));
-				maintainData.setEquipmentFee(getDouble(importExcel,row,6));
-				maintainData.setMaterialFee(getDouble(importExcel,row,7));
-				maintainData.setDesignFee(getDouble(importExcel,row,8));
-				maintainData.setSupervisionFee(getDouble(importExcel,row,9));
-				maintainData.setPreliminaryWorkFee(getDouble(importExcel,row,10));
-				maintainData.setDamages(getDouble(importExcel,row,11));
-				maintainData.setManagementFee(getDouble(importExcel,row,12));
-				maintainData.setTotalFee(getDouble(importExcel,row,13));
+				maintainData.setDesignUnits((String) importExcel.getCellValue(row, 1));
+				maintainData.setConstructionUnits((String) importExcel.getCellValue(row, 2));
+				maintainData.setAddress((String) importExcel.getCellValue(row, 3));
+				maintainData.setProperty((String) importExcel.getCellValue(row, 4));
+				maintainData.setInvestment((String) importExcel.getCellValue(row, 5));
+			    maintainData.setStartDate(getDate(importExcel,row,6));
+			    maintainData.setEndDate(getDate(importExcel,row,7));
+				maintainData.setApprovalNumber((String) importExcel.getCellValue(row, 8));
+				maintainData.setBuildingFee(getDouble(importExcel,row,9));
+				maintainData.setInstallFee(getDouble(importExcel,row,10));
+				maintainData.setEquipmentFee(getDouble(importExcel,row,11));
+				maintainData.setMaterialFee(getDouble(importExcel,row,12));
+				maintainData.setDesignFee(getDouble(importExcel,row,13));
+				maintainData.setSupervisionFee(getDouble(importExcel,row,14));
+				maintainData.setPreliminaryWorkFee(getDouble(importExcel,row,15));
+				maintainData.setDamages(getDouble(importExcel,row,16));
+				maintainData.setManagementFee(getDouble(importExcel,row,17));
+				maintainData.setTotalFee(getDouble(importExcel,row,18));
 				list.add(maintainData);
 			}
 		}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialVersionController.java

@@ -116,7 +116,7 @@ public class MaterialVersionController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialversion:import")
 	@RequestMapping(value = "import")
-	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException, IllegalAccessException, InstantiationException {
 		String batch = request.getParameter("batch");
 		AjaxJson j = new AjaxJson();
 		try {

src/main/webapp/webpage/modules/sg/financial/settlement/dataMaintenanceForm.jsp

@@ -46,17 +46,41 @@
 					<td class="width-35">
 						<form:input path="projectId" htmlEscape="false"    class="form-control required"/>
 					</td>
+					<td class="width-15 active"><label class="pull-right">设计单位：</label></td>
+					<td class="width-35">
+						<form:input path="designUnits" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">施工单位：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnits" htmlEscape="false"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="pull-right">建筑地址：</label></td>
+					<td class="width-35">
+						<form:input path="address" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">建设性质：</label></td>
+					<td class="width-35">
+						<form:input path="property" htmlEscape="false"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="pull-right">发文总投资：</label></td>
+					<td class="width-35">
+						<form:input path="investment" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">开工时间：</label></td>
 					<td class="width-35">
-					<div class='input-group form_datetime' id='startDate'>
-						<input type='text'  name="startDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.startDate}" pattern="yyyy-MM-dd"/>"/>
-						<span class="input-group-addon">
+						<div class='input-group form_datetime' id='startDate'>
+							<input type='text'  name="startDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.startDate}" pattern="yyyy-MM-dd"/>"/>
+							<span class="input-group-addon">
 			                        <span class="glyphicon glyphicon-calendar"></span>
 			                    </span>
-					</div>
+						</div>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">竣工时间：</label></td>
 					<td class="width-35">
 						<div class='input-group form_datetime' id='endDate'>
@@ -66,56 +90,58 @@
 			                    </span>
 						</div>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">批准文号：</label></td>
 					<td class="width-35">
 						<form:input path="approvalNumber" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">建筑费：</label></td>
 					<td class="width-35">
 						<form:input path="buildingFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">安装费：</label></td>
 					<td class="width-35">
 						<form:input path="installFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">设备购置费：</label></td>
 					<td class="width-35">
 						<form:input path="equipmentFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">主材费：</label></td>
 					<td class="width-35">
 						<form:input path="materialFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">设计费：</label></td>
 					<td class="width-35">
 						<form:input path="designFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">监理费：</label></td>
 					<td class="width-35">
 						<form:input path="supervisionFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">前期工作费：</label></td>
 					<td class="width-35">
 						<form:input path="preliminaryWorkFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">线路施工赔偿费：</label></td>
 					<td class="width-35">
 						<form:input path="damages" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">法人管理费：</label></td>
 					<td class="width-35">
 						<form:input path="managementFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">合计：</label></td>
 					<td class="width-35">
 						<form:input path="totalFee" htmlEscape="false"    class="form-control required"/>

src/main/webapp/webpage/modules/sg/financial/settlement/dataMaintenanceList.js

@@ -103,6 +103,26 @@ $(document).ready(function() {
 		         }
 		       
 		    }
+		    ,{
+                       field: 'designUnits',
+                       title: '设计单位'
+                   }
+		    ,{
+                       field: 'constructionUnits',
+                       title: '施工单位'
+                   }
+		    ,{
+                       field: 'address',
+                       title: '建筑地址'
+                   }
+		    ,{
+                       field: 'property',
+                       title: '建筑属性'
+                   }
+		    ,{
+                       field: 'investment',
+                       title: '发文总投资'
+                   }
 			,{
 		              field: 'startDate',
 		              title: '开工时间',
@@ -183,11 +203,11 @@ $(document).ready(function() {
                 auto: true,
 			    title:"导入数据",
 			    content: "${ctx}/tag/importExcel" ,
-			    btn: ['下载模板','确定', '关闭'],
-				    btn1: function(index, layero){
-					  jp.downloadFile('${ctx}/sg/settlement/import/template');
-				  },
-			    btn2: function(index, layero){
+			    btn: ['确定', '关闭'],
+				  //   btn1: function(index, layero){
+					//   jp.downloadFile('${ctx}/sg/settlement/import/template');
+				  // },
+			    btn1: function(index, layero){
 				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 						iframeWin.contentWindow.importExcel('${ctx}/sg/settlement/import', function (data) {
 							if(data.success){
@@ -201,7 +221,7 @@ $(document).ready(function() {
                     return false;
 				  },
 				 
-				  btn3: function(index){ 
+				  btn2: function(index){
 					  jp.close(index);
 	    	       }
 			}); 
@@ -222,7 +242,6 @@ $(document).ready(function() {
                       top.layer.msg('成功', {icon:1})
                        $('#dataTable').bootstrapTable('load',data);
                      jp.close(index);
-                     getTdValue();
                       });//调用保存事件
                        return false;
                     },

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.js

@@ -231,6 +231,7 @@ $(document).ready(function() {
         });
     }
 
+
     function getTdValue(){
             var tableId = document.getElementById("dataTable");
              for(var i = 1;i < tableId.rows.length;i++) {