添加施工单位功能

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

@@ -929,6 +929,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.flagAdmin = flagAdmin;
 	}
 
+	@ExcelField(title="施工单位", align=2, sort=5)
 	public String getConstructionUnit() {
 		return constructionUnit;
 	}

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

@@ -305,6 +305,7 @@
 	<select id="findList" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumnss"/>
+		,a.construction_unit as "constructionUnit"
 		,a.record_state as "recordState"
 		,a.submit_money as "submitMoney"
 		,a.submit_scale as "submitScale"

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -849,6 +849,12 @@
 						</c:forEach>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">施工单位：</label>
+					<div class="layui-input-block">
+						<input id="constructionUnit" htmlEscape="false" style="background-color: #f1f1f1" readonly="true" name="constructionUnit" maxlength="255" value="${projectRecords.constructionUnit}" placeholder="请输入施工单位" class="form-control layui-input"/>
+					</div>
+				</div>
 <%--				<div class="layui-item layui-col-sm6 lw7">--%>
 <%--					<label class="layui-form-label">所在省份：</label>--%>
 <%--					<div class="layui-input-block">--%>

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

@@ -1008,6 +1008,12 @@
                         </form:select>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="constructionUnit" maxlength="255"  placeholder="请输入施工单位" class="form-control layui-input judgment"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
@@ -1033,13 +1039,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
-                    <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人:</label>
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
@@ -1132,6 +1131,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>
@@ -1239,12 +1245,7 @@
                         <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">

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

@@ -1054,6 +1054,12 @@
                         </form:select>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>施工单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="constructionUnit" htmlEscape="false" id="constructionUnit" maxlength="255"  placeholder="请输入施工单位" class="form-control layui-input judgment"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
@@ -1079,13 +1085,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">创建人：</label>
-                    <div class="layui-input-block">
-                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
-                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
@@ -1180,6 +1179,13 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建日期：</label>
                     <div class="layui-input-block">
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${ruralProjectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -761,6 +761,12 @@
 						</c:forEach>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">施工单位：</label>
+					<div class="layui-input-block">
+						<input id="constructionUnit" htmlEscape="false" style="background-color: #f1f1f1" readonly="true" name="constructionUnit" maxlength="255" value="${projectRecords.constructionUnit}" placeholder="请输入施工单位" class="form-control layui-input"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">

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

@@ -186,6 +186,12 @@
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">施工单位：</label>
+					<div class="layui-input-block">
+						<input id="constructionUnit" htmlEscape="false" style="background-color: #f1f1f1" readonly="true" name="constructionUnit" maxlength="255" value="${projectRecords.constructionUnit}" placeholder="请输入施工单位" class="form-control layui-input"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质：</label>
 					<div class="layui-input-block">
@@ -224,12 +230,6 @@
 					</div>
 				</div>
 				<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: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
-					</div>
-				</div>
-				<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: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
@@ -305,6 +305,12 @@
 					</div>
 				</div>
 				<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: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<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: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>