11

src/main/java/com/jeeplus/modules/workregularapply/service/WorkRegularApplyService.java

@@ -20,6 +20,7 @@ import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.OfficeDao;
 import com.jeeplus.modules.sys.dao.RoleDao;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.Company;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -52,6 +53,7 @@ import com.jeeplus.modules.workregularapply.entity.WorkRegularScore;
 import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
 import com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.IdentityService;
 import org.activiti.engine.RuntimeService;
@@ -104,6 +106,8 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 	@Autowired
 	private WorkStaffAchivesDao workStaffAchivesDao;
 	@Autowired
+	private WorkStaffBasicInfoService workStaffBasicInfoService;
+	@Autowired
 	private WorkJobGradeDao workJobGradeDao;
 	@Autowired
 	private WorkRegularContentService workRegularContentService;
@@ -227,6 +231,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			Map<String, Object> variables = new HashMap<String, Object>();
 			identityService.setAuthenticatedUserId(workRegularApply.getCurrentUser().getId());
 			User user = UserUtils.getUser();
+			List<User> fgldList = null;
 //			User user=userDao.get(workRegularApply.getUserId());
 			String contentStr = "转正人:"+ user.getName()+"，转正日期:"+ DateUtils.formatDate(workRegularApply.getApplyDate());
 			String titleStr = "转正人:"+user.getName();
@@ -234,9 +239,14 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			Office applyOffice = officeDao.get(user.getOffice().getId());
 			String comId = user.getComId();
 			Role rsbzr = new Role();
+			Office office = new Office();
+			office.setId(comId);
 			rsbzr.setEnname("rsbzr");
+			rsbzr.setCompany(office);
 			Role role = roleDao.getByEnname(rsbzr);
-			List<User> fgldList = userDao.findUserByRoleId(role.getId(), comId);
+			if(role != null) {
+				fgldList = userDao.findUserByRoleId(role.getId(), comId);
+			}
 			WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("zzsql3125f1f194c82bdea9mrlcc750904", applyOffice);
 			// 启动流程
 			String processType = workActivityMenu.getProcessType();
@@ -574,17 +584,18 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					if ("yes".equals(workRegularApply.getAct().getFlag())) {
 						notifyRole = "审批通过";
 						workActivityProcess.setIsApproval("1");
+						workStaffBasicInfoService.updateStatus(workRegularApply.getUserId());
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
 					}
 					break;
 				} else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-					notifyRole = "负责人审批";
+					notifyRole = "部门负责人审批";
 					taskCount = "0";
 					exp = "pass";
 					workActivityProcess.setCount(0);
-					enname = "zzr";
+					enname = "bmzr";
 					if (!"yes".equals(flag)) {
 						workRegularApply.setState("3");
 					}

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -22,6 +22,7 @@ import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workborrowmangement.entity.WorkBorrowMangement;
+import com.jeeplus.modules.workjobgrade.entity.WorkJobGrade;
 import com.jeeplus.modules.workmonthlyplan.entity.WorkMonthlyPlanThis;
 import com.jeeplus.modules.workregularapply.dao.WorkRegularContentDao;
 import com.jeeplus.modules.workregularapply.entity.WorkRegularContent;
