人员资质列表展示

src/main/java/com/jeeplus/modules/workstaff/web/QualificationsController.java

@@ -123,6 +123,10 @@ public class QualificationsController extends BaseController {
 		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
+		for (WorkStaffBasicInfo info:list){
+			info.setRoleId(roleService.getRoleIdByUserId(info.getUserId()));
+			info.setRoleName(roleService.get(info.getRoleId()).getName());
+		}
 		model.addAttribute("page", page);
 		return "modules/workstaff/qualificationList";
 	}

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -236,8 +236,10 @@
                 ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
-                // ,{field:'role',align:'center', title: '岗位', minWidth:100}
-                ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
+                ,{field:'role',align:'center', title: '岗位', minWidth:100}
+                ,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
+
+                // ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
                     ,event:'auditUserId',config:{type:'select',data:params,verify:true}
                     ,templet:function (d) {
@@ -271,7 +273,7 @@
                     ,"id":"${workStaffBasicInfo.id}"
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
-                    <%--,"role":"${workStaffBasicInfo.roleName}"--%>
+                    ,"role":"${workStaffBasicInfo.roleName}"
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
                     ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
@@ -279,6 +281,7 @@
                     ,'office':"<c:out value="${workStaffBasicInfo.office.name}" escapeXml="true"/>"
                     ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
                     ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
+                    ,'highestEducation':"<c:out value="${workStaffBasicInfo.highestEducation}"/>"
                     ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
                     <shiro:hasPermission name="qualifications:qualifications:edit">,"canedit":"1"</shiro:hasPermission>
                 }

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -256,6 +256,12 @@
                             <input style="background-color: #f1f1f1" id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly 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 ">
+                            <input style="background-color: #f1f1f1" id="highestEducation" value="${workStaffBasicInfo.highestEducation}" type="text" readonly class="form-control layui-input" />
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">备注：</label>
                         <div class="layui-input-block">