项目新增添加施工方信息

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -116,6 +116,8 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private String dictType;
 	private String parentIds;
 	private String projectType; //类型 1.工程咨询 2.造价审核
+	private String constructionUnit; //施工单位
+	private String constructionLinkman; //施工方联系人
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -683,4 +685,20 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setProjectType(String projectType) {
 		this.projectType = projectType;
 	}
+
+	public String getConstructionUnit() {
+		return constructionUnit;
+	}
+
+	public void setConstructionUnit(String constructionUnit) {
+		this.constructionUnit = constructionUnit;
+	}
+
+	public String getConstructionLinkman() {
+		return constructionLinkman;
+	}
+
+	public void setConstructionLinkman(String constructionLinkman) {
+		this.constructionLinkman = constructionLinkman;
+	}
 }

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

@@ -69,6 +69,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String prrProcessInstanceId; //归档流程号
 
 	private String projectType; //类型 1.工程咨询 2.造价审核
+	private String constructionUnit; //施工单位
+	private String constructionLinkman; //施工方联系人
 
 	private String prrId;
 	private String projectReportName;
@@ -692,4 +694,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFlagAdmin(String flagAdmin) {
 		this.flagAdmin = flagAdmin;
 	}
+
+	public String getConstructionUnit() {
+		return constructionUnit;
+	}
+
+	public void setConstructionUnit(String constructionUnit) {
+		this.constructionUnit = constructionUnit;
+	}
+
+	public String getConstructionLinkman() {
+		return constructionLinkman;
+	}
+
+	public void setConstructionLinkman(String constructionLinkman) {
+		this.constructionLinkman = constructionLinkman;
+	}
 }

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

@@ -44,7 +44,9 @@
 		a.total_fees AS "totalFees",
 		a.start_date AS "startDate",
 		a.ending_date AS "endingDate",
-		a.estimate_total_fees AS "estimateTotalFees"
+		a.estimate_total_fees AS "estimateTotalFees",
+		a.construction_unit as "constructionUnit",
+		a.construction_linkman as "constructionLinkman"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -394,7 +396,9 @@
 		    project_type,
 		    start_date,
 		    ending_date,
-		    estimate_total_fees
+		    estimate_total_fees,
+			construction_unit,
+			construction_linkman
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -436,7 +440,9 @@
 			#{projectType},
 			#{startDate},
 			#{endingDate},
-			#{estimateTotalFees}
+			#{estimateTotalFees},
+			#{constructionUnit},
+			#{constructionLinkman}
 		)
 	</insert>
 	
@@ -477,7 +483,9 @@
 		    total_fees =  #{totalFees},
 		    start_date =  #{startDate},
 		    ending_date =  #{endingDate},
-		    estimate_total_fees = #{estimateTotalFees}
+		    estimate_total_fees = #{estimateTotalFees},
+			construction_unit = #{constructionUnit},
+			construction_linkman = #{constructionLinkman}
 		WHERE id = #{id}
 	</update>
 

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

@@ -852,6 +852,18 @@
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工方联系方式：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" maxlength="11" class="form-control number layui-input"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">

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

@@ -786,6 +786,18 @@
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工方联系方式：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" maxlength="11" class="form-control number layui-input"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">

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

@@ -292,6 +292,18 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">

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

@@ -347,6 +347,18 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">

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

@@ -862,6 +862,18 @@
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工方联系方式：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" maxlength="11" class="form-control number layui-input"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">

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

@@ -788,6 +788,18 @@
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">施工方联系方式：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionLinkman" htmlEscape="false" id="installPercent" maxlength="11" class="form-control number layui-input"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">

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

@@ -292,6 +292,18 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">
+						<form:input path="constructionLinkman" htmlEscape="false" id="installPercent" class="form-control layui-input" 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">