项目新增添加预估总投资额字段

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

@@ -56,6 +56,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Double buildingUnitFees;  //土建单位造价
 	private Double installUnitFees;    //安装单位造价
 	private Double totalFees;        //总合同额
+	private Double estimateTotalFees;  //预估总投资额
 
 	private ProjectReportData reportData;//报告
 
@@ -674,4 +675,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setEndingDate(Date endingDate) {
 		this.endingDate = endingDate;
 	}
+
+	public Double getEstimateTotalFees() {
+		return estimateTotalFees;
+	}
+
+	public void setEstimateTotalFees(Double estimateTotalFees) {
+		this.estimateTotalFees = estimateTotalFees;
+	}
 }

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

@@ -43,7 +43,8 @@
 		a.install_unit_fees AS "installUnitFees",
 		a.total_fees AS "totalFees",
 		a.start_date AS "startDate",
-		a.ending_date AS "endingDate"
+		a.ending_date AS "endingDate",
+		a.estimate_total_fees AS "estimateTotalFees"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -387,7 +388,8 @@
 		    total_fees,
 		    project_type,
 		    start_date,
-		    ending_date
+		    ending_date,
+		    estimate_total_fees
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -428,7 +430,8 @@
 			#{totalFees},
 			#{projectType},
 			#{startDate},
-			#{endingDate}
+			#{endingDate},
+			#{estimateTotalFees}
 		)
 	</insert>
 	
@@ -468,7 +471,8 @@
 		    install_unit_fees =  #{installUnitFees},
 		    total_fees =  #{totalFees},
 		    start_date =  #{startDate},
-		    ending_date =  #{endingDate}
+		    ending_date =  #{endingDate},
+		    estimate_total_fees = #{estimateTotalFees}
 		WHERE id = #{id}
 	</update>
 	

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -765,7 +765,7 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -809,6 +809,12 @@
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -841,7 +847,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">单位造价(元)：</label>
+                    <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -523,7 +523,7 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -567,6 +567,12 @@
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -599,7 +605,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">单位造价(元)：</label>
+                    <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -212,7 +212,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
@@ -247,6 +247,12 @@
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
+					<div class="layui-input-block">
+						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input required number"  readonly="true"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -279,7 +285,7 @@
 					</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 value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -256,7 +256,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
@@ -291,6 +291,12 @@
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
+					<div class="layui-input-block">
+						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -323,7 +329,7 @@
 					</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 value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -775,7 +775,7 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -819,6 +819,12 @@
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -851,7 +857,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">单位造价(元)：</label>
+                    <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -523,7 +523,7 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构：</label>
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -567,6 +567,12 @@
                             <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
+                </div>--%>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">咨询标的额(万元)：</label>
@@ -599,7 +605,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">单位造价(元)：</label>
+                    <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
                     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -212,7 +212,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
@@ -247,11 +247,17 @@
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
+				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
+					<div class="layui-input-block">
+						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input required number"  readonly="true"/>
+					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">咨询标的额(万元)：</label>
 					<div class="layui-input-block">
-						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
+						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input number"  readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -279,7 +285,7 @@
 					</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 value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
 					</div>