@@ -29,6 +30,7 @@ import com.jeeplus.modules.workregularapply.entity.WorkRegularScore;
 import com.jeeplus.modules.workregularapply.service.WorkRegularContentService;
 import com.jeeplus.modules.workregularapply.service.WorkRegularScoreService;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -81,6 +83,8 @@ public class WorkRegularApplyController extends BaseController {
 	private OfficeDao officeDao;
 	@Autowired
 	private RoleDao roleDao;
+	@Autowired
+	private WorkStaffAchivesDao workStaffAchivesDao;
 
 	@ModelAttribute
 	public WorkRegularApply get(@RequestParam(required=false) String id) {
@@ -102,6 +106,8 @@ public class WorkRegularApplyController extends BaseController {
 	public String list(WorkRegularApply workRegularApply, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<WorkRegularApply> page = workRegularApplyService.findPage(new Page<WorkRegularApply>(request, response), workRegularApply); 
 		model.addAttribute("page", page);
+		WorkStaffBasicInfo basicInfo = workStaffAchivesDao.getByUserId(UserUtils.getUser().getId());
+		model.addAttribute("user",basicInfo);
 		return "modules/workregularapply/workRegularApplyList";
 	}
 
@@ -116,9 +122,23 @@ public class WorkRegularApplyController extends BaseController {
 		//1 为 新增转正申请
 		if("1".equals(flat)){
 			// 如果当前用户在试用期，则将入职信息自动填写到Form
-			WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(UserUtils.getUser().getId());
+//			WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(UserUtils.getUser().getId());
+			WorkStaffBasicInfo basicInfo = workStaffAchivesDao.getByUserId(UserUtils.getUser().getId());
+			if(basicInfo != null){
+				String basicInfoId = basicInfo.getId();
+				String userId = basicInfo.getUserId();
+				String  pay = String.valueOf(basicInfo.getSalary());
+				String jobName = basicInfo.getJobGrade().getName();
+				String gradeId = basicInfo.getJobGrade().getId();
+				workRegularApply.setPay(pay);
+				workRegularApply.setBasicInfoId(basicInfoId);
+				workRegularApply.setUserId(userId);
+				workRegularApply.setJobName(jobName);
+				WorkJobGrade workJobGrade = new WorkJobGrade();
+				workJobGrade.setId(gradeId);
+				workRegularApply.setJobGrade(workJobGrade);
+			}
 			workRegularApply.setWorkStaffBasicInfo(basicInfo);
-
 			WorkRegularContent w=new WorkRegularContent();
 			List<WorkRegularScore> workRegularScoreList=new ArrayList<>();
 			List<WorkRegularContent> list=workRegularContentService.findList(w);
@@ -344,12 +364,26 @@ public class WorkRegularApplyController extends BaseController {
 //					users = UserUtils.getByRoleActivityEnname("fgld", 3, workRegularApply.getOfficeId(), "19", user);
 					String comId = user.getComId();
 					Role rsbzr = new Role();
+					Office office = new Office();
+					office.setId(comId);
 					rsbzr.setEnname("rsbzr");
+					rsbzr.setCompany(office);
 					Role role = roleDao.getByEnname(rsbzr);
 					users = userDao.findUserByRoleId(role.getId(), comId);
 				}
 			}else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workRegularApply.getProcessInstanceId(),3);
+				if (users==null ) {
+					String comId = user.getComId();
+					Role rsbzr = new Role();
+					Office office = new Office();
+					office.setId(comId);
+					rsbzr.setEnname("rsbzr");
+					rsbzr.setCompany(office);
+					Role role = roleDao.getByEnname(rsbzr);
+					users = userDao.findUserByRoleId(role.getId(), comId);
+				}
+
 			}else if ("modifyApply".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workRegularApply.getProcessInstanceId(),1);
 			}

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffAchivesDao.java

@@ -19,6 +19,7 @@ import java.util.List;
 public interface WorkStaffAchivesDao extends CrudDao<WorkStaffBasicInfo> {
 
   public WorkStaffBasicInfo  getWorkStaffBasicInfo(String id);//根据用户获取用户入职信息
+    WorkStaffBasicInfo getByUserId(String id);
     public Integer getByCompany(WorkStaffBasicInfo workStaffBasicInfo);//根据用户获取用户入职信息
     public Integer getByBranchCompany(WorkStaffBasicInfo workStaffBasicInfo);//根据用户获取用户入职信息
     public List<WorkStaffBasicInfo> getByCompanyInfo(WorkStaffBasicInfo workStaffBasicInfo);//根据用户获取用户入职信息
@@ -50,4 +51,6 @@ public interface WorkStaffAchivesDao extends CrudDao<WorkStaffBasicInfo> {
 
     public WorkStaffBasicInfo getByNoName(WorkStaffBasicInfo workStaffBasicInfo);
     public WorkStaffBasicInfo getJob(String userId);
+
+    void updateStatus(@Param("id") String id, @Param("status") String status);
 }

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.workstaff.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -38,4 +39,6 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     List<WorkStaffBasicInfo> findListByAchiveId(WorkStaffBasicInfo workStaffBasicInfo);
 
     List<WorkStaffBasicInfo> findListByUserId(WorkStaffBasicInfo workStaffBasicInfo);
+
+    void updateStatus(@Param("id") String id, @Param("status") String status);
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -780,12 +780,13 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     }
 
     /**
-     * 通过员工的id,获取员工入职信息,试用期员工转正申请使用此方法
-     * @param userId
-     * @return
+     * 修改员工状态
      */
-    public WorkStaffBasicInfo getWorkStaffBasicInfoByUserId(String userId){
-        return  workStaffBasicInfoDao.getWorkStaffBasicInfoByUserId(userId);
+    public void updateStatus(String id){
+        String status = "正式";
+        workStaffBasicInfoDao.updateStatus(id,status);
+        workStaffAchivesDao.updateStatus(id,status);
+
     }
 
 }

src/main/resources/mappings/modules/workstaff/WorkStaffAchivesDao.xml

@@ -69,6 +69,14 @@
 		<include refid="workStaffBasicInfoJoins"/>
 		WHERE a.id = #{id}
 	</select>
+
+	<select id="getByUserId" resultType="WorkStaffBasicInfo" >
+		SELECT
+		<include refid="workStaffBasicInfoColumns"/>
+		FROM work_staff_achives a
+		<include refid="workStaffBasicInfoJoins"/>
+		WHERE a.user_id = #{id}
+	</select>
 	
 	<select id="findList" resultType="WorkStaffBasicInfo" >
 		SELECT 
@@ -771,4 +779,10 @@
 		<include refid="workStaffBasicInfoJoins"/>
 		WHERE a.user_id = #{userId} limit 1
 	</select>
+
+	<update id="updateStatus">
+		update work_staff_achives set
+		status = #{status}
+		where user_id = #{id}
+	</update>
 </mapper>

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -375,6 +375,7 @@
 		select a.* ,
 		o.name as "office.name",
 		jg.name AS "jobGrade.name",
+		jg.id  AS "jobGrade.id",
 		jg.pay AS "salary"
 		FROM work_staff_basic_info  a
 		LEFT JOIN sys_office o on o.id=a.office_id
@@ -468,4 +469,10 @@
             </if>
         </where>
     </select>
+
+	<update id="updateStatus">
+		update work_staff_basic_info set
+		status = #{status}
+		where user_id = #{id}
+	</update>
 </mapper>

src/main/webapp/webpage/modules/workregularapply/workRegularApplyAudit.jsp

@@ -9,23 +9,23 @@
             $("#correctDate").removeAttr("disabled");
             if(validateForm.form()){
                 if(obj == 1){
-                    if(taskKey=='ywbfzr'){
-                        var correctDate = new Date($("#correctDate").val().replace(/-/g, "/"));
-                        var tryEndTime = new Date($("#tryEndTime").val().replace(/-/g, "/"));
-                        if($("#correctOpinion").val()=='1'){
-
-                        }else if($("#correctOpinion").val()=='2'){//提前
-                            if(correctDate.getTime()>tryEndTime.getTime()){
-                                parent.layer.msg("新试用期结束日期不能大于试用期结束日期!", {icon: 5});
-                                return false;
-                            }
-                        }else if($("#correctOpinion").val()=='3'){
-                            if(correctDate.getTime()<tryEndTime.getTime()){
-                                parent.layer.msg("新试用期结束日期不能小于试用期结束日期!", {icon: 5});
-                                return false;
-                            }
-                        }
-                    }
+                    // if(taskKey=='bmzr'){
+                    //     var correctDate = new Date($("#correctDate").val().replace(/-/g, "/"));
+                    //     var tryEndTime = new Date($("#tryEndTime").val().replace(/-/g, "/"));
+                    //     if($("#correctOpinion").val()=='1'){
+					//
+                    //     }else if($("#correctOpinion").val()=='2'){//提前
+                    //         if(correctDate.getTime()>tryEndTime.getTime()){
+                    //             parent.layer.msg("新试用期结束日期不能大于试用期结束日期!", {icon: 5});
+                    //             return false;
+                    //         }
+                    //     }else if($("#correctOpinion").val()=='3'){
+                    //         if(correctDate.getTime()<tryEndTime.getTime()){
+                    //             parent.layer.msg("新试用期结束日期不能小于试用期结束日期!", {icon: 5});
+                    //             return false;
+                    //         }
+                    //     }
+                    // }
 
                     $('#flag').val('yes');
                 }else{
@@ -63,10 +63,16 @@
             });
             defaultCorrectDate=$("#correctDate").val();
             taskKey="${workRegularApply.act.taskDefKey}";
-            if(taskKey=='ywbfzr'){
+            if(taskKey=='bmzr'){
                 var value=$("#correctOpinion").val();
                 getChange(value);
 			}
+
+			laydate.render({
+				elem: '#correctDate',
+				format: 'yyyy-MM-dd',
+				type : 'date'
+			});
         });
         function deleteRow(obj,index){
             $(obj).parent().parent().remove();
@@ -133,6 +139,7 @@
                 });
 			}
 
