Merge remote-tracking branch 'origin/master'

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

@@ -1760,7 +1760,8 @@
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		LEFT JOIN project_plan_info pi on pi.project_id = a.id
 		<where>
-			a.submit_money = 2
+			/*a.submit_money = 2*/
+			1=1
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
@@ -1862,7 +1863,8 @@
 			LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		</if>
 		<where>
-			a.submit_money = 2
+			/*a.submit_money = 2*/
+			1=1
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -266,8 +266,8 @@
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
-						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
+				,{field:'projMaster', align:'center',title: '审核人', width:100,templet:function(d){
+						return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
 					}}
 				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
@@ -312,13 +312,14 @@
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
 					,"conId":"${projectRecords.workContractInfo.id}"
-					,"client":"${projectRecords.workContractInfo.client.name}"
+					,"client":"${projectRecords.workContractInfo.clientName}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"beginDate":"<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"
 					,"endDate":"<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
 					,"submitMoneyStr":"${projectRecords.submitMoneyStr}"
+					,"reviewerPerson":"${projectRecords.reviewerPerson}"
 					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -267,8 +267,8 @@
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
-						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
+				,{field:'projMaster', align:'center',title: '审核人', width:100,templet:function(d){
+						return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
 					}}
 				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
@@ -314,13 +314,14 @@
 					<%--,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"--%>
 					,"contract":"${projectRecords.workContractInfo.name}"
 					,"conId":"${projectRecords.workContractInfo.id}"
-					,"client":"${projectRecords.workContractInfo.client.name}"
+					,"client":"${projectRecords.workContractInfo.clientName}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"beginDate":"<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"
 					,"endDate":"<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
 					,"submitMoneyStr":"${projectRecords.submitMoneyStr}"
+					,"reviewerPerson":"${projectRecords.reviewerPerson}"
 					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>

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

@@ -264,7 +264,7 @@
 						</form:select>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw6" style="display: none">
 					<label class="layui-form-label">项目等级：</label>
 					<div class="layui-input-block">
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">