人员信息调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -188,4 +188,14 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
 //    Integer findKaiPiao(RuralProjectRecords ruralProjectRecords);
 
     void saveReportAuditContent(ProjectReportDataTwo projectReportData);
+
+    /**
+     * 修改报告的各个超期状态以及清除质量复核审核时间
+     * @param ruralProjectRecords
+     */
+    void updateAdminOverDueStatus(RuralProjectRecords ruralProjectRecords);
+
+    int updateAdminRuralProjectReportData(ProjectReportData projectReportData);
+
+    int updateAdminRuralProjectReportDataTwo(ProjectReportDataTwo projectReportData);
 }

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

@@ -1910,7 +1910,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             projectReportData.setStatus("1");
             projectReportData.setProcessInstanceId("");
             projectReportData.setAuditPassDate(null);
-            dao.updateRuralProjectReportData(projectReportData);
+            projectReportData.setFirstAuditDate(null);
+            dao.updateAdminRuralProjectReportData(projectReportData);
             dao.updateFileStatus(projectReportData);
             //修改报告签发状态
             if (reportDataTwo != null){
@@ -1923,7 +1924,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 //修改报告签发
                 reportDataTwo.setStatus("1");
                 reportDataTwo.setProcessInstanceId("");
-                dao.updateRuralProjectReportDataTwo(reportDataTwo);
+                reportDataTwo.setAuditPassDate(null);
+                dao.updateAdminRuralProjectReportDataTwo(reportDataTwo);
 
                 //将撤回前的流程进行保存
                 ruralProjectAdminRevoke2.setId(IdGen.uuid());
@@ -2007,6 +2009,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             dao.insertAdminRevoke(ruralProjectAdminRevoke4);
 
+            //修改报告的各个超期状态以及清除质量复核审核时间
+            dao.updateAdminOverDueStatus(projectRecords);
+
 
         }catch (ActivitiObjectNotFoundException e){
             System.err.println("报告撤销异常，因为这个流程已不存在!");

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -1840,7 +1840,7 @@ public class UserUtils {
 		Role rsbzr = new Role();
 		Office office = new Office();
 		office.setId(comId);
-		rsbzr.setEnname("rsbzr");
+		rsbzr.setEnname("rlzygly");
 		rsbzr.setCompany(office);
 		Role role = roleDao.getByEnname(rsbzr);
 		List<User> users = userDao.findUserByRoleId(role.getId(), comId);

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -18,20 +18,19 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.sys.dao.UserDao;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.SystemConfig;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.security.FormAuthenticationFilter;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemConfigService;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import io.swagger.client.model.NewPassword;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -521,6 +520,19 @@ public class UserController extends BaseController {
                 workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
             }
         }
+
+        List<WorkStaffCertificate> list = workStaffBasicInfo.getCertificateList();
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate workStaffCertificate : list) {
+            if(StringUtils.isNotBlank(workStaffCertificate.getMajor())){
+                for (MainDictDetail mainDictDetail : certificateMajor) {
+                    if(workStaffCertificate.getMajor().equals(mainDictDetail.getValue())){
+                        workStaffCertificate.setMajor(mainDictDetail.getLabel());
+                    }
+                }
+            }
+        }
         model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
         return "modules/sys/userInfo";
     }

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