+
         }
 
         function getMoney(value,j){
@@ -278,15 +285,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">个人总结：</label>
 					<div class="layui-input-block">
-						<c:choose>
-							<c:when test="${workRegularApply.act.taskDefKey eq 'zzr'}">
-								<form:textarea path="summary"  rows="7"  value="${workRegularApply.summary}"  maxlength="500" class="form-control "/>
-							</c:when>
-							<c:otherwise>
 								<form:textarea path="summary" value="${workRegularApply.summary}" cssStyle="resize: none" readonly="true" htmlEscape="false" rows="6"    maxlength="500" class="form-control "/>
-							</c:otherwise>
-						</c:choose>
-
 					</div>
 				</div>
 			</div>
@@ -297,7 +296,7 @@
 					<label class="layui-form-label">部门评语：</label>
 					<div class="layui-input-block">
 						<c:choose>
-							<c:when test="${workRegularApply.act.taskDefKey eq 'ywbfzr'}">
+							<c:when test="${workRegularApply.act.taskDefKey eq 'bmzr'}">
 								<form:textarea path="comment" htmlEscape="false" rows="4"    maxlength="255" class="form-control "/>
 							</c:when>
 							<c:otherwise>
@@ -308,103 +307,103 @@
 				</div>
 
 				<c:choose>
-					<c:when test="${workRegularApply.act.taskDefKey eq 'ywbfzr'}">
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>
-							<div class="layui-input-block">
-								<form:select path="correctOpinion" onchange="getChange(this.value)" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('correct_opinion')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>
-							<div class="layui-input-block  with-icon">
-								<div class="input-group">
-									<sys:treeselectJob id="jobGrade" name="jobGrade.id" value="jobGrade.id" labelName="jobGrade.name" labelValue="${workRegularApply.jobGrade.name}"
-													   title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input " allowClear="false" notAllowSelectParent="true"/>
-								</div>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>
-							<div class="layui-input-block">
-								<input id="correctDate"  name="correctDate" type="text"   class="laydate-icondate form-control required layer-date  layui-input laydate-icon"
-									   value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>" readonly="true"/>
-							</div>
-						</div>
+					<c:when test="${workRegularApply.act.taskDefKey eq 'bmzr'}">
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<form:select path="correctOpinion"  class=" form-control  simple-select">--%>
+									<%--<form:option value="" label=""/>--%>
+									<%--<form:options items="${fns:getDictList('correct_opinion')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+								<%--</form:select>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>--%>
+							<%--<div class="layui-input-block  with-icon">--%>
+								<%--<div class="input-group">--%>
+									<%--<sys:treeselectJob id="jobGrade" name="jobGrade.id" value="jobGrade.id" labelName="jobGrade.name" labelValue="${workRegularApply.jobGrade.name}"--%>
+													   <%--title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input " allowClear="false" notAllowSelectParent="true"/>--%>
+								<%--</div>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<input id="correctDate"  name="correctDate" type="text"   class="laydate-icondate form-control required layer-date  layui-input laydate-icon"--%>
+									   <%--value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>" readonly="true"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
 					</c:when>
 					<c:otherwise>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>
-							<div class="layui-input-block">
-								<input  htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workRegularApply.correctOpinion, 'correct_opinion', '')}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>
-							<div class="layui-input-block  with-icon">
-								<div class="input-group">
-									<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>
-								</div>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>
-							<div class="layui-input-block">
-								<input id=""  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"
-									   value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>
-							</div>
-						</div>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<input  htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workRegularApply.correctOpinion, 'correct_opinion', '')}"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>--%>
+							<%--<div class="layui-input-block  with-icon">--%>
+								<%--<div class="input-group">--%>
+									<%--<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>--%>
+								<%--</div>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<input id=""  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"--%>
+									   <%--value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
 					</c:otherwise>
 				</c:choose>
 
 				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">
