Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2581,6 +2581,7 @@ public class WorkProjectNotifyController extends BaseController {
 							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 						}
 					}
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
 					RuralProjectRecords projectRecordPlans=this.planView(projectcontentinfo.getProject().getId());
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
@@ -2965,7 +2966,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					model.addAttribute("projectReportDataTwo", projectReportDataTwo);
 					workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
-					workReviewAudit.setType(type);	
+					workReviewAudit.setType(type);
 					workReviewAudit.setReportId(workProjectNotify.getNotifyId());
 					List<WorkReviewAudit> workReviewAudits = workReviewStandardService.findAuditList(workReviewAudit);
 					model.addAttribute("type", type);

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

@@ -282,12 +282,6 @@
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6 lw8">
-						<label class="layui-form-label">项目责任人：</label>
-						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
-						</div>
-					</div>
 						<%--<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label">项目类型：</label>
 							<div class="layui-input-block">
@@ -306,6 +300,18 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">项目责任人：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">所属部门：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">创建人：</label>
 						<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -169,12 +169,6 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目责任人：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
-					</div>
-				</div>
 					<%--<div class="layui-item layui-col-sm6 lw6">
                         <label class="layui-form-label">项目类型：</label>
                         <div class="layui-input-block">
@@ -193,6 +187,18 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目责任人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所属部门：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>