Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -147,7 +147,7 @@ public class WorkInvoiceController extends BaseController {
 		workProjectNotify.setUser(UserUtils.getUser());
 		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
 		workProjectNotify.setRemarks("待审批");
-		//添加发票对应编号
+		//添加发票对应编号WorkStaffCertificate.java
 		workProjectNotify.setType("21");
 		//查询所有需要当前登录人进行处理的项目信息
 		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffCertificate.java

@@ -32,6 +32,7 @@ public class WorkStaffCertificate extends DataEntity<WorkStaffCertificate> {
     private String fileName;		// 文件名
     private MultipartFile file;
     private String idCard;		//身份证号
+    private Date endDate;		//结束时间
 
     public String getFileName() {
         return fileName;
@@ -165,4 +166,12 @@ public class WorkStaffCertificate extends DataEntity<WorkStaffCertificate> {
 	public void setIdCard(String idCard) {
 		this.idCard = idCard;
 	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
 }

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

@@ -55,6 +55,8 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
     @Autowired
     private UserDao userDao;
     @Autowired
+    private WorkStaffCertificateDao certificateDao;
+    @Autowired
     private WorkStaffBasicInfoDao workStaffBasicInfoDao;
 	public WorkStaffCertificate get(String id) {
 		return super.get(id);
@@ -72,6 +74,18 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
 	public void save(WorkStaffCertificate workStaffCertificate) {
 		super.save(workStaffCertificate);
 	}
+
+    @Transactional(readOnly = false)
+    public void saveAll(List<WorkStaffCertificate> workStaffCertificates) {
+	    for (WorkStaffCertificate certificate:workStaffCertificates){
+	        if("1".equals(certificate.getDelFlag())){
+                dao.deleteByLogic(certificate);
+                continue;
+            }else{
+                super.save(certificate);
+            }
+        }
+    }
 	
 	@Transactional(readOnly = false)
 	public void delete(WorkStaffCertificate workStaffCertificate) {

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

@@ -0,0 +1,828 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workstaff.web;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.bos.BOSClientUtil;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.oss.OSSClientUtil;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.sys.entity.MainDict;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.Role;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.RoleService;
+import com.jeeplus.modules.sys.service.SysRoleActivityService;
+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.wexinpackage.access.service.WeChatCallbackService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
+import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificateImport;
+import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
+import com.jeeplus.modules.workstaff.service.WorkStaffCertificateService;
+import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
+import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
+import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 员工基本信息Controller
+ * @author ssrh
+ * @version 2018-07-26
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/qualifications/qualifications")
+public class QualificationsController extends BaseController {
+	@Autowired
+	private WorkStaffBasicInfoService workStaffBasicInfoService;
+	@Autowired
+	private WorkStaffAchivesLogService workStaffAchivesLogService;
+	@Autowired
+	private WorkStaffAchivesLogDao workStaffAchivesLogDao;
+	@Autowired
+	private WorkProjectNotifyService workProjectNotifyService;
+    @Autowired
+    private SysImportInfoService sysImportInfoService;
+    @Autowired
+    private  RoleService roleService;
+	@Autowired
+	private UserService userService;
+    @Autowired
+	private WeChatCallbackService weChatCallbackService;
+    @Autowired
+	private WorkStaffCertificateService workStaffCertificateService;
+
+	@ModelAttribute
+	public WorkStaffBasicInfo get(@RequestParam(required=false) String id) {
+		WorkStaffBasicInfo entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = workStaffBasicInfoService.get(id);
+		}
+		if (entity == null){
+			entity = new WorkStaffBasicInfo();
+			entity.setId(id);
+		}
+		return entity;
+	}
+
+	/**
+	 * 资质管理列表页面
+	 */
+	@RequiresPermissions("qualifications:qualifications:list")
+	@RequestMapping(value = {"list", ""})
+	public String list(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
+		List<WorkStaffBasicInfo> list = page.getList();
+		model.addAttribute("page", page);
+		return "modules/workstaff/qualificationList";
+	}
+
+	/**
+	 * 编辑资质页面
+	 */
+	@RequiresPermissions(value={"qualifications:qualifications:edit"},logical=Logical.OR)
+	@RequestMapping(value = "form")
+	public String form(WorkStaffBasicInfo workStaffBasicInfo, Model model,boolean reFlag) {
+        if(StringUtils.isBlank(workStaffBasicInfo.getId())&&StringUtils.isNotBlank(workStaffBasicInfo.getAchiveId())) {
+            workStaffBasicInfo = workStaffBasicInfoService.getByAchiveId(workStaffBasicInfo);
+        }
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+		    workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+        }else {
+		    workStaffBasicInfo.setTs("0");
+		    workStaffBasicInfo.setPolitics("普通居民");
+		    workStaffBasicInfo.setExSoldier("0");
+		    workStaffBasicInfo.setMarriage("未婚");
+		    workStaffBasicInfo.setNation(DictUtils.getDictValue("汉族","nation_type",""));
+        }
+        workStaffBasicInfo.setRoleId(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+			model.addAttribute("updateFlag","1");
+		}
+		//查询岗位
+		Role role=roleService.get(workStaffBasicInfo.getRoleId());
+		workStaffBasicInfo.setRoleName(role.getName());
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/qualificationForm";
+	}
+    /**
+     * 查看，增加，编辑员工信息表单页面
+     */
+    @RequiresPermissions(value={"workstaff:workStaffBasicInfo:add","workstaff:workStaffBasicInfo:edit"},logical=Logical.OR)
+    @RequestMapping(value = "reform")
+    public String reform(WorkStaffBasicInfo workStaffBasicInfo, Model model) {
+        workStaffBasicInfo = workStaffBasicInfoService.queryAchive(workStaffBasicInfo);
+        workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+        if(StringUtils.isNotBlank(workStaffBasicInfo.getAchiveId())&&!workStaffBasicInfo.getId().equals(workStaffBasicInfo.getAchiveId())) {
+            //读取当前分公司劳务信息
+            workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
+            workStaffBasicInfoService.queryRelationShips(workStaffBasicInfo);
+        }else if(StringUtils.isBlank(workStaffBasicInfo.getAchiveId())){
+            //当前分公司没有档案记录
+            workStaffBasicInfo.setLabourList(new ArrayList<WorkRelationship>());
+        }
+        workStaffBasicInfo.setId(null);
+        workStaffBasicInfo.setOffice(null);
+        workStaffBasicInfo.setJobGrade(null);
+        workStaffBasicInfo.setSalary(null);
+        workStaffBasicInfo.setStatus(null);
+        workStaffBasicInfo.setEntryDate(null);
+        workStaffBasicInfo.setDimissionDate(null);
+        workStaffBasicInfo.setWorkEndDate(null);
+        model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+        return "modules/workstaff/workStaffBasicInfoForm";
+    }
+
+	/**
+	 * 查看，增加，编辑员工信息表单页面
+	 */
+	@RequestMapping(value = "view")
+	public String view(WorkStaffBasicInfo workStaffBasicInfo, Model model,boolean reFlag) {
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+            workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+        }
+		List<WorkStaffCertificate> certificateList = workStaffBasicInfo.getCertificateList();
+		List<MainDictDetail> certificateType = DictUtils.getMainDictList("certificate_type");
+		for (MainDictDetail type : certificateType) {
+			for (WorkStaffCertificate info: certificateList) {
+				if(info.getName().equals(type.getValue())){
+					info.setName(type.getLabel());
+					break;
+				}
+			}
+		}
+		Role role = roleService.get(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+		workStaffBasicInfo.setRoleId(role.getId());
+		workStaffBasicInfo.setRoleName(role.getName());
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/workStaffBasicInfoView";
+	}
+
+	@RequestMapping(value = "addressbookview")
+	public String addressbookview(WorkStaffBasicInfo workStaffBasicInfo, Model model,boolean reFlag) {
+//		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+//			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+//		}
+		Role role = roleService.get(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+		workStaffBasicInfo.setRoleId(role.getId());
+		workStaffBasicInfo.setRoleName(role.getName());
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/workAddressBookView";
+	}
+
+	/**
+	 * 查看，增加，编辑员工信息表单页面
+	 */
+	@RequestMapping(value = "achiveView")
+	public String achiveView(WorkStaffBasicInfo workStaffBasicInfo, Model model,boolean reFlag) {
+        workStaffBasicInfo = workStaffBasicInfoService.getAchive(workStaffBasicInfo);
+        workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+            workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+        }
+        model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/workStaffBasicInfoView";
+	}
+
+	/**
+	 * 保存资质信息
+	 */
+	@RequestMapping(value = "save")
+	public String save(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		if (0 != workStaffBasicInfo.getCertificateList().size()){
+			workStaffCertificateService.saveAll(workStaffBasicInfo.getCertificateList());
+		}
+		addMessage(redirectAttributes, "保存员工资质信息成功");
+        if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }
+		return "redirect:"+Global.getAdminPath()+"/qualifications/qualifications/?repage";
+	}
+
+	/**
+	 * 修改员工总审人员信息
+	 * @param workStaffBasicInfo
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "updateAuditUser")
+	@ResponseBody
+	public Map<String,Object> updateAuditUser(WorkStaffBasicInfo workStaffBasicInfo) throws Exception{
+		Map map = new HashMap();
+		WorkStaffBasicInfo t = workStaffBasicInfoService.get(workStaffBasicInfo.getId());//从数据库取出记录的值
+		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+		Integer result = workStaffBasicInfoService.updateAuditUser(t);//保存
+		if(result == 1){
+			map.put("msg","修改成功");
+		}else{
+			map.put("msg","修改失败");
+		}
+		return map;
+	}
+
+	/**
+	 * 查询总审人员信息
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "getAuditUserList")
+	@ResponseBody
+	public List<Map<String,Object>> getAuditUserList(){
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<User> auditUserList = userService.getAuditUserList();
+		/*Map mapNull = new HashMap();
+		mapNull.put("name","0");
+		mapNull.put("value","");
+		mapList.add(mapNull);*/
+		if(auditUserList.size()>0){
+			for (User user : auditUserList) {
+				Map map = new HashMap();
+				map.put("name",user.getId());
+				map.put("value",user.getName());
+				mapList.add(map);
+			}
+		}
+		return mapList;
+	}
+
+	/**
+	 * 保存员工信息
+	 */
+	@RequestMapping(value = "saveAchive")
+	public String saveAchive(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		if(!workStaffBasicInfo.getIsNewRecord()){//编辑表单保存
+            WorkStaffBasicInfo select = new WorkStaffBasicInfo();
+            select.setAchiveId(workStaffBasicInfo.getId());
+			WorkStaffBasicInfo t = workStaffBasicInfoService.getAchive(select);//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			workStaffBasicInfoService.saveAchive(t,request);//保存
+		}else{//新增表单保存
+			workStaffBasicInfoService.saveAchive(workStaffBasicInfo,request);//保存
+		}
+		addMessage(redirectAttributes, "保存员工档案信息成功");
+        if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+	}
+	//人员信息库用
+	@RequestMapping(value = "saveAchives")
+	public String saveAchives(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		if(!workStaffBasicInfo.getIsNewRecord()){//编辑表单保存
+			WorkStaffBasicInfo select = new WorkStaffBasicInfo();
+			select.setAchiveId(workStaffBasicInfo.getId());
+			WorkStaffBasicInfo t = workStaffBasicInfoService.getAchive(select);//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			workStaffBasicInfoService.saveAchive(t,request);//保存
+		}else{//新增表单保存
+			workStaffBasicInfoService.saveAchive(workStaffBasicInfo,request);//保存
+		}
+		addMessage(redirectAttributes, "保存员工档案信息成功");
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}
+		return "redirect:"+Global.getAdminPath()+"/workperson/workPerson/list?repage";
+	}
+	/**
+	 * 删除员工信息
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:del")
+	@RequestMapping(value = "delete")
+	public String delete(WorkStaffBasicInfo workStaffBasicInfo, RedirectAttributes redirectAttributes) {
+		workStaffBasicInfoService.delete(workStaffBasicInfo);
+//		AddressBookUtil.deleteUser(AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId,WeChatParamsUtil.contactsSecret),workStaffBasicInfo.getNo());
+		addMessage(redirectAttributes, "删除员工信息成功");
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+	}
+
+	/**
+	 * 批量删除员工信息
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:del")
+	@RequestMapping(value = "deleteAll")
+	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			workStaffBasicInfoService.delete(workStaffBasicInfoService.get(id));
+		}
+		addMessage(redirectAttributes, "删除员工信息成功");
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+	}
+
+	/**
+	 * 导出excel文件
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:export")
+    @RequestMapping(value = "exportAchive", method=RequestMethod.POST)
+    public String exportFile(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		try {
+            String fileName = "员工信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response, -1), workStaffBasicInfo);
+    		new ExportExcel(true,"员工信息", WorkStaffBasicInfo.class,1).setDataList(page.getList()).write(response, fileName).dispose();
+            addMessage(redirectAttributes, "导出员工信息记录成功！");
+    		return null;
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "导出员工信息记录失败！失败信息："+e.getMessage());
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+    }
+
+	/**
+	 * 导入Excel数据
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:achiveImport")
+    @RequestMapping(value = "importAchive", method=RequestMethod.POST)
+    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes,HttpServletRequest request) {
+		try {
+			int successNum = 0;
+			int failureNum = 0;
+			String userName = UserUtils.getUser().getName();
+            String date = DateUtils.getDate("yyyyMMddHHmmss");
+			StringBuilder failureMsg = new StringBuilder();
+			ImportExcel ei = new ImportExcel(file, 1, 0);
+			List<WorkStaffBasicInfo> list = ei.getDataList(WorkStaffBasicInfo.class);
+            List<WorkStaffBasicInfo> errlist = new ArrayList<>();
+			for (WorkStaffBasicInfo workStaffBasicInfo : list){
+				try{
+				    StringBuilder errInfo = new StringBuilder();
+				    if(workStaffBasicInfoService.validateStaff(workStaffBasicInfo,errInfo)) {
+                        workStaffBasicInfoService.saveAchive(workStaffBasicInfo, request);
+                        successNum++;
+                    }else {
+				        failureNum++;
+				        workStaffBasicInfo.setNowDate(date);
+				        workStaffBasicInfo.setErrInfo(errInfo.toString());
+				        workStaffBasicInfo.setUserName(userName);
+				        errlist.add(workStaffBasicInfo);
+                    }
+				}catch (Exception ex) {
+				    logger.error("解析导入数据失败：",ex);
+					failureNum++;
+                    workStaffBasicInfo.setNowDate(date);
+                    workStaffBasicInfo.setErrInfo(ex.getMessage());
+                    workStaffBasicInfo.setUserName(userName);
+                    errlist.add(workStaffBasicInfo);
+				}
+			}
+
+            SysImportInfo sysImportInfo = new SysImportInfo();
+            sysImportInfo.setCompanyId(UserUtils.getSelectCompany().getId());
+            sysImportInfo.setOfficeId(UserUtils.getSelectOffice().getId());
+            sysImportInfo.setModular("人员档案");
+            if (failureNum>0){
+                failureMsg.insert(0, "，失败 "+failureNum+" 个错误信息记录。");
+                ExportExcel exportExcel= new ExportExcel(false,"员工信息", WorkStaffBasicInfo.class, 1).setDataList(errlist);
+                OSSClientUtil ossUtil = new OSSClientUtil();
+
+                String fileName=date+"人员档案信息错误导入日志.xlsx";
+                String fileDir = "importInfo/workStaffBasicInfoImport/";
+                fileDir = fileDir+System.nanoTime()+"/";
+                try {
+                    ByteArrayOutputStream os = new ByteArrayOutputStream();
+                    exportExcel.write(os);
+                    byte[] content = os.toByteArray();
+                    InputStream inputStream = new ByteArrayInputStream(content);
+                    ossUtil.uploadFile2OSS(inputStream,fileDir, fileName);
+                }catch (Exception e1){
+                    logger.error("人员档案信息错误导入日志文件上传失败！",e1);
+                }
+
+                String name = Global.getAliyunUrl()+"/"+fileDir+fileName;
+                logger.info("name:"+name);
+                sysImportInfo.setUrl(name);
+                sysImportInfo.setFileName(fileName);
+                sysImportInfo.setErrCount(failureNum+"");
+                sysImportInfo.setIsTrue("0");
+            }else {
+                sysImportInfo.setIsTrue("1");
+                sysImportInfo.setErrCount("0");
+            }
+            String info = "已成功导入 "+successNum+" 条人员档案信息记录，失败 "+failureNum+" 个错误信息记录。";
+            sysImportInfo.setErrInfo(info);
+            sysImportInfoService.save(sysImportInfo);
+
+			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条人员档案信息记录"+failureMsg);
+		} catch (Exception e) {
+		    logger.error("导入人员档案信息失败！",e);
+			addMessage(redirectAttributes, "导入人员档案信息失败！失败信息："+e.getMessage());
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+    }
+
+	/**
+	 * 下载导入员工信息数据模板
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:achiveImport")
+    @RequestMapping(value = "importAchive/template")
+    public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		try {
+            String fileName = "员工档案信息导入模板.xlsx";
+    		List<WorkStaffBasicInfo> list = Lists.newArrayList();
+    		new ExportExcel(true,"员工档案信息", WorkStaffBasicInfo.class, 2).setDataList(list).write(response, fileName).dispose();
+    		return null;
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+    }
+
+
+	/**
+	 * 下载导入员工信息数据模板
+	 */
+	@RequestMapping(value = "import/template")
+	public String importTemplate(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("职业资格证书表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("职业资格证书表模板下载失败！",e);
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+	}
+
+	/**
+	 * 导入职业资格证信息
+	 * @param file
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "import", method=RequestMethod.POST)
+	public Object importWorkStaffBasicInfo(MultipartFile file, RedirectAttributes redirectAttributes,HttpServletRequest request) {
+		ResponseEntity<WorkStaffCertificateImport> responseEntity = new ResponseEntity<>();
+		int failureNum = 0;
+		try {
+			ImportExcel ei = new ImportExcel(file, 1, 0);
+			List<WorkStaffCertificateImport> list = ei.getDataList(WorkStaffCertificateImport.class);
+			List<WorkStaffCertificateImport> listAll = new ArrayList<>();
+			for (WorkStaffCertificateImport info : list) {
+				try {
+					if (StringUtils.isNotBlank(info.getUserName()) && null != info.getName() && null != info.getNum() && null != info.getIssuingDate()) {
+						listAll.add(info);
+					} else {
+						failureNum++;
+					}
+				} catch (Exception e) {
+					failureNum++;
+				}
+			}
+			//对数据进行新增修改处理
+			Map<String, List<String>> listMap = workStaffCertificateService.saveByImport(listAll);
+			List<String> nullUser = listMap.get("nullUser");
+			List<String> multitudeUser = listMap.get("multitudeUser");
+			List<String> multitudeHold = listMap.get("multitudeHold");
+			List<String> updateUser = listMap.get("updateUser");
+			//计算新增和修改成功的数量（总量减去查无此人和人员数量超过1的数据量）
+			Integer successCount = listAll.size() -(nullUser.size() + multitudeHold.size());
+			//处理成员名数量超过1人的数据
+			String multitudeStr = String.join("，", multitudeUser);
+			//处理修改信息的数据
+			String updateStr = String.join("，", updateUser);
+
+			StringBuffer promptSB = new StringBuffer();
+			if(successCount>0){
+				promptSB.append("新增成功 "+ successCount + " 条数据。");
+			}
+			if(failureNum>0){
+				promptSB.append("有 "+ failureNum + " 条数据填写不正确，无法添加。");
+			}
+			if(nullUser.size()>0){
+				promptSB.append("有 "+ nullUser.size() + " 条数据查无此人，无法添加。");
+			}
+			if(multitudeUser.size()>0){
+				promptSB.append(multitudeStr + " 人员存在名称重复，无法添加。");
+			}
+			if(updateUser.size()>0){
+				promptSB.append(updateStr + " 数据已存在，已进行更新。");
+			}
+			responseEntity.setCode(0);
+			responseEntity.setMessage(promptSB.toString());
+		} catch (Exception e) {
+			responseEntity.setCode(400);
+			responseEntity.setMessage("导入执业资格证信息失败！");
+			logger.error("导入执业资格证信息失败！",e);
+		}
+		return responseEntity;
+	}
+
+    @RequestMapping("idCard")
+    @ResponseBody
+	public AjaxJson idCard(String idCard){
+	    AjaxJson ajaxJson = new AjaxJson();
+	    WorkStaffBasicInfo obj = workStaffBasicInfoService.findByIdCardAndCom(idCard);
+	    if(obj==null){
+	        ajaxJson.getBody().put("exist",false);
+        }else {
+	        ajaxJson.getBody().put("exist",true);
+            ajaxJson.getBody().put("id",obj.getId());
+            if("离职".equals(obj.getStatus())||"退休".equals(obj.getStatus())){
+	            ajaxJson.getBody().put("onJob",false);
+            }else {
+                ajaxJson.getBody().put("onJob",true);
+            }
+        }
+	    return ajaxJson;
+    }
+
+    /**
+     * 员工档案列表页面
+     */
+    @RequiresPermissions("workstaff:workStaffBasicInfo:achivelist")
+    @RequestMapping(value = {"achivelist"})
+    public String achivelist(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findAchivePage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
+        model.addAttribute("page", page);
+        return "modules/workstaff/workStaffAchivesList";
+    }
+
+    /**
+     * 批量删除员工信息
+     */
+    @RequiresPermissions("workstaff:workStaffBasicInfo:achivelist")
+    @RequestMapping(value = "complete")
+    public String complete(String achiveIds, RedirectAttributes redirectAttributes) {
+        workStaffBasicInfoService.complete(achiveIds);
+        addMessage(redirectAttributes, "通知员工成功");
+        return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
+    }
+
+	@RequestMapping(value = "applyEdit")
+	public String applyEdit(Model model) {
+		WorkStaffBasicInfo workStaffBasicInfo=new WorkStaffBasicInfo();
+		workStaffBasicInfo.setAchiveId(UserUtils.getBasicInfo().getId());
+		workStaffBasicInfo = workStaffBasicInfoService.getAchive(workStaffBasicInfo);
+		workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+		}
+		workStaffBasicInfo.setHome("home");
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/workStaffBasicDetailModify";
+	}
+
+	@RequestMapping(value = "applyEditDirectly")
+	public String applyEditDirectly(Model model) {
+		WorkStaffBasicInfo workStaffBasicInfo=new WorkStaffBasicInfo();
+		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());
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+		}
+		workStaffBasicInfo.setHome("home");
+		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		return "modules/workstaff/workStaffBasicDetailModifyDirectly";
+	}
+
+	/**
+	 * 保存员工信息
+	 */
+	@RequestMapping(value = "saveAchiveBack")
+	public String saveAchiveBack(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
+			workProjectNotifyService.readByNotifyId(workProjectNotify);
+		}
+		if (workStaffBasicInfo.getPictureFile() == null || workStaffBasicInfo.getPictureFile().getSize() < 0) {
+			workStaffBasicInfo.setPicture("");
+		}
+		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
+		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
+		addMessage(redirectAttributes, "申请员工档案信息成功");
+		return "redirect:" + Global.getAdminPath() + "/home/?repage";
+	}
+
+	/**
+	 * 保存员工信息
+	 */
+	@RequestMapping(value = "saveAchiveModify")
+	public String saveAchiveModify(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
+			workProjectNotifyService.readByNotifyId(workProjectNotify);
+		}
+		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
+		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
+		addMessage(redirectAttributes, "申请员工档案信息成功");
+		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
+	}
+
+	/**
+	 * 我的信息-直接修改员工信息
+	 */
+	@RequestMapping(value = "saveAchiveModifyDirectly")
+	public String saveAchiveModifyDirectly(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+        MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
+        if(pictureFile != null && pictureFile.getSize()>0){
+            String path = new StringBuilder("/employeeImg/")
+                    .append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
+            InputStream inputStream = pictureFile.getInputStream();
+            BOSClientUtil bosClientUtil = new BOSClientUtil();
+            String url = bosClientUtil.upload(path, inputStream);
+            workStaffBasicInfo.setPicture(url);
+        }
+
+		String achieveId = workStaffBasicInfo.getId();
+		WorkStaffBasicInfo t = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
+		String staffId = t.getId();
+		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+		t.setAchiveId(achieveId);
+		t.setId(staffId);
+		workStaffBasicInfoService.updateAchieveDirectly(t,request);
+		addMessage(redirectAttributes, "保存员工档案信息成功");
+
+		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
+	}
+
+	@RequestMapping("getChange")
+	@ResponseBody
+	public WorkStaffAchivesLog
+	getChange(String name,String achiveId) throws ParseException {
+		Map<String,String> map=new HashMap<>();
+		WorkStaffAchivesLog workStaffAchivesLog=new WorkStaffAchivesLog();
+		workStaffAchivesLog.setStaffId(achiveId);
+		workStaffAchivesLog.setModule("基本信息");
+		workStaffAchivesLog.setFields(name);
+		workStaffAchivesLog.setState("1");
+		String value="";
+		WorkStaffAchivesLog log=new WorkStaffAchivesLog();
+		if(name!=null&&!name.equals("")){
+			List<WorkStaffAchivesLog> logs=workStaffAchivesLogService.findList(workStaffAchivesLog);
+			if(logs!=null&&logs.size()>0){
+				log.setNewValue(logs.get(0).getNewValue());
+				log.setNewKey(logs.get(0).getNewKey());
+			}
+		}
+		return  log;
+	}
+	@RequestMapping("getEdu")
+	@ResponseBody
+	public boolean getEdu(String id,String achiveId,String module) throws ParseException {
+		boolean falt=false;
+		WorkStaffAchivesLog workStaffAchivesLog=new WorkStaffAchivesLog();
+		workStaffAchivesLog.setStaffId(achiveId);
+		workStaffAchivesLog.setModule(module);
+		workStaffAchivesLog.setSonId(id);
+		workStaffAchivesLog.setState("1");
+		List<WorkStaffAchivesLog> logs=workStaffAchivesLogService.findList(workStaffAchivesLog);
+			if(logs!=null&&logs.size()>0){
+				falt=true;
+			}
+		return  falt;
+	}
+	@RequestMapping("getApply")
+	@ResponseBody
+	public boolean getApply() throws ParseException {
+		boolean falt=false;
+		WorkStaffAchivesLog workStaffAchivesLog=new WorkStaffAchivesLog();
+		workStaffAchivesLog.setStaffId(UserUtils.getBasicInfo().getId());
+		workStaffAchivesLog.setState("1");
+		List<WorkStaffAchivesLog> logs=workStaffAchivesLogService.findList(workStaffAchivesLog);
+		if(logs!=null&&logs.size()>0){
+			falt=true;
+		}
+		return  falt;
+	}
+	/**
+	 * 保存员工信息
+	 */
+	@RequestMapping(value = "pass")
+	public String pass(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (!beanValidator(model, workStaffBasicInfo)){
+			return form(workStaffBasicInfo, model,false);
+		}
+		WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());
+		WorkStaffBasicInfo select = new WorkStaffBasicInfo();
+		select.setAchiveId(workStaffBasicInfo.getId());
+		WorkStaffBasicInfo t = workStaffBasicInfoService.getAchive(select);//从数据库取出记录的值
+		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+		workStaffBasicInfoService.saveAchiveApply(t, request);//保存
+		t.setId(basicInfo.getId());
+		workStaffBasicInfoService.save(t);
+		addMessage(redirectAttributes, "保存员工档案信息成功");
+		return "redirect:" + Global.getAdminPath() + "/home/?repage";
+	}
+	@RequestMapping(value = "back")
+	public String back(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
+			workProjectNotifyService.readByNotifyId(workProjectNotify);
+		}
+		workStaffBasicInfoService.complete(workStaffBasicInfo.getId());
+		workStaffAchivesLogDao.deleteBack(workStaffBasicInfo.getId());
+		addMessage(redirectAttributes, "驳回成功");
+		return "redirect:" + Global.getAdminPath() + "/home/?repage";
+	}
+
+    /**
+     * 查看导入客户管理数据信息
+     */
+    //@RequiresPermissions("importInfo:importInfo:importInfoErr")
+    @RequestMapping(value = "importInfoErr")
+    public String importInfoErr(SysImportInfo sysImportInfo,HttpServletRequest request, HttpServletResponse response, Model model) {
+        SysImportInfo importInfo = new SysImportInfo();
+        importInfo.setModular("人员档案");
+        Page<SysImportInfo> page = sysImportInfoService.findPage(new Page<SysImportInfo>(request, response), importInfo);
+        model.addAttribute("page", page);
+        model.addAttribute("modular", "人员档案");
+        return "modules/sysimportinfo/sysimportinfoList";
+    }
+
+	/**
+	 * 手机号验证
+	 */
+	@ResponseBody
+	@RequestMapping(value = "checkMobile")
+	public String checkMoblie(WorkStaffBasicInfo workStaffBasicInfo) {
+		List<WorkStaffBasicInfo> workStaffBasicInfos = workStaffBasicInfoService.findByMob(workStaffBasicInfo);
+		if(workStaffBasicInfos != null && workStaffBasicInfos.size()>0){
+			return "false";
+		}
+		return "true";
+	}
+
+	/**
+	 * 重名跳转
+	 */
+	@RequestMapping(value = "repeatName")
+	public String repeatName(String name,Model model) throws UnsupportedEncodingException {
+		String name1 = URLDecoder.decode(name, "utf8");
+		List<WorkStaffBasicInfo> list = workStaffBasicInfoService.findByName(name1);
+		model.addAttribute("list",list);
+		return "modules/workstaff/infoList";
+	}
+
+	/**
+	 *员工通讯录展示
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:addressbook")
+	@RequestMapping(value = "addressbook")
+	public String addressBook(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findAddressBook(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
+		model.addAttribute("page", page);
+		return "modules/workstaff/workAddressBookList";
+	}
+}

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

@@ -21,7 +21,8 @@
 		a.grade AS "grade",
 		a.iss_type AS "issType",
 		a.file_path AS "filePath",
-		a.file_name AS "fileName"
+		a.file_name AS "fileName",
+		a.end_date As "endDate"
 	</sql>
 	
 	<sql id="workStaffCertificateJoins">
@@ -101,7 +102,8 @@
 			grade,
 			iss_type,
 			file_path,
-			file_name
+			file_name,
+			end_date
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -121,7 +123,8 @@
 			#{grade},
 			#{issType},
 			#{filePath},
-			#{fileName}
+			#{fileName},
+			#{endDate}
 		)
 	</insert>
 	
@@ -141,7 +144,8 @@
 			grade = #{grade},
 			iss_type = #{issType},
 			file_path = #{filePath},
-			file_name = #{fileName}
+			file_name = #{fileName},
+			end_date = #{endDate}
 		WHERE id = #{id}
 	</update>
 	

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

@@ -0,0 +1,346 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>资质管理</title>
+	<meta name="decorator" content="default"/>
+    <style>
+        body{
+            background-color:transparent;
+            filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+            color:#ffffff;
+            background-color:rgba(255,255,255,0);
+            height:100%;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#cus_name").show();
+            $("#cus_name").siblings().hide();
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow1);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow1);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+            laydate.render({
+                elem: '#beginEntryDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+            laydate.render({
+                elem: '#endEntryDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+
+        });
+
+        function openDialog(title,url,width,height,target) {
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                skin: 'three-btns',
+                btn: ["提交","关闭"],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+
+                    if(iframeWin.contentWindow.doSubmit(index) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn2: function (index) {
+
+                }
+            });
+        }
+
+        function setParentInfo(ids,names,nos,salarys){
+            return;
+        }
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <sys:message content="${message}"/>
+    <div class="layui-row">
+        <div class="full-width fl">
+            <div class="contentShadow layui-row" id="queryDiv">
+            <form:form id="searchForm" modelAttribute="workStaffBasicInfo" action="${ctx}/qualifications/qualifications/" method="post" class="form-inline">
+                <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+                <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+                <input type="hidden" input="params" value="">
+                <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+                <div class="commonQuery">
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">姓    名：</label>
+                        <div class="layui-input-block">
+                            <form:input path="name" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">移动电话：</label>
+                        <div class="layui-input-block">
+                            <form:input path="mobile" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item athird fr">
+                        <div class="input-group">
+                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                            <div class="layui-btn-group search-spacing">
+                                <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                <button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+                            </div>
+<%--                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                            <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--                            <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
+                        </div>
+                    </div>
+                    <div style="    clear:both;"></div>
+                </div>
+                <div id="moresees" style="clear:both;display:none;">
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">工    号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="no" htmlEscape="false" maxlength="10"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">身份证号码：</label>
+                        <div class="layui-input-block">
+                            <form:input path="idCard" htmlEscape="false" maxlength="20"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">部门：</label>
+                        <div class="layui-input-block with-icon">
+                            <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
+                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
+                        </div>
+                    </div>
+                    <%--<div class="layui-item query athird">
+                        <label class="layui-form-label">职级：</label>
+                        <div class="layui-input-block with-icon">
+                            <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
+                                                    title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        </div>
+                    </div>--%>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">员工状态：</label>
+                        <div class="layui-input-block">
+                            <form:select path="status" class="form-control simple-select required">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('staff_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">入职日期：</label>
+                        <div class="layui-input-block">
+                            <input id="beginEntryDate" name="beginEntryDate" type="text" placeholder="开始时间" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.beginEntryDate}" pattern="yyyy-MM-dd"/>"/>
+                            </input>
+                            <span class="group-sep">-</span>
+                            <input id="endEntryDate" name="endEntryDate" type="text" placeholder="结束时间" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.endEntryDate}" pattern="yyyy-MM-dd"/>"/>
+                            </input>
+                        </div>
+                    </div>
+                </div>
+            </form:form>
+	        </div>
+	    </div>
+
+        <div class="full-width fl">
+            <div class="contentShadow layui-form contentDetails">
+                <div class="nav-btns">
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">--%>
+<%--                        <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->--%>
+<%--                    </shiro:hasPermission>--%>
+<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">--%>
+<%--                        <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->--%>
+<%--                    </shiro:hasPermission>--%>
+<%--                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
+                    <div style="clear: both;"></div>
+                </div>
+                <table class="oa-table layui-table" id="contentTable" lay-filter="tableEvent"></table>
+
+                <!-- 分页代码 -->
+                <table:page page="${page}"></table:page>
+                <div style="clear: both;"></div>
+            </div>
+        </div>
+    </div>
+    <div id="changewidth"></div>
+</div>
+<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+<script charset="utf-8" src="${ctxStatic}/kindeditor/plugins/tableEdit/tableEdit.js"></script>
+<script>
+    $(document).ready(function() {
+        window.params;
+        $.ajax({
+            url:"${ctx}/workstaff/workStaffBasicInfo/getAuditUserList",
+            type:"post",
+            success:function(data){
+                params = data;
+            }
+        });
+
+    });
+    layui.use(['table','tableEdit','layer'], function () {
+        var table = layui.table,tableEdit = layui.tableEdit,$ = layui.$;
+
+        var cols = layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable'
+            ,page: false
+            ,cols: [[
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'no',align:'center', title: '工号',minWidth:100,templet:function(d){
+                        var xml = "<a class=\"attention-info\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看员工信息', '${ctx}/workstaff/workStaffBasicInfo/view?id="+d.id+"','95%','95%')\">" +
+                            "<span title=" + d.no + ">" + d.no + "</span></a>";
+                        return xml;
+                    }}
+                ,{field:'name',align:'center', title: '姓名',minWidth:100,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看员工信息', '${ctx}/workstaff/workStaffBasicInfo/view?id="+d.id+"','95%','95%')\">" +
+                        "<span title=" + d.name + ">" + d.name + "</span></a>";
+                    return xml;
+                }}
+                ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
+                ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
+                ,{field:'office',align:'center', title: '部门', minWidth:100}
+                // ,{field:'role',align:'center', title: '岗位', minWidth:100}
+                ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
+                /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
+                    ,event:'auditUserId',config:{type:'select',data:params,verify:true}
+                    ,templet:function (d) {
+                        if(d.auditUserName){
+                            if(d.auditUserName.value){
+                                return  d.auditUserName.value;
+                            }
+                            return  d.auditUserName;
+                        }
+                        return ''
+                    }}*/
+                ,{field:'status',align:'center', title: '员工状态', minWidth:80}
+                ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
+                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                        ////对操作进行初始化
+                        var xml = "<div class=\"layui-btn-group\">";
+
+                        if(d.canedit != undefined && d.canedit == "1")
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑', '${ctx}/qualifications/qualifications/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
+
+                        xml+="</div>"
+                        return xml;
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="workStaffBasicInfo" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${workStaffBasicInfo.id}"
+                    ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
+                    ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
+                    <%--,"role":"${workStaffBasicInfo.roleName}"--%>
+                    ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
+                    ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
+                    ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
+                    ,'mobile':"<c:out value="${workStaffBasicInfo.mobile}" escapeXml="true"/>"
+                    ,'office':"<c:out value="${workStaffBasicInfo.office.name}" escapeXml="true"/>"
+                    ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
+                    ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
+                    ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
+                    <shiro:hasPermission name="qualifications:qualifications:edit">,"canedit":"1"</shiro:hasPermission>
+                }
+                </c:forEach>
+                </c:if>
+            ]
+        }).config.cols;
+
+       /* /!**
+         * 参数cols是table.render({})中的cols属性值
+         * aop代理是基于event点击事件进行操作的，
+         * 因此cols中务必开启event点击事件！
+         **!/
+        var aopTable = tableEdit.aopObj(cols); //获取一个aop对象
+        /!**
+         * 注意：
+         * 1、 aopTable.on('tool(xxx)',function (obj) {})
+         * 2、 table.on('tool(yyy)',function (obj) {})
+         * 如果1中的xxx与2中的yyy字符串相同时，
+         * 不能同时用，用了会造成后调用者覆盖前调用者。
+         * 应该直接用1来代替2，因为1中包含了2中的事件。
+         * 如果不相同，则可以同时使用。
+         **!/
+        aopTable.on('tool(tableEvent)',function (obj) {
+            var field = obj.field; //单元格字段
+            console.log(field);
+            var value = obj.value; //修改后的值
+            console.log(value);
+            var data = obj.data; //当前行旧数据
+            console.log(data);
+            var event = obj.event; //当前单元格事件属性值
+            console.log(event);
+            var update = {};
+            update[field] = value;
+            //把value更新到行中
+            obj.update(update);
+
+            $.ajax({
+                type:'post',
+                url:"${ctx}/workstaff/workStaffBasicInfo/updateAuditUser",
+                data:{"id":data.id,"auditUserId":value.name},
+                dataType:"json",
+                success:function(data){
+                    var data = data;
+                    parent.layer.msg(data.msg,{icon:1});
+                }
+            });
+        });*/
+
+    })
+
+    resizeListTable(130);/*消除由于有竖向滚动条造成table出现横向滚动条*/
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow1();
+    $(window).resize(function(){
+        resizeListWindow1();
+    });
+</script>
+</body>
+</html>