-						<thead>
-						<tr>
-							<th width="400px">鉴定内容</th>
-							<th width="200px">评价得分</th>
-						</tr>
-						</thead>
-						<tbody id="workRegularScoreList">
-						<c:if test="${not empty workRegularApply.workRegularScoreList}">
-							<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">
-								<tr id="workRegularScoreList${index.index}">
-									<td class="hide">
-										<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>
-										<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>
-										<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>
-									</td>
-									<c:choose>
-										<c:when test="${workRegularApply.act.taskDefKey eq 'ywbfzr'}">
-											<td>
-												<input id="workRegularScoreList${index.index}_score" onchange="getMoney(this.value,'1')"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>
-											</td>
-										</c:when>
-										<c:otherwise>
-											<td>
-												<form:input path="workRegularScoreList[${index.index}].score" id="workRegularScoreList${index.index}_score" htmlEscape="false" readonly="true" onchange="getMoney(this.value,'1')"    type="text" value="${workRegularScore.score}"   class="form-control"/>
-											</td>
-										</c:otherwise>
-									</c:choose>
+					<%--<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">--%>
+						<%--<thead>--%>
+						<%--<tr>--%>
+							<%--<th width="400px">鉴定内容</th>--%>
+							<%--<th width="200px">评价得分</th>--%>
+						<%--</tr>--%>
+						<%--</thead>--%>
+						<%--<tbody id="workRegularScoreList">--%>
+						<%--<c:if test="${not empty workRegularApply.workRegularScoreList}">--%>
+							<%--<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">--%>
+								<%--<tr id="workRegularScoreList${index.index}">--%>
+									<%--<td class="hide">--%>
+										<%--<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>--%>
+									<%--</td>--%>
+									<%--<c:choose>--%>
+										<%--<c:when test="${workRegularApply.act.taskDefKey eq 'ywbfzr'}">--%>
+											<%--<td>--%>
+												<%--<input id="workRegularScoreList${index.index}_score" onchange="getMoney(this.value,'1')"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>--%>
+											<%--</td>--%>
+										<%--</c:when>--%>
+										<%--<c:otherwise>--%>
+											<%--<td>--%>
+												<%--<form:input path="workRegularScoreList[${index.index}].score" id="workRegularScoreList${index.index}_score" htmlEscape="false" readonly="true" onchange="getMoney(this.value,'1')"    type="text" value="${workRegularScore.score}"   class="form-control"/>--%>
+											<%--</td>--%>
+										<%--</c:otherwise>--%>
+									<%--</c:choose>--%>
 
