Browse Source

项目登记(添加登记人筛选项)

[user3] 4 years atrás
parent
commit
04b5b429df

+ 20 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -136,6 +136,11 @@
             LEFT JOIN work_project_user w on a.id = w.project_id
             LEFT JOIN sys_user su on w.user_id = su.id
         </if>
+		<if test="createBy !=null and createBy !=''">
+			<if test="createBy.name !=null and createBy.name !=''">
+				LEFT JOIN sys_user cr on a.create_by = cr.id
+			</if>
+		</if>
         LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
@@ -220,6 +225,11 @@
 			<if test="filingProjectStatus!=null and filingProjectStatus !=''">
 				and pfp.status =${filingProjectStatus}
 			</if>
+			<if test="createBy !=null and createBy !=''">
+				<if test="createBy.name !=null and createBy.name !=''">
+					AND cr.name like concat(concat('%',#{createBy.name}),'%')
+				</if>
+			</if>
             <if test="sqlMap.delFlag !=null and sqlMap.delFlag!=''">
 				${sqlMap.delFlag}
             </if>
@@ -247,6 +257,11 @@
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
 		</if>
+		<if test="createBy !=null and createBy !=''">
+			<if test="createBy.name !=null and createBy.name !=''">
+				LEFT JOIN sys_user cr on a.create_by = cr.id
+			</if>
+		</if>
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
@@ -315,6 +330,11 @@
 			<if test="engineeringType !=null and engineeringType !=''">
 				and a.engineering_type= #{engineeringType}
 			</if>
+			<if test="createBy !=null and createBy !=''">
+				<if test="createBy.name !=null and createBy.name !=''">
+					AND cr.name like concat(concat('%',#{createBy.name}),'%')
+				</if>
+			</if>
 			<!--<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>-->

+ 7 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -366,6 +366,13 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
+							<label class="layui-form-label">登记人:</label>
+							<div class="layui-input-block with-icon">
+								<sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="createBy.name" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
+																  title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目责任人:</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>

+ 7 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -339,6 +339,13 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
+							<label class="layui-form-label">登记人:</label>
+							<div class="layui-input-block with-icon">
+								<sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="createBy.name" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
+																  title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目责任人:</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>