页面科学计数法修改及字段变动

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

@@ -17,10 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -164,16 +162,36 @@ public class ImportExcelNew {
                 if(null != sheet.getRow(0).getCell(i) && StringUtils.isNotBlank(sheet.getRow(0).getCell(i).toString())) {
                     projectReportSignatureInfo.setProjectReportId(sheet.getRow(0).getCell(i).toString());
                     if(sheet.getRow(1).getCell(i) != null) {
-						projectReportSignatureInfo.setSubmitFee(sheet.getRow(1).getCell(i).toString());
+                    	if(sheet.getRow(1).getCell(i).getCellType() == 0) {
+							BigDecimal bd = new BigDecimal(sheet.getRow(1).getCell(i).toString());
+							projectReportSignatureInfo.setSubmitFee(bd.toPlainString());
+						}else {
+							throw new RuntimeException("请填写正确的金额！");
+						}
 					}
 					if(sheet.getRow(2).getCell(i) != null) {
-						projectReportSignatureInfo.setAuthorizeFee(sheet.getRow(2).getCell(i).toString());
+						if(sheet.getRow(2).getCell(i).getCellType() == 0) {
+							BigDecimal bd = new BigDecimal(sheet.getRow(2).getCell(i).toString());
+							projectReportSignatureInfo.setAuthorizeFee(bd.toPlainString());
+						}else {
+							throw new RuntimeException("请填写正确的金额！");
+						}
 					}
 					if(sheet.getRow(3).getCell(i) != null) {
-						projectReportSignatureInfo.setConstructionUnitAssessmentFee(sheet.getRow(3).getCell(i).toString());
+						if(sheet.getRow(3).getCell(i).getCellType() == 0) {
+							BigDecimal bd = new BigDecimal(sheet.getRow(3).getCell(i).toString());
+							projectReportSignatureInfo.setConstructionUnitAssessmentFee(bd.toPlainString());
+						}else {
+							throw new RuntimeException("请填写正确的金额！");
+						}
 					}
 					if(sheet.getRow(4).getCell(i) != null) {
-						projectReportSignatureInfo.setAuthorizeFeeDeductAssessmentFee(sheet.getRow(4).getCell(i).toString());
+						if(sheet.getRow(4).getCell(i).getCellType() == 0) {
+							BigDecimal bd = new BigDecimal(sheet.getRow(4).getCell(i).toString());
+							projectReportSignatureInfo.setAuthorizeFeeDeductAssessmentFee(bd.toPlainString());
+						}else {
+							throw new RuntimeException("请填写正确的金额！");
+						}
 					}
 					if(sheet.getRow(5).getCell(i) != null) {
 						projectReportSignatureInfo.setConstructionUnit(sheet.getRow(5).getCell(i).toString());
@@ -269,7 +287,12 @@ public class ImportExcelNew {
 						projectReportSignatureInfo.setMainContentsOfProject(sheet.getRow(17).getCell(i).toString());
 					}
 					if(sheet.getRow(18).getCell(i) != null) {
-						projectReportSignatureInfo.setTotalContractPrice(sheet.getRow(18).getCell(i).toString());
+						if(sheet.getRow(18).getCell(i).getCellType() == 0) {
+							BigDecimal bd = new BigDecimal(sheet.getRow(18).getCell(i).toString());
+							projectReportSignatureInfo.setTotalContractPrice(bd.toPlainString());
+						}else {
+							throw new RuntimeException("请填写正确的金额！");
+						}
 					}
 					if(sheet.getRow(19).getCell(i) != null) {
 						if(sheet.getRow(19).getCell(i).getCellType()==0) {

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/ProjectReportSignatureInfo.java

@@ -29,17 +29,11 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 	private String descriptionOfSpecialMatters;  //特殊事项说明
 	private Date stampDate;          //盖章日期
 	private String printQuantity;    //打印数量
-	private Date reportPreparationDate;//报告编制日期
 	private Date agreedStartDate;    //约定开始日期
 	private Date agreedEndDate;      //约定结束日期
 	private String consultant;       //咨询员
 	private String selfCalibrationOpinion;//自校意见
 	private String reviewOpinion;    //复核意见
-	private Date reviewDate;         //复核日期
-	private Date dateOfConsultationReport;//咨询报告日期
-	private Date startDateOfConsultingOperation;//咨询作业开始日期
-	private Date endDateOfConsultation;//咨询作业结束日期
-	private Date startAuditDate;       //开始审核日期
 	private String projectScaleContentScope;//工程规模内容和范围
 	private String mainContentsOfProject;//工程主要内容
 	private String totalContractPrice; //合同总价
@@ -51,14 +45,17 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 	private String designUnit;      //设计单位
 	private String constructionControlUnit;//监理单位
 	private String followUpAuditUnit;//跟踪审计单位
+	private String contractName;//施工合同名称
+	private String contractDetails;//施工合同内容
+	private String contractDate;//施工合同时间(合同签订日期)
 	private String engineeringDesignChangeOrder;//工程设计变更单
 	private String confirmationSheetOfQuantities;//工程量确认单
 	private String projectVisa;     //工程签证
 	private String qualityPriceConfirmationOfEngineeringMaterials;//工程材料设备认质认价单
 	private String listmaterialsEquipmentByA;//工程甲供材料设备清单
-	private String projectRewardAndDamages;//工程索赔奖励及违约金
-	private String charge;          //取费
-	private String taxes;           //税金
+	private String projectRewardAndDamages;//工程索赔奖励及违约金  不是金额
+	private String charge;          //取费    不是金额
+	private String taxes;           //税金    不是金额
 	private String durationDifferenceCausesAndResponsibilities;//工期差异原因与责任
 	private String qualityDifferenceCausesAndResponsibilities;//质量差异原因与责任
 	private String otherContentsAndExpenses;//其它内容及费用
@@ -71,9 +68,6 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 	private String constructionQualityWarrantyDeposit;//工程质量保修金处理情况
 	private String taxDifferenceCalculationAndProcessing;//税金差额计算处理
 
-	private String contractName;//施工合同名称
-	private String contractDetails;//施工合同内容
-	private String contractDate;//施工合同时间
 
 	public String getProjectReportId() {
 		return projectReportId;
@@ -163,14 +157,6 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 		this.printQuantity = printQuantity;
 	}
 
-	public Date getReportPreparationDate() {
-		return reportPreparationDate;
-	}
-
-	public void setReportPreparationDate(Date reportPreparationDate) {
-		this.reportPreparationDate = reportPreparationDate;
-	}
-
 	public Date getAgreedStartDate() {
 		return agreedStartDate;
 	}
@@ -211,46 +197,6 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 		this.reviewOpinion = reviewOpinion;
 	}
 
-	public Date getReviewDate() {
-		return reviewDate;
-	}
-
-	public void setReviewDate(Date reviewDate) {
-		this.reviewDate = reviewDate;
-	}
-
-	public Date getDateOfConsultationReport() {
-		return dateOfConsultationReport;
-	}
-
-	public void setDateOfConsultationReport(Date dateOfConsultationReport) {
-		this.dateOfConsultationReport = dateOfConsultationReport;
-	}
-
-	public Date getStartDateOfConsultingOperation() {
-		return startDateOfConsultingOperation;
-	}
-
-	public void setStartDateOfConsultingOperation(Date startDateOfConsultingOperation) {
-		this.startDateOfConsultingOperation = startDateOfConsultingOperation;
-	}
-
-	public Date getEndDateOfConsultation() {
-		return endDateOfConsultation;
-	}
-
-	public void setEndDateOfConsultation(Date endDateOfConsultation) {
-		this.endDateOfConsultation = endDateOfConsultation;
-	}
-
-	public Date getStartAuditDate() {
-		return startAuditDate;
-	}
-
-	public void setStartAuditDate(Date startAuditDate) {
-		this.startAuditDate = startAuditDate;
-	}
-
 	public String getProjectScaleContentScope() {
 		return projectScaleContentScope;
 	}
@@ -339,6 +285,30 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 		this.followUpAuditUnit = followUpAuditUnit;
 	}
 
+	public String getContractName() {
+		return contractName;
+	}
+
+	public void setContractName(String contractName) {
+		this.contractName = contractName;
+	}
+
+	public String getContractDetails() {
+		return contractDetails;
+	}
+
+	public void setContractDetails(String contractDetails) {
+		this.contractDetails = contractDetails;
+	}
+
+	public String getContractDate() {
+		return contractDate;
+	}
+
+	public void setContractDate(String contractDate) {
+		this.contractDate = contractDate;
+	}
+
 	public String getEngineeringDesignChangeOrder() {
 		return engineeringDesignChangeOrder;
 	}
@@ -490,28 +460,4 @@ public class ProjectReportSignatureInfo extends ActEntity<ProjectReportSignature
 	public void setTaxDifferenceCalculationAndProcessing(String taxDifferenceCalculationAndProcessing) {
 		this.taxDifferenceCalculationAndProcessing = taxDifferenceCalculationAndProcessing;
 	}
-
-	public String getContractName() {
-		return contractName;
-	}
-
-	public void setContractName(String contractName) {
-		this.contractName = contractName;
-	}
-
-	public String getContractDetails() {
-		return contractDetails;
-	}
-
-	public void setContractDetails(String contractDetails) {
-		this.contractDetails = contractDetails;
-	}
-
-	public String getContractDate() {
-		return contractDate;
-	}
-
-	public void setContractDate(String contractDate) {
-		this.contractDate = contractDate;
-	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -191,7 +192,32 @@ public class RuralProjectMessageElectronicSealController extends BaseController
             String consultantName = ruralProjectMessageElectronicSealService.findZXYById(projectReportSignatureInfo.getConsultant());
             model.addAttribute("consultantName",consultantName);
         /*}*/
-
+        //将数据库拿到的科学计数法的数据转换成正常写法
+        //合同总价
+        if(null != projectReportSignatureInfo.getTotalContractPrice() && !projectReportSignatureInfo.getTotalContractPrice().equals("")) {
+            BigDecimal bd1 = new BigDecimal(projectReportSignatureInfo.getTotalContractPrice());
+            projectReportSignatureInfo.setTotalContractPrice(bd1.toPlainString());
+        }
+        //送审金额
+        if(null != projectReportSignatureInfo.getSubmitFee() && !projectReportSignatureInfo.getSubmitFee().equals("")) {
+            BigDecimal bd2 = new BigDecimal(projectReportSignatureInfo.getSubmitFee());
+            projectReportSignatureInfo.setSubmitFee(bd2.toPlainString());
+        }
+        //审定金额
+        if(null != projectReportSignatureInfo.getAuthorizeFee() && !projectReportSignatureInfo.getAuthorizeFee().equals("")) {
+            BigDecimal bd3 = new BigDecimal(projectReportSignatureInfo.getAuthorizeFee());
+            projectReportSignatureInfo.setAuthorizeFee(bd3.toPlainString());
+        }
+        //施工单位考核费
+        if(null != projectReportSignatureInfo.getConstructionUnitAssessmentFee() && !projectReportSignatureInfo.getConstructionUnitAssessmentFee().equals("")) {
+            BigDecimal bd4 = new BigDecimal(projectReportSignatureInfo.getConstructionUnitAssessmentFee());
+            projectReportSignatureInfo.setConstructionUnitAssessmentFee(bd4.toPlainString());
+        }
+        //扣除考核费后审定金额
+        if(null != projectReportSignatureInfo.getAuthorizeFeeDeductAssessmentFee() && !projectReportSignatureInfo.getAuthorizeFeeDeductAssessmentFee().equals("")) {
+            BigDecimal bd5 = new BigDecimal(projectReportSignatureInfo.getAuthorizeFeeDeductAssessmentFee());
+            projectReportSignatureInfo.setAuthorizeFeeDeductAssessmentFee(bd5.toPlainString());
+        }
 
         model.addAttribute("projectReportSignatureInfo",projectReportSignatureInfo);
         return "modules/ruralprojectrecords/electronicSeal/ruralProjectReportSignatureInfoForm";

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageElectronicSealDao.xml

@@ -15,17 +15,11 @@
 			a.description_of_special_matters as "description_of_special_matters",
 			a.stamp_date as "stamp_date",
 			a.print_quantity as "print_quantity",
-			a.report_preparation_date as "report_preparation_date",
 			a.agreed_start_date as "agreed_start_date",
 			a.agreed_end_date as "agreed_end_date",
 			a.consultant as "consultant",
 			a.self_calibration_opinion as "self_calibration_opinion",
 			a.review_opinion as "review_opinion",
-			a.review_date as "review_date",
-			a.date_of_consultation_report as "date_of_consultation_report",
-			a.start_date_of_consulting_operation as "start_date_of_consulting_operation",
-			a.end_date_of_consultation as "end_date_of_consultation",
-			a.start_audit_date as "start_audit_date",
 			a.project_scale_content_scope as "project_scale_content_scope",
 			a.main_contents_of_project as "main_contents_of_project",
 			a.total_contract_price as "total_contract_price",
@@ -83,17 +77,11 @@
 			description_of_special_matters,
 			stamp_date,
 			print_quantity,
-			report_preparation_date,
 			agreed_start_date,
 			agreed_end_date,
 			consultant,
 			self_calibration_opinion,
 			review_opinion,
-			review_date,
-			date_of_consultation_report,
-			start_date_of_consulting_operation,
-			end_date_of_consultation,
-			start_audit_date,
 			project_scale_content_scope,
 			main_contents_of_project,
 			total_contract_price,
@@ -142,17 +130,11 @@
 			#{item.descriptionOfSpecialMatters},
 			#{item.stampDate},
 			#{item.printQuantity},
-			#{item.reportPreparationDate},
 			#{item.agreedStartDate},
 			#{item.agreedEndDate},
 			#{item.consultant},
 			#{item.selfCalibrationOpinion},
 			#{item.reviewOpinion},
-			#{item.reviewDate},
-			#{item.dateOfConsultationReport},
-			#{item.startDateOfConsultingOperation},
-			#{item.endDateOfConsultation},
-			#{item.startAuditDate},
 			#{item.projectScaleContentScope},
 			#{item.mainContentsOfProject},
 			#{item.totalContractPrice},
@@ -425,17 +407,11 @@
 			description_of_special_matters=#{descriptionOfSpecialMatters},
 			stamp_date=#{stampDate},
 			print_quantity=#{printQuantity},
-			report_preparation_date=#{reportPreparationDate},
 			agreed_start_date=#{agreedStartDate},
 			agreed_end_date=#{agreedEndDate},
 			consultant=#{consultant},
 			self_calibration_opinion=#{selfCalibrationOpinion},
 			review_opinion=#{reviewOpinion},
-			review_date=#{reviewDate},
-			date_of_consultation_report=#{dateOfConsultationReport},
-			start_date_of_consulting_operation=#{startDateOfConsultingOperation},
-			end_date_of_consultation=#{endDateOfConsultation},
-			start_audit_date=#{startAuditDate},
 			project_scale_content_scope=#{projectScaleContentScope},
 			main_contents_of_project=#{mainContentsOfProject},
 			total_contract_price=#{totalContractPrice},
@@ -465,7 +441,10 @@
 			reward_and_punishment_fees=#{rewardAndPunishmentFees},
 			water_and_electricity_fees_handle_situation=#{waterAndElectricityFeesHandleSituation},
 			construction_quality_warranty_deposit=#{constructionQualityWarrantyDeposit},
-			tax_difference_calculation_and_processing=#{taxDifferenceCalculationAndProcessing}
+			tax_difference_calculation_and_processing=#{taxDifferenceCalculationAndProcessing},
+			contract_name=#{contractName},
+			contract_details=#{contractDetails},
+			contract_date=#{contractDate}
 			where project_report_id=#{projectReportId}
 	</update>
 

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectReportSignatureInfoForm.jsp

@@ -855,6 +855,8 @@
             })
         }
 
+
+
     </script>
 </head>
 <body>
@@ -914,7 +916,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">打印数量：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" style="background-color: #fff" id="printQuantity" name="printQuantity" class="form-control layui-input" value="${projectReportSignatureInfo.printQuantity}" onclick="value=this.value.replace(/[^\d]/g,'')" onkeyup="value=this.value.replace(/[^\d]/g,'')"/>
+                        <input htmlEscape="false" style="background-color: #fff" id="printQuantity" name="printQuantity" class="form-control layui-input" value="${projectReportSignatureInfo.printQuantity}"  onkeyup="value=this.value.replace(/[^\d]/g,'')"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -926,59 +928,49 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同总价：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" style="background-color: #fff" id="totalContractPrice" name="totalContractPrice" class="form-control layui-input" value="${projectReportSignatureInfo.totalContractPrice}" onkeyup="wirteNum(this)"/>
+                        <input htmlEscape="false" style="background-color: #fff" id="totalContractPrice" name="totalContractPrice" class="form-control layui-input" value="${projectReportSignatureInfo.totalContractPrice}"  onkeyup="wirteNum(this)"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label ">盖章日期：</label>
+                    <label class="layui-form-label double-line">施工合同名称：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="stampDate" name="stampDate" value="<fmt:formatDate value="${projectReportSignatureInfo.stampDate}" pattern="yyyy-MM-dd"/>">
+                        <input htmlEscape="false" style="background-color: #fff" id="contractName" name="contractName" class="form-control layui-input" value="${projectReportSignatureInfo.contractName}" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">报告编制日期：</label>
+                    <label class="layui-form-label double-line">施工合同结算方式：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff"  id="reportPreparationDate" name="reportPreparationDate" value="<fmt:formatDate value="${projectReportSignatureInfo.reportPreparationDate}" pattern="yyyy-MM-dd"/>">
+                        <input htmlEscape="false" style="background-color: #fff" id="contractDetails" name="contractDetails" class="form-control layui-input" value="${projectReportSignatureInfo.contractDetails}" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">约定开始日期：</label>
+                    <label class="layui-form-label double-line">合同签订日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="agreedStartDate" name="agreedStartDate" value="<fmt:formatDate value="${projectReportSignatureInfo.agreedStartDate}" pattern="yyyy-MM-dd"/>">
+                        <input htmlEscape="false" style="background-color: #fff" id="contractDate" name="contractDate" class="form-control layui-input" value="${projectReportSignatureInfo.contractDate}" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">约定结束日期：</label>
-                    <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="agreedEndDate" name="agreedEndDate" value="<fmt:formatDate value="${projectReportSignatureInfo.agreedEndDate}" pattern="yyyy-MM-dd"/>">
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">咨询作业开始日期：</label>
-                    <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="startDateOfConsultingOperation" name="startDateOfConsultingOperation" value="<fmt:formatDate value="${projectReportSignatureInfo.startDateOfConsultingOperation}" pattern="yyyy-MM-dd"/>">
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">咨询作业结束日期：</label>
+                    <label class="layui-form-label ">盖章日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="endDateOfConsultation" name="endDateOfConsultation" value="<fmt:formatDate value="${projectReportSignatureInfo.endDateOfConsultation}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="stampDate" name="stampDate" value="<fmt:formatDate value="${projectReportSignatureInfo.stampDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
+
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">咨询报告日期：</label>
+                    <label class="layui-form-label double-line">约定开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="dateOfConsultationReport" name="dateOfConsultationReport" value="<fmt:formatDate value="${projectReportSignatureInfo.dateOfConsultationReport}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="agreedStartDate" name="agreedStartDate" value="<fmt:formatDate value="${projectReportSignatureInfo.agreedStartDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">开始审核日期：</label>
+                    <label class="layui-form-label double-line">约定结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="startAuditDate" name="startAuditDate" value="<fmt:formatDate value="${projectReportSignatureInfo.startAuditDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="agreedEndDate" name="agreedEndDate" value="<fmt:formatDate value="${projectReportSignatureInfo.agreedEndDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
 
 
+
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">合同开工日期：</label>
                     <div class="layui-input-block">
@@ -1182,12 +1174,7 @@
                         <form:textarea path="reviewOpinion" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label ">复核日期：</label>
-                    <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="reviewDate" name="reviewDate" value="<fmt:formatDate value="${projectReportSignatureInfo.reviewDate}" pattern="yyyy-MM-dd"/>">
-                    </div>
-                </div>
+