-								</tr>
-							</c:forEach>
-							<tr >
-								<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>
-								</td>
-								<td>
-									<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>
-								</td>
-							</tr>
-						</c:if>
-						</tbody>
-					</table>
+								<%--</tr>--%>
+							<%--</c:forEach>--%>
+							<%--<tr >--%>
+								<%--<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>--%>
+								<%--</td>--%>
+								<%--<td>--%>
+									<%--<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>--%>
+								<%--</td>--%>
+							<%--</tr>--%>
+						<%--</c:if>--%>
+						<%--</tbody>--%>
+					<%--</table>--%>
 
 				</div>
 			</div>

src/main/webapp/webpage/modules/workregularapply/workRegularApplyForm.jsp

@@ -188,6 +188,7 @@
 			<form:hidden path="id"/>
 			<form:hidden path="jobGrade.id" id="jobGradeId"/>
 			<form:hidden path="basicInfoId" id="basicInfoId"/>
+			<form:hidden path="userId" id="userId"/>
 			<form:hidden path="officeId" id="officeId"/>
 			<form:hidden path="correctOpinion" id="correctOpinion"/>
 			<div class="form-group layui-row first">
@@ -196,8 +197,9 @@
 					<label class="layui-form-label"><span class="require-item">*</span>姓名：</label>
 					<div class="layui-input-block with-icon">
 						<div class="input-group">