@@ -7711,6 +7711,23 @@ public class WorkProjectNotifyController extends BaseController {
 						if (StringUtils.isNotBlank(workStaffBasicInfo.getId())) {
 							workStaffBasicInfoService.queryDetailsApply(workStaffBasicInfo);
 						}
+
+						List<Role> roleList = Lists.newArrayList();
+						List<String> roleNameList = Lists.newArrayList();
+						List<String> roleIdList = Lists.newArrayList();
+						List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+						for (String roleId : roleIdByUserIdList) {
+							Role role = roleService.get(roleId);
+							roleList.add(role);
+							roleNameList.add(role.getName());
+							roleIdList.add(role.getId());
+						}
+						String roleNameStr = StringUtils.join(roleNameList, "，");
+						String roleIdStr = StringUtils.join(roleIdList, "，");
+
+						workStaffBasicInfo.setRoleId(roleIdStr);
+						workStaffBasicInfo.setRoleName(roleNameStr);
+
 						workStaffBasicInfo.setHome("home");
 						model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 						return "modules/workstaff/workStaffBasicDetailAudit";

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

@@ -188,6 +188,20 @@ public class WorkStaffAchievementService extends CrudService<WorkStaffAchievemen
                                     setReadOnly.invoke(workStaffAchievement,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffAchievement.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffAchievement,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffAchievement.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffAchievement,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -354,6 +354,20 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                                     setReadOnly.invoke(workStaffCertificate,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffCertificate.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffCertificate,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffCertificate.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffCertificate,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {
@@ -465,6 +479,9 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                                 try {
                                     Object newInvoke = newClass.getMethod(methodName).invoke(newCertificate);//修改后
                                     Object oldInvoke = oldClass.getMethod(methodName).invoke(oldCertificate);//修改前
+                                    if(null == oldInvoke){
+                                        oldInvoke = "";
+                                    }
                                     String describes=EDU_MAP.get(name);
                                     if(newInvoke instanceof String){
                                         String newValue=newInvoke.toString();
@@ -490,7 +507,7 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                                         if(newInvoke!=null){
                                             newDate=sdf.format(newInvoke);
                                         }
-                                        if (oldInvoke!=null){
+                                        if (oldInvoke!=null && StringUtils.isNotBlank(oldInvoke.toString())){
                                             oldDate=sdf.format(oldInvoke);
                                         }
                                         if(!newDate.equals(oldDate)){

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

@@ -226,6 +226,20 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                                     setReadOnly.invoke(workStaffEducation,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffEducation.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffEducation,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffEducation.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffEducation,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -189,6 +189,20 @@ public class WorkStaffExperienceService extends CrudService<WorkStaffExperienceD
                                     setReadOnly.invoke(workStaffExperience,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffExperience.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffExperience,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffExperience.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffExperience,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -187,6 +187,20 @@ public class WorkStaffFamilyService extends CrudService<WorkStaffFamilyDao, Work
                                     setReadOnly.invoke(workStaffFamily,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffFamily.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffFamily,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffFamily.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffFamily,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -236,6 +236,20 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
                                     setReadOnly.invoke(workStaffLanguages,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffLanguages.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffLanguages,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffLanguages.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffLanguages,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -234,6 +234,20 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
                                     setReadOnly.invoke(workStaffRecord,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffRecord.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffRecord,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffRecord.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffRecord,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -189,6 +189,20 @@ public class WorkStaffRewardsService extends CrudService<WorkStaffRewardsDao, Wo
                                     setReadOnly.invoke(workStaffRewards,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffRewards.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffRewards,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffRewards.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffRewards,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -185,6 +185,20 @@ public class WorkStaffSocialPositionService extends CrudService<WorkStaffSocialP
                                     setReadOnly.invoke(workStaffSocialPosition,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffSocialPosition.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffSocialPosition,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffSocialPosition.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffSocialPosition,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -220,6 +220,20 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
                                     setReadOnly.invoke(workStaffTitle,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffTitle.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffTitle,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffTitle.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffTitle,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -83,27 +83,29 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
         }
         boolean flag=false;
         for (WorkStaffTraining entity : list) {
-            if(entity!=null&&"1".equals(entity.getDelFlag())&&StringUtils.isBlank(entity.getId())){
+            if(entity == null || StringUtils.isBlank(entity.getName()) || StringUtils.isBlank(entity.getType()) || StringUtils.isBlank(entity.getCertificate())){
                 continue;
             }
-            if(entity!=null&&"1".equals(entity.getDelFlag())){
+            if("1".equals(entity.getDelFlag())&&StringUtils.isBlank(entity.getId())){
+                continue;
+            }
+            if("1".equals(entity.getDelFlag())){
                 dao.deleteByLogic(entity);
                 continue;
             }
-            if (entity!=null){
-                if(entity.getFile()!=null&&!entity.getFile().isEmpty()&&entity.getFile().getSize()>0){
-                    MultipartFile file = entity.getFile();
-                    entity.setFileName(file.getOriginalFilename());
-                    entity.setFilePath(this.uploadFile(file,entity.getFilePath()));
-                }
-                entity.setStaff(workStaffBasicInfo.getId());
-                this.save(entity);
-                if(first){
-                    entity.setId(null);
-                    entity.setFilePath("");
-                }
-                flag = true;
+
+            if(entity.getFile()!=null&&!entity.getFile().isEmpty()&&entity.getFile().getSize()>0){
+                MultipartFile file = entity.getFile();
+                entity.setFileName(file.getOriginalFilename());
+                entity.setFilePath(this.uploadFile(file,entity.getFilePath()));
             }
+            entity.setStaff(workStaffBasicInfo.getId());
+            this.save(entity);
+            if(first){
+                entity.setId(null);
+                entity.setFilePath("");
+            }
+            flag = true;
         }
         return flag;
     }
@@ -224,6 +226,20 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
                                     setReadOnly.invoke(workStaffTraining,myDate);
                                 }
                             }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffTraining.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffTraining,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    Method setReadOnly = workStaffTraining.getClass().getMethod(setMethod, Date.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                        setReadOnly.invoke(workStaffTraining,myDate);
+                                    }
+                                }
+                            }
                         } catch (NoSuchMethodException e) {
                             e.printStackTrace();
                         } catch (IllegalAccessException e) {

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

@@ -250,9 +250,16 @@ public class WorkStaffBasicInfoController extends BaseController {
 				}
 			}
 		}
-		Role role = roleService.get(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
-		workStaffBasicInfo.setRoleId(role.getId());
-		workStaffBasicInfo.setRoleName(role.getName());
+		List<Role> roleList = Lists.newArrayList();
+		List<String> roleNameList = Lists.newArrayList();
+		List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+		for (String roleId : roleIdByUserIdList) {
+			Role role = roleService.get(roleId);
+			roleList.add(role);
+			roleNameList.add(role.getName());
+		}
+		String roleNameStr = StringUtils.join(roleNameList, "，");
+		workStaffBasicInfo.setRoleName(roleNameStr);
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workStaffBasicInfoView";
 	}
@@ -262,9 +269,16 @@ public class WorkStaffBasicInfoController extends BaseController {
 //		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
 //			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
 //		}
-		Role role = roleService.get(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
-		workStaffBasicInfo.setRoleId(role.getId());
-		workStaffBasicInfo.setRoleName(role.getName());
+		List<Role> roleList = Lists.newArrayList();
+		List<String> roleNameList = Lists.newArrayList();
+		List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+		for (String roleId : roleIdByUserIdList) {
+			Role role = roleService.get(roleId);
+			roleList.add(role);
+			roleNameList.add(role.getName());
+		}
+		String roleNameStr = StringUtils.join(roleNameList, "，");
+		workStaffBasicInfo.setRoleName(roleNameStr);
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workAddressBookView";
 	}
@@ -696,6 +710,23 @@ public class WorkStaffBasicInfoController extends BaseController {
 		workStaffBasicInfo.setAchiveId(UserUtils.getBasicInfo().getId());
 		workStaffBasicInfo = workStaffBasicInfoService.getAchive(workStaffBasicInfo);
 		workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
+
+		List<Role> roleList = Lists.newArrayList();
+		List<String> roleNameList = Lists.newArrayList();
+		List<String> roleIdList = Lists.newArrayList();
+		List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+		for (String roleId : roleIdByUserIdList) {
+			Role role = roleService.get(roleId);
+			roleList.add(role);
+			roleNameList.add(role.getName());
+			roleIdList.add(role.getId());
+		}
+		String roleNameStr = StringUtils.join(roleNameList, "，");
+		String roleIdStr = StringUtils.join(roleIdList, "，");
+
+		workStaffBasicInfo.setRoleId(roleIdStr);
+		workStaffBasicInfo.setRoleName(roleNameStr);
+
 		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
 			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
 		}
@@ -710,9 +741,23 @@ public class WorkStaffBasicInfoController extends BaseController {
 		workStaffBasicInfo.setAchiveId(UserUtils.getBasicInfo().getId());
 		workStaffBasicInfo = workStaffBasicInfoService.getAchive(workStaffBasicInfo);
 		workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
-		Role role = roleService.getRoleByUserId(workStaffBasicInfo.getUserId());
-		workStaffBasicInfo.setRoleId(role.getId());
-		workStaffBasicInfo.setRoleName(role.getName());
+
+		List<Role> roleList = Lists.newArrayList();
+		List<String> roleNameList = Lists.newArrayList();
+		List<String> roleIdList = Lists.newArrayList();
+		List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+		for (String roleId : roleIdByUserIdList) {
+			Role role = roleService.get(roleId);
+			roleList.add(role);
+			roleNameList.add(role.getName());
+			roleIdList.add(role.getId());
+		}
+		String roleNameStr = StringUtils.join(roleNameList, "，");
+		String roleIdStr = StringUtils.join(roleIdList, "，");
+
+		workStaffBasicInfo.setRoleId(roleIdStr);
+		workStaffBasicInfo.setRoleName(roleNameStr);
+
 		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
 			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
 		}
@@ -737,7 +782,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (workStaffBasicInfo.getPictureFile() == null || workStaffBasicInfo.getPictureFile().getSize() < 0) {
 			workStaffBasicInfo.setPicture("");
 		}
-		//workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
+		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
 		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
 		addMessage(redirectAttributes, "申请员工档案信息成功");
 		return "redirect:" + Global.getAdminPath() + "/home/?repage";

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

@@ -1880,4 +1880,36 @@
 		set audit_content = #{auditContent}
 		where id = #{id}
 	</update>
+
+	<update id="updateAdminOverDueStatus">
+		update rural_project_records
+		set
+			record_state = 0,
+			over_record_status = 0
+		where id = #{id}
+	</update>
+
+	<update id="updateAdminRuralProjectReportData">
+		UPDATE project_report_data SET
+		status = #{status},
+		process_instance_id = #{processInstanceId},
+		audit_pass_date = #{auditPassDate},
+		first_audit_date = #{firstAuditDate}
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateAdminRuralProjectReportDataTwo">
+		UPDATE project_report_data_two SET
+			   update_by = #{updateBy.id},
+			   update_date = #{updateDate},
+			   remarks = #{remarks},
+			   company_id = #{companyId},
+			   office_id = #{officeId},
+			   project_id = #{project.id},
+			   status = #{status},
+			   audit_pass_date = #{auditPassDate},
+			   process_instance_id = #{processInstanceId}
+		WHERE id = #{id}
+	</update>
+
 </mapper>

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

@@ -1017,7 +1017,7 @@
 				xml+="<a href=\"#\" onclick=\"openDialogreAdmin('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/adminEditForm?projectId=" + d.id + "&view=edit','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发信息</a>";
 			}
 			//质量复核
-			if(d.projectReportStatus == 5){
+			if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 				xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/adminRevokeProjectReport?id=" + d.id +"&ppfId=" + d.ppfId +"&prrId=" + d.prrId + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告质量复核审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回质量复核</a>";
 			}
 			//报告签发

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

@@ -517,13 +517,13 @@
                                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
-                                    <div class="layui-item layui-col-sm6 lw7">
+                                    <%--<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 value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                                             <input value="${workStaffBasicInfo.calendar}" type="hidden" readonly="true" class="form-control  layui-input" />
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label">电子邮箱：</label>
                                         <div class="layui-input-block">
@@ -543,113 +543,115 @@
                                             <input name="phone" value="${workStaffBasicInfo.phone}" htmlEscape="false" readonly="true" 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>
+                                        <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                                         <div class="layui-input-block">
-                                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" 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>
+                                        <label class="layui-form-label">银行卡号：</label>
                                         <div class="layui-input-block">
-                                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="bankCard" value="${workStaffBasicInfo.bankCard}" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
                                         </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 with-icon">
-                                            <input name="jobGrade.name" htmlEscape="false" value="${workStaffBasicInfo.jobGrade.name}" readonly="true"  class="form-control layui-input required"/>
-                                            <input type="hidden" name="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                                        <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
+                                        <div class="layui-input-block">
+                                            <input name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" 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 with-icon">
-                                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                                        <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
+                                        <div class="layui-input-block">
+                                            <input name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label double-line">是否 TS人员：</label>
+                                        <label class="layui-form-label">籍    贯：</label>
                                         <div class="layui-input-block">
-                                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
+                                            <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" 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>
+                                        <label class="layui-form-label">户口所在地：</label>
                                         <div class="layui-input-block">
-                                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="household" value="${workStaffBasicInfo.household}" htmlEscape="false" readonly="true" 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>
+                                        <label class="layui-form-label">常住地址：</label>
                                         <div class="layui-input-block">
-                                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="address" value="${workStaffBasicInfo.address}" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                                        <label class="layui-form-label double-line">是否退伍军人：</label>
                                         <div class="layui-input-block">
-                                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="exSoldier" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
+
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">开户银行：</label>
+                                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                                         <div class="layui-input-block">
-                                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
-                                    <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">银行卡号：</label>
+                                    <%--<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 name="bankCard" value="${workStaffBasicInfo.bankCard}" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
+                                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" 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 name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control  layui-input" />
+                                        <label class="layui-form-label"><span class="require-item">*</span>职    级：</label>
+                                        <div class="layui-input-block with-icon">
+                                            <input name="jobGrade.name" htmlEscape="false" value="${workStaffBasicInfo.jobGrade.name}" readonly="true"  class="form-control layui-input required"/>
+                                            <input type="hidden" name="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
                                         </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 name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
+                                        <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
+                                        <div class="layui-input-block with-icon">
+                                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                                        <label class="layui-form-label double-line">是否 TS人员：</label>
                                         <div class="layui-input-block">
-                                            <input name="exSoldier" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">常住地址：</label>
+                                        <label class="layui-form-label"><span class="require-item">*</span>入职日期：</label>
                                         <div class="layui-input-block">
-                                            <input name="address" value="${workStaffBasicInfo.address}" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
-                                    <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">籍    贯：</label>
+                                    <%--<div class="layui-item layui-col-sm6 lw7">
+                                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
                                         <div class="layui-input-block">
-                                            <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
+                                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label">户口所在地：</label>
+                                        <label class="layui-form-label">开户银行：</label>
                                         <div class="layui-input-block">
-                                            <input name="household" value="${workStaffBasicInfo.household}" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
                                         </div>
                                     </div>
+
+
                                     <div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                                         <div class="layui-input-block">
                                             <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="form-control layui-input"
                                                    value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                                         </div>
-                                    </div>
+                                    </div>--%>
                                     <div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label double-line">试用期结束日期：</label>
                                         <div class="layui-input-block">
@@ -664,13 +666,13 @@
                                                    value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
                                         </div>
                                     </div>
-                                    <div class="layui-item layui-col-sm6 lw7">
+                                    <%--<div class="layui-item layui-col-sm6 lw7">
                                         <label class="layui-form-label double-line">考勤截止日期：</label>
                                         <div class="layui-input-block">
                                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                                         </div>
-                                    </div>
+                                    </div>--%>
                                 </div>
                                 <div class="form-group layui-row">
                                     <div class="form-group-label"><h2>教育经历</h2></div>

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

@@ -431,13 +431,13 @@
                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<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 value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                             <input value="${workStaffBasicInfo.calendar}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">电子邮箱：</label>
                         <div class="layui-input-block">
@@ -451,113 +451,128 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                        <label class="layui-form-label">座机：</label>
                         <div class="layui-input-block">
-                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                            <form:input path="phone" id="phone" placeholder=""  readonly="true"  htmlEscape="false"   class="form-control isTel  layui-input"  maxlength="50"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    位：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">
-                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    级：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                        <label class="layui-form-label">银行卡号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
                         </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 with-icon">
-                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
+                        <div class="layui-input-block">
+                            <input id="marriage" name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control basicInfo layui-input" />
                         </div>
                     </div>
-                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                        <%--<div class="layui-input-block">--%>
-                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
-                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" 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>
+                        <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
                         <div class="layui-input-block">
-                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input id="politics" name="politics" value="${workStaffBasicInfo.politics}"  readonly="true" class="form-control basicInfo 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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        <label class="layui-form-label">籍    贯：</label>
+                        <div class="layui-input-block ">
+                            <input id="nativePlaceName" name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input id="nativePlaceId" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" type="hidden" readonly="true" class="form-control basicInfo layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <label class="layui-form-label">户口所在地：</label>
                         <div class="layui-input-block">
-                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="household" htmlEscape="false" class="form-control layui-input basicInfo"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">开户银行：</label>
+                        <label class="layui-form-label">常住地址：</label>
                         <div class="layui-input-block">
-                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="address" htmlEscape="false" readonly="true" class="form-control layui-input basicInfo"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">银行卡号：</label>
+                        <label class="layui-form-label double-line">是否退伍军人：</label>
                         <div class="layui-input-block">
-                            <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
+                            <input id="exSoldierId" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control layui-input" />
+                            <input  id="exSoldier" name="exSoldier" value="${workStaffBasicInfo.exSoldier}" type="hidden" readonly="true" class="form-control basicInfo layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                         <div class="layui-input-block">
-                            <input id="marriage" name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control basicInfo layui-input" />
+                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" 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>
+                        <input name="roleId" value="${workStaffBasicInfo.roleId}" style="display: none"/>
+                        <label class="layui-form-label"><span class="require-item">*</span>岗    位：</label>
                         <div class="layui-input-block">
-                            <input id="politics" name="politics" value="${workStaffBasicInfo.politics}"  readonly="true" class="form-control basicInfo layui-input" />
+                            <input name="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    位：</label>
                         <div class="layui-input-block">
-                            <input id="exSoldierId" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control layui-input" />
-                            <input  id="exSoldier" name="exSoldier" value="${workStaffBasicInfo.exSoldier}" type="hidden" readonly="true" class="form-control basicInfo layui-input" />
+                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">常住地址：</label>
-                        <div class="layui-input-block">
-                            <form:input path="address" htmlEscape="false" readonly="true" class="form-control layui-input basicInfo"/>
+                        <label class="layui-form-label">职    级：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">籍    贯：</label>
-                        <div class="layui-input-block ">
-                            <input id="nativePlaceName" name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input id="nativePlaceId" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" type="hidden" readonly="true" class="form-control basicInfo layui-input" />
+                        <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
+                        <div class="layui-input-block with-icon">
+                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        </div>
+                    </div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" 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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <div class="layui-input-block">
+                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">户口所在地：</label>
+                        <label class="layui-form-label">开户银行：</label>
                         <div class="layui-input-block">
-                            <form:input path="household" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
+
+
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                         <div class="layui-input-block">
                             <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">试用期结束日期：</label>
                         <div class="layui-input-block">
@@ -572,13 +587,13 @@
                                    value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">考勤截止日期：</label>
                         <div class="layui-input-block">
                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>
@@ -626,7 +641,7 @@
                                         <input name="educationList[${varStatus.index}].eduType" value="${education.eduType}" type="hidden" readonly="true" class="form-control  layui-input" />
                                     </td>
                                     <td style="text-align:center;">
-                                        <input id="educationList${varStatus.index}_startDate" name="educationList[${varStatus.index}].startDate"  type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                        <input id="educationList${varStatus.index}_startDate" name="educationList[${varStatus.index}].startDate"  type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                                value="<fmt:formatDate value="${education.startDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td style="text-align:center;">
@@ -829,6 +844,7 @@
                                         <input id="certificateList${varStatus.index}_delFlag" name="certificateList[${varStatus.index}].delFlag" type="hidden" value="0"/>
                                         <input id="certificateList${varStatus.index}_fileName" name="certificateList[${varStatus.index}].fileName" type="hidden" value="${certificate.fileName}"/>
                                         <input id="certificateList${varStatus.index}_filePath" name="certificateList[${varStatus.index}].filePath" type="hidden" value="${certificate.filePath}"/>
+                                        <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" type="hidden" value="${certificate.major}"/>
                                     </td>
                                     <td>
                                         <input id="certificateList${varStatus.index}_name" name="certificateList[${varStatus.index}].name" value="${certificate.name}" type="text" readonly="true" class="form-control  layui-input" />
@@ -851,7 +867,11 @@
                                         <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" readonly="true" class="form-control" value="${certificate.registNum}"/>
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" readonly="true" class="form-control" value="${certificate.major}"/>
+                                        <select  disabled readonly="true" class="form-control required">
+                                            <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                                <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                            </c:forEach>
+                                        </select>
                                     </td>
                                     <td>
                                         <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" readonly="true" class="form-control" value="${certificate.grade}"/>

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

@@ -360,7 +360,55 @@
                         <div class="layui-input-block">
                             <form:input path="address" htmlEscape="false" class="form-control layui-input basicInfo"/>
                         </div>
-                    </div><div class="layui-item layui-col-sm6 lw7">
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                        <div class="layui-input-block">
+                            <form:select path="exSoldier" class="form-control simple-select basicInfo">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </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 name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">岗   位：</label>
+                        <div class="layui-input-block ">
+                            <form:input path="roleName" htmlEscape="false" readonly="true" 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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line">试用期结束日期：</label>
+                        <div class="layui-input-block">
+                            <input id="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">离职日期：</label>
+                        <div class="layui-input-block">
+                            <input id="dimissionDate"  type="text" maxlength="20" readonly class="form-control layui-input"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
+                        </div>
+                    </div>
+
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">社保账号：</label>
                     <div class="layui-input-block">
                         <form:input path="socialSecurityId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
@@ -390,12 +438,7 @@
                             <form:input path="qqId" htmlEscape="false" class="form-control layui-input number" minlength="5" maxlength="10"/>
                         </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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
+
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">试用岗位：</label>
                         <div class="layui-input-block">
@@ -408,26 +451,6 @@
                             <form:input path="trialPeriod" htmlEscape="false" class="form-control layui-input number" maxlength="2"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">试用期结束日期：</label>
-                        <div class="layui-input-block">
-                            <input id="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
-                        </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 name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">岗   位：</label>
-                        <div class="layui-input-block ">
-                            <form:input path="roleName" htmlEscape="false" readonly="true" 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">
@@ -439,7 +462,7 @@
                         <div class="layui-input-block">
                             <form:textarea path="individualResume" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                         </div>
-                    </div>
+                    </div>--%>
 
 
 
@@ -481,15 +504,7 @@
                             <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">是否退伍军人：</label>
-                        <div class="layui-input-block">
-                            <form:select path="exSoldier" class="form-control simple-select basicInfo">
-                                <form:option value="" label=""/>
-                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </div>
-                    </div>
+
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                         <div class="layui-input-block">
@@ -498,13 +513,6 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">离职日期：</label>
-                        <div class="layui-input-block">
-                            <input id="dimissionDate"  type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">考勤截止日期：</label>
                         <div class="layui-input-block">
                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
@@ -1016,7 +1024,11 @@
                                         <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" class="form-control" value="${certificate.registNum}"/>
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" class="form-control" value="${certificate.major}"/>
+                                        <select name="certificateList[${varStatus.index}].major" id="certificateList${varStatus.index}_major" class="form-control required">
+                                            <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                                <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                            </c:forEach>
+                                        </select>
                                     </td>
                                     <td>
                                         <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" class="form-control" value="${certificate.grade}"/>
@@ -1072,7 +1084,11 @@
                                 <input id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
+                                    <select name="certificateList[{{idx}}].major" id="certificateList{{idx}}_major" class="form-control required">
+                                        <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                            <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                        </c:forEach>
+                                    </select>
                                 </td>
                                 <td>
                                 <input id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>

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

@@ -292,13 +292,13 @@
                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<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 value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                             <input value="${workStaffBasicInfo.calendar}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">电子邮箱：</label>
                         <div class="layui-input-block">
@@ -318,63 +318,12 @@
                         </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 name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    位：</label>
-                        <div class="layui-input-block">
-                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    级：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">基本工资：</label>
-                        <div class="layui-input-block with-icon">
-                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
-                        </div>
-                    </div>
-                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                        <%--<div class="layui-input-block">--%>
-                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
-                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" 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 name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" 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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
-                        <div class="layui-input-block">
-                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">开户银行：</label>
-                        <div class="layui-input-block">
-                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
-                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">银行卡号：</label>
                         <div class="layui-input-block">
                             <form:input path="bankCard" htmlEscape="false" readonly="true"  maxlength="30" class="form-control layui-input digits"/>
@@ -399,6 +348,26 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">籍    贯：</label>
+                        <div class="layui-input-block with-icon">
+                            <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                                                cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">户口所在地：</label>
+                        <div class="layui-input-block">
+                            <form:input path="household" placeholder="请输入户口所在地" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">常住地址：</label>
+                        <div class="layui-input-block">
+                            <form:input path="address" placeholder="请输入常住地址" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                        </div>
+                    </div>
+
+                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">是否退伍军人：</label>
                         <div class="layui-input-block">
                             <form:select path="exSoldier" class="form-control simple-select basicInfo">
@@ -408,30 +377,70 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">常住地址：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                         <div class="layui-input-block">
-                            <form:input path="address" placeholder="请输入常住地址" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">籍    贯：</label>
-                        <div class="layui-input-block with-icon">
-                            <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
-                                           cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
+                        <input name="roleId" value="${workStaffBasicInfo.roleId}" style="display: none"/>
+                        <label class="layui-form-label"><span class="require-item">*</span>岗    位：</label>
+                        <div class="layui-input-block">
+                            <input name="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">户口所在地：</label>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    位：</label>
                         <div class="layui-input-block">
-                            <form:input path="household" placeholder="请输入户口所在地" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    级：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                        </div>
+                    </div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">基本工资：</label>
+                        <div class="layui-input-block with-icon">
+                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        </div>
+                    </div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <div class="layui-input-block">
+                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">开户银行：</label>
+                        <div class="layui-input-block">
+                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>--%>
+
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                         <div class="layui-input-block">
                             <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
                                     style="background-color: #fff" placeholder="请输入从事本行业的日期" value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">试用期结束日期：</label>
@@ -447,13 +456,13 @@
                                    value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">考勤截止日期：</label>
                         <div class="layui-input-block">
                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>
@@ -954,7 +963,11 @@
                                         <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" class="form-control" value="${certificate.registNum}"/>
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" class="form-control" value="${certificate.major}"/>
+                                        <select name="certificateList[${varStatus.index}].major" id="certificateList${varStatus.index}_major" class="form-control required">
+                                            <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                                <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                            </c:forEach>
+                                        </select>
                                     </td>
                                     <td>
                                         <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" class="form-control" value="${certificate.grade}"/>
@@ -1010,7 +1023,11 @@
                                 <input id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
+                                    <select name="certificateList[{{idx}}].major" id="certificateList{{idx}}_major" class="form-control required">
+                                        <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                            <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                        </c:forEach>
+                                    </select>
                                 </td>
                                 <td>
                                 <input id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>

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

@@ -301,13 +301,13 @@
                         <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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 value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                         <input value="${workStaffBasicInfo.calendar}" type="hidden" readonly="true" class="form-control  layui-input" />
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">电子邮箱：</label>
                     <div class="layui-input-block">
@@ -328,70 +328,12 @@
                     </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 name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                        <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <input name="roleId" value="${workStaffBasicInfo.roleId}" style="display: none"/>
-                    <label class="layui-form-label"><span class="require-item">*</span>岗    位：</label>
-                    <div class="layui-input-block">
-                        <input name="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly="true" 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 name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">职    级：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                        <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">基本工资：</label>
-                    <div class="layui-input-block with-icon">
-                        <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
-                    </div>
-                </div>
-                <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                        <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
-                        <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" 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 name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" 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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
-                    <div class="layui-input-block">
-                        <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">开户银行：</label>
-                    <div class="layui-input-block">
-                        <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">银行卡号：</label>
                     <div class="layui-input-block">
                         <form:input path="bankCard" htmlEscape="false" readonly="true"  maxlength="30" class="form-control layui-input digits"/>
@@ -416,6 +358,26 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">籍    贯：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                                            title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" cssStyle="background-color: #fff" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">户口所在地：</label>
+                    <div class="layui-input-block">
+                        <form:input path="household" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">常住地址：</label>
+                    <div class="layui-input-block">
+                        <form:input path="address" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">是否退伍军人：</label>
                     <div class="layui-input-block">
                         <form:select path="exSoldier" class="form-control simple-select basicInfo">
@@ -425,30 +387,71 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">常住地址：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="address" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                        <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                        <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">籍    贯：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
+                    <input name="roleId" value="${workStaffBasicInfo.roleId}" style="display: none"/>
+                    <label class="layui-form-label"><span class="require-item">*</span>岗    位：</label>
+                    <div class="layui-input-block">
+                        <input name="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly="true" class="form-control  layui-input" />
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">户口所在地：</label>
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>职    位：</label>
                     <div class="layui-input-block">
-                        <form:input path="household" htmlEscape="false" class="form-control layui-input basicInfo"/>
+                        <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">职    级：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                        <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                    </div>
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">基本工资：</label>
+                    <div class="layui-input-block with-icon">
+                        <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                    </div>
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                        <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                    <div class="layui-input-block">
+                        <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                    </div>
+                </div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">开户银行：</label>
+                    <div class="layui-input-block">
+                        <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                    </div>
+                </div>--%>
+
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                     <div class="layui-input-block">
-                        <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
+                        <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
                                value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                     </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 name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">试用期结束日期：</label>
@@ -464,13 +467,13 @@
                                value="<fmt:formatDate value="${workStaffBasicInfo.dimissionDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">考勤截止日期：</label>
                     <div class="layui-input-block">
                         <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
-                </div>
+                </div>--%>
             </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>教育经历</h2></div>
@@ -918,9 +921,6 @@
             </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>执业资格证书</h2></div>
-                <div class="layui-item nav-btns">
-                    <a href=javascript:void(0); onclick="addRowCertificate('#certificateList',certificateIdx,certificateTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
-                </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="certificateTable" class="table table-bordered table-condensed can-edit">
                         <thead>
@@ -936,12 +936,11 @@
                             <th width="6%">等级</th>
                             <th width="6%">取得方式</th>
                             <th width="10%">文件</th>
-                            <th width="10%">操作</th>
                         </tr>
                         </thead>
                         <tbody id="certificateList">
                         <c:forEach items="${workStaffBasicInfo.certificateList}" var="certificate" varStatus="varStatus">
-                            <tr>
+                            <tr id="${certificate.id}">
                                 <td class="hide">
                                     <input type="hidden" id="certificateList${varStatus.index}_id" name="certificateList[${varStatus.index}].id" value="${certificate.id}">
                                     <input id="certificateList${varStatus.index}_delFlag" name="certificateList[${varStatus.index}].delFlag" type="hidden" value="0"/>
@@ -949,127 +948,46 @@
                                     <input id="certificateList${varStatus.index}_filePath" name="certificateList[${varStatus.index}].filePath" type="hidden" value="${certificate.filePath}"/>
                                 </td>
                                 <td>
-                                    <select name="certificateList[${varStatus.index}].name" id="certificateList${varStatus.index}_name" class="form-control required">
-                                        <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
-                                            <option value="${var.label}" <c:if test="${certificate.name eq var.label}">selected</c:if>>${var.label}</option>
-                                        </c:forEach>
-                                    </select>
+                                    <input id="certificateList${varStatus.index}_name" name="certificateList[${varStatus.index}].name" value="${certificate.name}" type="text" readonly="true" class="form-control  layui-input" />
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" class="form-control required" value="${certificate.num}"/>
+                                    <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" readonly="true" class="form-control required" value="${certificate.num}"/>
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" class="form-control required" value="${certificate.issuingAuthority}"/>
+                                    <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" readonly="true" class="form-control required" value="${certificate.issuingAuthority}"/>
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_issuingDate" name="certificateList[${varStatus.index}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                    <input id="certificateList${varStatus.index}_issuingDate" name="certificateList[${varStatus.index}].issuingDate" disabled type="text"  maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
                                            value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_registDate" name="certificateList[${varStatus.index}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
+                                    <input id="certificateList${varStatus.index}_registDate" name="certificateList[${varStatus.index}].registDate" disabled type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                            value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" class="form-control" value="${certificate.registNum}"/>
+                                    <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" readonly="true" class="form-control" value="${certificate.registNum}"/>
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_major" name="certificateList[${varStatus.index}].major" class="form-control" value="${certificate.major}"/>
+                                    <select name="certificateList[${varStatus.index}].major" id="certificateList${varStatus.index}_major" disabled readonly="true" class="form-control required">
+                                        <c:forEach items="${fns:getMainDictList('certificate_major')}" var="var">
+                                            <option value="${var.value}" <c:if test="${certificate.major eq var.value}">selected</c:if>>${var.label}</option>
+                                        </c:forEach>
+                                    </select>
                                 </td>
                                 <td>
-                                    <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" class="form-control" value="${certificate.grade}"/>
+                                    <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" readonly="true" class="form-control" value="${certificate.grade}"/>
                                 </td>
                                 <td>
-                                    <select name="certificateList[${varStatus.index}].issType" id="certificateList${varStatus.index}_issType" class="form-control">
-                                        <option value="考试" <c:if test="${'考试' eq certificate.issType}">selected</c:if>>考试</option>
-                                        <option value="考核" <c:if test="${'考核' eq certificate.issType}">selected</c:if>>考核</option>
-                                    </select>
+                                    <input id="certificateList${varStatus.index}_issType" name="certificateList[${varStatus.index}].issType" readonly="true" class="form-control required" value="${certificate.issType}"/>
                                 </td>
                                 <td class="text-left op-td">
-                                    <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList${varStatus.index}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList${varStatus.index}_fileName1"><c:if test="${not empty certificate.filePath}"><img src="${certificate.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePath}','90%','90%')" alt=""></c:if></span>
+                                    <span id="certificateList${varStatus.index}_fileName1"><c:if test="${not empty certificate.filePath}"><img src="${certificate.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePath}','90%','90%')" alt=""></c:if></span>
                                     <input id="certificateList${varStatus.index}_file" name="certificateList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                 </td>
-                                <td class="text-center op-td">
-                                    <a href=javascript:void(0); onclick="delRow(this, '#certificateList${varStatus.index}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-                                </td>
                             </tr>
                         </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/template" id="certificateTpl">//<!--
-                            <tr>
-                            <td class="hide">
-                                <input type="hidden" id="certificateList{{idx}}_id" name="certificateList[{{idx}}].id" value="{{row.id}}">
-                                <input id="certificateList{{idx}}_delFlag" name="certificateList[{{idx}}].delFlag" type="hidden" value="0"/>
-                                <input id="certificateList{{idx}}_fileName" name="certificateList[{{idx}}].fileName" type="hidden" value="{{row.fileName}}"/>
-                                <input id="certificateList{{idx}}_filePath" name="certificateList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
-                                </td>
-                                <td>
-                                <select name="certificateList[{{idx}}].name" id="certificateList{{idx}}_name" class="form-control required">
-                                <option value=""></option>
-                                <c:forEach items="${fns:getMainDictList('certificate_type')}" var="var">
-                                <option value="${var.label}">${var.label}</option>
-                            </c:forEach>
-                            </select>
-                            </td>
-                            <td>
-                            <input id="certificateList{{idx}}_num" name="certificateList[{{idx}}].num" class="form-control required" value="{{row.num}}"/>
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_issuingAuthority" name="certificateList[{{idx}}].issuingAuthority" class="form-control required" value="{{row.issuingAuthority}}"/>
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_issuingDate" name="certificateList[{{idx}}].issuingDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
-                            value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_registDate" name="certificateList[{{idx}}].registDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
-                            value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_registNum" name="certificateList[{{idx}}].registNum" class="form-control" value="{{row.registNum}}"/>
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_major" name="certificateList[{{idx}}].major" class="form-control" value="{{row.major}}"/>
-                                </td>
-                                <td>
-                                <input id="certificateList{{idx}}_grade" name="certificateList[{{idx}}].grade" class="form-control" value="{{row.grade}}"/>
-                                </td>
-                                <td>
-                                <select name="certificateList[{{idx}}].issType" id="certificateList{{idx}}_issType" class="form-control">
-                                <option value="考试" selected >考试</option>
-                                <option value="考核">考核</option>
-                            </select>
-                            </td>
-                            <td class="text-left op-td">
-                                <a class="op-btn op-btn-add" title="上传" onclick="this_upload_file_button('certificateList{{idx}}_file')"><i class="fa fa-plus"></i>&nbsp;上传</a><span id="certificateList{{idx}}_fileName1"></span>
-                                <input id="certificateList{{idx}}_file" name="certificateList[{{idx}}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
-                                </td>
-                                <td class="text-center op-td">
-                                <a href=javascript:void(0); onclick="delRow(this, '#certificateList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-                            </td>
-                            </tr>//-->
-                    </script>
-                    <script type="text/javascript">
-                        var certificateIdx = 0; var certificateTpl = $("#certificateTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                        function addRowCertificate(list, idx, tpl, row){
-                            if(idx==0) {
-                                certificateIdx = $("#certificateList tr").length;
-                                idx = certificateIdx;
-                            }
-                            bornTemplete(list, idx, tpl, row, idx);
-                            certificateIdx +=1;
-                            var startDateId = list+idx+"_issuingDate";
-                            var registDateId = list+idx+"_registDate";
-                            laydate.render({
-                                elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
-                                event: 'click' //响应事件。如果没有传入event，则按照默认的click
-                            });
-                            laydate.render({
-                                elem: registDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
-                                event: 'click' //响应事件。如果没有传入event，则按照默认的click
-                            });
-                        }
-                    </script>
                 </div>
             </div>
             <div class="form-group layui-row">

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

@@ -771,7 +771,7 @@
                         <form:input placeholder="请输入区域备注" path="areaRemark" htmlEscape="false" class="form-control layui-input" maxlength="64"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否获取其他服务待办：</label>
                     <div class="layui-input-block">
                         <form:select path="otherServiceFlag" class="form-control simple-select required">
@@ -779,7 +779,7 @@
                             <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
-                </div>
+                </div>--%>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否为地区负责人：</label>
                     <div class="layui-input-block">