Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -264,6 +264,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     records1.setWorkContractInfo(contractInfo);
                 }
             }
+
             projectRecordTreeData = getParentInfo(records1);
             //获取归档批次信息
             //项目归档批次
@@ -392,6 +393,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
         }
         projectRecordTreeData.setProjectLeaders(sb.toString());
+        //项目登记人
+        projectRecordTreeData.setProjectRegistrant(info.getCreateBy().getName());
         //合同名称
         if(null != info.getWorkContractInfo()){
             projectRecordTreeData.setContractName(info.getWorkContractInfo().getName());

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -465,6 +465,20 @@
 			<if test="companyId != null and companyId != ''">
 				AND a.company_id = #{companyId}
 			</if>
+			<!--新添加查询条件-->
+			<if test="clientName != null and clientName != ''">
+				AND client.name like concat('%',#{clientName},'%')
+			</if>
+			<if test="name != null and name != ''">
+				AND a.name like concat('%',#{name},'%')
+			</if>
+			<if test="contractTypeDoc != null and contractTypeDoc != ''">
+				AND a.contractTypeDoc = #{contractTypeDoc}
+			</if>
+			<if test="createName != null and createName != ''">
+				AND u.name = #{createName}
+			</if>
+			<!--结束查询条件-->
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

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

@@ -561,6 +561,13 @@
 								return "<font></font>";
 							}
 						}},
+					{field: 'projectLeader', align:'center', title: '创建人',width:160,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectRegistrant+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
                     {field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
 							var date=d.createDate;
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -561,6 +561,13 @@
 								return "<font></font>";
 							}
 						}},
+					{field: 'projectLeader', align:'center', title: '创建人',width:160,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectRegistrant+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
                     {field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
 							var date=d.createDate;
 

src/main/webapp/webpage/modules/sys/gridselectContractDetail.jsp

@@ -72,19 +72,32 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">
-						<div class="layui-item query athird">
-							<span class="layui-form-label">合同编号：</span>
+<%--						<div class="layui-item query athird">--%>
+<%--							<span class="layui-form-label">合同编号：</span>--%>
+<%--							<div class="layui-input-block">--%>
+<%--								<form:input path="contractNum" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+						<div class="layui-item query athird" style="width:25%;">
+							<span class="layui-form-label">合同名称：</span>
 							<div class="layui-input-block">
-								<form:input path="contractNum" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 							</div>
+<%--							name--%>
 						</div>
-						<div class="layui-item query athird">
-							<span class="layui-form-label">合同名称：</span>
+						<div class="layui-item query athird" style="width:25%;">
+							<span class="layui-form-label">委托方：</span>
 							<div class="layui-input-block">
-								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+								<form:input path="clientName" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item athird fr">
+						<div class="layui-item query athird" style="width:25%;">
+							<span class="layui-form-label">创建人：</span>
+							<div class="layui-input-block">
+								<form:input path="createName" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird fr" style="width:25%;">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
@@ -92,13 +105,17 @@
 							</div>
 						</div>
 						<div id="moresees" style="clear:both;display:none;">
-							<div class="layui-item query athird">
-								<label class="layui-form-label">客户名称：</label>
-								<div class="layui-input-block with-icon">
-									<form:input path="client.name" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							<div class="layui-item query athird" style="width:25%;">
+								<span class="layui-form-label">工程类别：</span>
+								<div class="layui-input-block">
+									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
+										<form:option value="" label=""/>
+										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									</form:select>
 								</div>
 							</div>
 						</div>
+
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -132,12 +149,8 @@
 										<c:if test="${status.first==true}">
 											<td title="${fns:getValue(obj, value)}" class="codelabel">${fns:getValue(obj, value)}</td>
 										</c:if>
-
-										<%--<c:if test="${status.first!=true}">
-											<td>${fns:getValue(obj, value)}</td>
-										</c:if>--%>
 									</c:forEach>
-									<td title="${fns:getMainDictLabel(obj.contractType, 'contract_type', '')}" class="codelabel">${fns:getMainDictLabel(obj.contractType, 'contract_type', '')}</td>
+									<td title="${fns:getMainDictLabel(obj.contractTypeDoc, 'contract_info_type', '')}" class="codelabel">${fns:getMainDictLabel(obj.contractTypeDoc, 'contract_info_type', '')}</td>
 									<td title="${obj.client.name}" class="codelabel">${obj.client.name}</td>
 									<td class="codelabel"><fmt:formatDate value="${obj.createDate}" pattern="yyyy-MM-dd"/></td>
 									<td title="${obj.createBy.name}" class="codelabel">${obj.createBy.name}</td>