-							<sys:gridSelectUser id="userId" name="userId" value="${workRegularApply.userId}" labelName="name" labelValue="${workRegularApply.workStaffBasicInfo.name}"
-												 title="用户" url="${ctx}/sys/office/gridSelectUser" cssClass="form-control required layui-input" isAll="true" type="1"  isSingle="true"></sys:gridSelectUser>
+							<%--<sys:gridSelectUser id="userId" name="userId" value="${workRegularApply.userId}" labelName="name" labelValue="${workRegularApply.workStaffBasicInfo.name}"--%>
+												 <%--title="用户" url="${ctx}/sys/office/gridSelectUser" cssClass="form-control required layui-input" isAll="true" type="1"  isSingle="true"></sys:gridSelectUser>--%>
+								<input id="userName" readonly="true" name="userName" htmlEscape="false" class="form-control layui-input" value="${workRegularApply.workStaffBasicInfo.name}"/>
 						</div>
 					</div>
 					<%--<div class="layui-input-block with-icon">
@@ -274,7 +276,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">个人总结：</label>
 					<div class="layui-input-block">
-						<form:textarea path="summary" readonly="true" htmlEscape="false" rows="7"    maxlength="500" class="form-control "/>
+						<form:textarea path="summary"  htmlEscape="false" rows="7"    maxlength="500" class="form-control "/>
 					</div>
 				</div>
 			</div>
@@ -282,67 +284,67 @@
 			<div class="form-group layui-row view-form">
 				<div class="form-group-label"><h2>部门鉴定</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>
-						<div class="layui-input-block">
-							<input  htmlEscape="false" readonly="true"   class="form-control layui-input" value="正常"/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>
-						<div class="layui-input-block  with-icon">
-							<div class="input-group">
-								<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>
-							</div>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>
-						<div class="layui-input-block">
-								<input id="correctDate"  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"
-									   value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>
-						</div>
-					</div>
+					<%--<div class="layui-item layui-col-sm6">--%>
+						<%--<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>--%>
+						<%--<div class="layui-input-block">--%>
+							<%--<input  htmlEscape="false" readonly="true"   class="form-control layui-input" value="正常"/>--%>
+						<%--</div>--%>
+					<%--</div>--%>
+					<%--<div class="layui-item layui-col-sm6">--%>
+						<%--<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>--%>
+						<%--<div class="layui-input-block  with-icon">--%>
+							<%--<div class="input-group">--%>
+								<%--<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+					<%--</div>--%>
+					<%--<div class="layui-item layui-col-sm6">--%>
+						<%--<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>--%>
+						<%--<div class="layui-input-block">--%>
+								<%--<input id="correctDate"  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"--%>
+									   <%--value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>--%>
+						<%--</div>--%>
+					<%--</div>--%>
 					<div class="layui-item layui-col-sm12  with-textarea"style="margin-top: 20px">
 						<label class="layui-form-label">部门评语：</label>
 						<div class="layui-input-block">
 							<form:textarea path="comment" htmlEscape="false" rows="4"  readonly="true"   maxlength="255" class="form-control "/>
 						</div>
 					</div>
-					<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">
-						<thead>
-						<tr>
-							<th width="400px">鉴定内容</th>
-							<th width="200px">评价得分</th>
-						</tr>
-						</thead>
-						<tbody id="workRegularScoreList">
-						<c:if test="${not empty workRegularApply.workRegularScoreList}">
-							<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">
-								<tr id="workRegularScoreList${index.index}">
-									<td class="hide">
-										<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>
-										<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>
-										<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_score"  readonly="true"  name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>
-									</td>
-								</tr>
-							</c:forEach>
-							<tr >
-								<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>
-								</td>
-								<td>
-									<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>
-								</td>
-							</tr>
-						</c:if>
-						</tbody>
-					</table>
+					<%--<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">--%>
+						<%--<thead>--%>
+						<%--<tr>--%>
+							<%--<th width="400px">鉴定内容</th>--%>
+							<%--<th width="200px">评价得分</th>--%>
+						<%--</tr>--%>
+						<%--</thead>--%>
+						<%--<tbody id="workRegularScoreList">--%>
+						<%--<c:if test="${not empty workRegularApply.workRegularScoreList}">--%>
+							<%--<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">--%>
+								<%--<tr id="workRegularScoreList${index.index}">--%>
+									<%--<td class="hide">--%>
+										<%--<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_score"  readonly="true"  name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>--%>
+									<%--</td>--%>
+								<%--</tr>--%>
+							<%--</c:forEach>--%>
+							<%--<tr >--%>
+								<%--<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>--%>
+								<%--</td>--%>
+								<%--<td>--%>
+									<%--<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>--%>
+								<%--</td>--%>
+							<%--</tr>--%>
+						<%--</c:if>--%>
+						<%--</tbody>--%>
+					<%--</table>--%>
 
 				</div>
 			</div>

src/main/webapp/webpage/modules/workregularapply/workRegularApplyList.jsp

@@ -83,9 +83,11 @@
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<c:if test="${user.status eq '试用'}">
 					<shiro:hasPermission name="workregularapply:workRegularApply:add">
 						<a href="javascript:void(0)" onclick="openDialog('新增转正申请', '${ctx}/workregularapply/workRegularApply/form?tabId=1','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
 					</shiro:hasPermission>
+					</c:if>
 						<shiro:hasPermission name="workregularapply:workRegularApply:export">
 							<table:exportExcel url="${ctx}/workregularapply/workRegularApply/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>

src/main/webapp/webpage/modules/workregularapply/workRegularApplyModifyApply.jsp

@@ -252,40 +252,40 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>部门鉴定</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">
-						<thead>
-						<tr>
-							<th width="400px">鉴定内容</th>
-							<th width="200px">评价得分</th>
-						</tr>
-						</thead>
-						<tbody id="workRegularScoreList">
-						<c:if test="${not empty workRegularApply.workRegularScoreList}">
-							<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">
-								<tr id="workRegularScoreList${index.index}">
-									<td class="hide">
-										<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>
-										<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>
-										<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_score" onchange="getMoney(this.value,'1')"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>
-									</td>
-								</tr>
-							</c:forEach>
-							<tr >
-								<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>
-								</td>
-								<td>
-									<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>
-								</td>
-							</tr>
-						</c:if>
-						</tbody>
-					</table>
+					<%--<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">--%>
+						<%--<thead>--%>
+						<%--<tr>--%>
+							<%--<th width="400px">鉴定内容</th>--%>
+							<%--<th width="200px">评价得分</th>--%>
+						<%--</tr>--%>
+						<%--</thead>--%>
+						<%--<tbody id="workRegularScoreList">--%>
+						<%--<c:if test="${not empty workRegularApply.workRegularScoreList}">--%>
+							<%--<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">--%>
+								<%--<tr id="workRegularScoreList${index.index}">--%>
+									<%--<td class="hide">--%>
+										<%--<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_score" onchange="getMoney(this.value,'1')"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>--%>
+									<%--</td>--%>
+								<%--</tr>--%>
+							<%--</c:forEach>--%>
+							<%--<tr >--%>
+								<%--<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>--%>
+								<%--</td>--%>
+								<%--<td>--%>
+									<%--<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>--%>
+								<%--</td>--%>
+							<%--</tr>--%>
+						<%--</c:if>--%>
+						<%--</tbody>--%>
+					<%--</table>--%>
 					<div class="layui-item layui-col-sm12  with-textarea"style="margin-top: 20px">
 						<label class="layui-form-label">部门评语：</label>
 						<div class="layui-input-block">

src/main/webapp/webpage/modules/workregularapply/workRegularApplyView.jsp

@@ -118,63 +118,63 @@
 								<form:textarea path="comment" htmlEscape="false" rows="4" readonly="true"   maxlength="255" class="form-control "/>
 					</div>
 				</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>
-							<div class="layui-input-block">
-								<input  htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workRegularApply.correctOpinion, 'correct_opinion', '')}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>
-							<div class="layui-input-block  with-icon">
-								<div class="input-group">
-									<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>
-								</div>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>
-							<div class="layui-input-block">
-								<input id=""  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"
-									   value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>
-							</div>
-						</div>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>转正意见：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<input  htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workRegularApply.correctOpinion, 'correct_opinion', '')}"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label"><span class="require-item">*</span>新职级：</label>--%>
+							<%--<div class="layui-input-block  with-icon">--%>
+								<%--<div class="input-group">--%>
+									<%--<input id="jobGradeName" name="jobGrade.name" value="${workRegularApply.jobGrade.name}" readonly="true"  htmlEscape="false" class="form-control layui-input"/>--%>
+								<%--</div>--%>
+							<%--</div>--%>
+						<%--</div>--%>
+						<%--<div class="layui-item layui-col-sm6">--%>
+							<%--<label class="layui-form-label double-line"><span class="require-item">*</span>新试用期结束日期：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<input id=""  readonly="true" name="correctDate" type="text"  maxlength="20" class="laydate-icondate form-control layer-date  layui-input laydate-icon"--%>
+									   <%--value="<fmt:formatDate value="${workRegularApply.correctDate}" pattern="yyyy-MM-dd"/>"/>--%>
+							<%--</div>--%>
+						<%--</div>--%>
 
 				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">
-						<thead>
-						<tr>
-							<th width="400px">鉴定内容</th>
-							<th width="200px">评价得分</th>
-						</tr>
-						</thead>
-						<tbody id="workRegularScoreList">
-						<c:if test="${not empty workRegularApply.workRegularScoreList}">
-							<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">
-								<tr id="workRegularScoreList${index.index}">
-									<td class="hide">
-										<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>
-										<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>
-										<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>
-									</td>
-									<td>
-										<input id="workRegularScoreList${index.index}_score" readonly="true"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>
-									</td>
-								</tr>
-							</c:forEach>
-							<tr >
-								<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>
-								</td>
-								<td>
-									<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>
-								</td>
-							</tr>
-						</c:if>
-						</tbody>
-					</table>
+					<%--<table id="contentTable1" class="table table-bordered table-condensed can-edit no-bottom-margin">--%>
+						<%--<thead>--%>
+						<%--<tr>--%>
+							<%--<th width="400px">鉴定内容</th>--%>
+							<%--<th width="200px">评价得分</th>--%>
+						<%--</tr>--%>
+						<%--</thead>--%>
+						<%--<tbody id="workRegularScoreList">--%>
+						<%--<c:if test="${not empty workRegularApply.workRegularScoreList}">--%>
+							<%--<c:forEach items="${workRegularApply.workRegularScoreList}" var="workRegularScore" varStatus="index">--%>
+								<%--<tr id="workRegularScoreList${index.index}">--%>
+									<%--<td class="hide">--%>
+										<%--<input id="workRegularScoreList${index.index}_id" name="workRegularScoreList[${index.index}].id" type="hidden" value="${workRegularScore.id}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_regularContentId" name="workRegularScoreList[${index.index}].regularContentId" type="hidden" value="${workRegularScore.regularContentId}"/>--%>
+										<%--<input id="workRegularScoreList${index.index}_delFlag" name="workRegularScoreList[${index.index}].delFlag" type="hidden" value="0"/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_content"  readonly="true"   name="workRegularScoreList[${index.index}].content" type="text" value="${workRegularScore.content}"   class="form-control "/>--%>
+									<%--</td>--%>
+									<%--<td>--%>
+										<%--<input id="workRegularScoreList${index.index}_score" readonly="true"   name="workRegularScoreList[${index.index}].score" type="text" value="${workRegularScore.score}"   class="form-control number "/>--%>
+									<%--</td>--%>
+								<%--</tr>--%>
+							<%--</c:forEach>--%>
+							<%--<tr >--%>
+								<%--<td  style="vertical-align:middle;text-align: center;"><label><font color="red">*</font>合计得分：</label></td>--%>
+								<%--</td>--%>
+								<%--<td>--%>
+									<%--<input id="score"  readonly="true"   name="score" type="text" value="${workRegularApply.score}"   class="form-control "/>--%>
+								<%--</td>--%>
+							<%--</tr>--%>
+						<%--</c:if>--%>
+						<%--</tbody>--%>
+					<%--</table>--%>
 				</div>
 			</div>
 			<div class="form-group layui-row page-end"></div>