人员信息完善调整

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -384,7 +384,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
-            if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+            if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                 relateInfo.setFlag(true);
             }else {
                 relateInfo.setFlag(false);
@@ -480,7 +480,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
-            if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+            if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                 relateInfo.setFlag(true);
             }else {
                 relateInfo.setFlag(false);
@@ -576,7 +576,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         if(screenType.contains("1000") && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
-            if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+            if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                 relateInfo.setFlag(true);
             }else {
                 relateInfo.setFlag(false);
@@ -672,7 +672,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         if("1000".equals(screenType) && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
-            if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+            if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                 relateInfo.setFlag(true);
             }else {
                 relateInfo.setFlag(false);
@@ -768,7 +768,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         if("1000".equals(screenType) && "2".equals(projectRecords.getProjectType())){
             BigDecimal submitScale = projectRecords.getSubmitScale();
             // 送审金额大于等于1000万时
-            if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+            if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                 relateInfo.setFlag(true);
             }else {
                 relateInfo.setFlag(false);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1570,7 +1570,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 case "13":
                     BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
                     // 送审金额大于等于1000万时
-                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+                    if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                         relateInfo.setFlag(true);
                     }else {
                         relateInfo.setFlag(false);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewTwoController.java

@@ -223,7 +223,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                 case "13":
                     BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
                     // 送审金额大于等于1000万时
-                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+                    if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
                         relateInfo.setFlag(true);
                     }else {
                         relateInfo.setFlag(false);

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

@@ -33,6 +33,7 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -531,7 +532,7 @@ public class OfficeController extends BaseController {
         LinkedHashSet<Map<String, Object>> mapSet = new LinkedHashSet<>();
         //查询所有有关部门
         List<Office> list = officeService.findByParentIdsLike(office);
-        if("6".equals(type)){
+        if("6".equals(type) || "7".equals(type)){
             Office info = new Office();
             info.setId("一部本部");
             info.setName("一部本部");
@@ -545,6 +546,19 @@ public class OfficeController extends BaseController {
             info.setParentIds("0,ffe5af5b557e46f28b000c94716e228a,7f776d072d7b4c839cef4e63ce6dbfa5,");
             list.add(info);
         }
+        if("7".equals(type)){
+            Iterator officeIterator = list.iterator();
+            while (officeIterator.hasNext()) {
+                Office officeInfo = (Office) officeIterator.next();
+                // Identify the property name and value(s) to be assigned
+                if (officeInfo == null) {
+                    continue;
+                }
+                if("897d1bf0975a4598b3bb248049e2d1cf".equals(officeInfo.getId()) || "5adafaaa43ab4a11801f9ad264374a06".equals(officeInfo.getId())){
+                    officeIterator.remove();
+                }
+            }
+        }
         for (int i = 0; i < list.size(); i++) {
             Office e = list.get(i);
             if ((StringUtils.isBlank(extId) || (extId != null && !extId.equals(e.getId()) && e.getParentIds().indexOf("," + extId + ",") == -1))

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

@@ -517,9 +517,13 @@ public class UserController extends BaseController {
         if (workStaffBasicInfo!=null) {
             workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
             if (StringUtils.isNotBlank(workStaffBasicInfo.getId())) {
-                workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+                workStaffBasicInfoService.queryDetailsApply(workStaffBasicInfo);
             }
         }
+        if(null == workStaffBasicInfo){
+            model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+            return "modules/sys/userInfo";
+        }
 
         List<WorkStaffCertificate> list = workStaffBasicInfo.getCertificateList();
         //获取专业类型
@@ -533,6 +537,17 @@ public class UserController extends BaseController {
                 }
             }
         }
+
+        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;
+                }
+            }
+        }
         model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
         return "modules/sys/userInfo";
     }

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

@@ -6447,7 +6447,7 @@ public class WorkProjectNotifyController extends BaseController {
 									}
 									BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
 									// 送审金额大于等于1000万时
-									if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+									if(null != submitScale && submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
 										relateInfo.setFlag(true);
 									}else {
 										relateInfo.setFlag(false);
@@ -7719,33 +7719,43 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("113")) {    //工作内容报告归档
 					return this.getProjectCaseBase(workProjectNotify, model);
 				} else if ("86".equals(workProjectNotify.getType())) {    //日常事务
-					if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
-						WorkStaffBasicInfo select = new WorkStaffBasicInfo();
-						select.setAchiveId(workProjectNotify.getNotifyId());
-						WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getAchive(select);
-						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 select = new WorkStaffBasicInfo();
+					select.setAchiveId(workProjectNotify.getNotifyId());
+					WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getAchive(select);
+					if (StringUtils.isNotBlank(workStaffBasicInfo.getId())) {
+						workStaffBasicInfoService.queryDetailsApply(workStaffBasicInfo);
+					}
 
-						workStaffBasicInfo.setRoleId(roleIdStr);
-						workStaffBasicInfo.setRoleName(roleNameStr);
+					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.setHome("home");
-						model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+					workStaffBasicInfo.setRoleId(roleIdStr);
+					workStaffBasicInfo.setRoleName(roleNameStr);
+
+					workStaffBasicInfo.setHome("home");
+					model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+
+					if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workstaff/workStaffBasicDetailAudit";
+					}else{
+						if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+							User user=UserUtils.getUser();
+							model.addAttribute("user", user);
+							return "modules/workstaff/workStaffBasicDetailModify";
+						}else{
+							return "modules/workstaff/workStaffBasicInfoView";
+						}
 					}
 				} else if ("70".equals(workProjectNotify.getType())) {    //部门调转
 					WorkChangeJob workChangeJob = workChangeJobService.get(workProjectNotify.getNotifyId());
@@ -10641,17 +10651,19 @@ public class WorkProjectNotifyController extends BaseController {
 		workActivityProcess.setProcessInstanceId(workReimbursement.getProcessInstanceId());
 		workActivityProcess.setIsApproval("0");
 		List<WorkActivityProcess> lists = workActivityProcessService.findByProcInsIdAudit(workActivityProcess);
-		WorkActivityProcess workActivity = lists.get(0);
-		SysRoleActivity role = workActivity.getActivity().getRole();
-		String enname = role.getEnname();
-		if("cwzg".equals(enname) || "cwygevod".equals(enname)){
-			isChangeStatus = "1";
+		if(null != lists && lists.size()>0){
+			WorkActivityProcess workActivity = lists.get(0);
+			SysRoleActivity role = workActivity.getActivity().getRole();
+			String enname = role.getEnname();
+			if("cwzg".equals(enname)){
+				isChangeStatus = "1";
+			}
 		}
+		String showChangeStatus = "1";
 		if(null != workReimbursement.getReimbursementElectronicInvoiceVATTaxes() && workReimbursement.getReimbursementElectronicInvoiceVATTaxes().size()>0){
 			List<ReimbursementVATTax> reimbursementVATTaxes = workReimbursement.getReimbursementVATTaxes();
 			ReimbursementVATTaxStatus reimbursementVATTaxStatus = new ReimbursementVATTaxStatus();
 			User currentUser = UserUtils.getUser();
-			reimbursementVATTaxStatus.setUserId(currentUser.getId());
 			reimbursementVATTaxStatus.setReimbursementId(workReimbursement.getId());
 			List<ReimbursementVATTaxStatus> VATTaxStatusList = reimbursementVATTaxStatusDao.findList(reimbursementVATTaxStatus);
 
@@ -10687,6 +10699,7 @@ public class WorkProjectNotifyController extends BaseController {
 			model.addAttribute("identificationName","报销审核意见");
 			model.addAttribute("pageFlag",workProjectNotify.getPageFlag());
 			model.addAttribute("isChangeStatus",isChangeStatus);
+			model.addAttribute("showChangeStatus",showChangeStatus);
 						/*if (workReimbursement.getAct() != null && StringUtils.isNotBlank(workReimbursement.getAct().getTaskDefKey()) && "cw".equals(workReimbursement.getAct().getTaskDefKey())) {
 							return "modules/workreimbursement/new/workReimbursementCWNewAudit";
 						}*/

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

@@ -29,6 +29,7 @@ public class WorkStaffCertificate extends DataEntity<WorkStaffCertificate> {
 	private String grade;		// 等级
 	private String issType;		// 取得方式
 	private String filePath;		// 文件
+	private String filePathStr;		// 文件
     private String fileName;		// 文件名
     private MultipartFile file;
     private String idCard;		//身份证号
@@ -192,4 +193,12 @@ public class WorkStaffCertificate extends DataEntity<WorkStaffCertificate> {
 	public void setZixunyuanName(String zixunyuanName) {
 		this.zixunyuanName = zixunyuanName;
 	}
+
+	public String getFilePathStr() {
+		return filePathStr;
+	}
+
+	public void setFilePathStr(String filePathStr) {
+		this.filePathStr = filePathStr;
+	}
 }

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

@@ -30,6 +30,8 @@ public class WorkStaffEducation extends DataEntity<WorkStaffEducation> {
 	private String degreePhoto;		// 学位证书
     private MultipartFile degreePhotoFile;
     private MultipartFile eduPhotoFile;
+	private String eduPhotoStr;		// 学历证书
+	private String degreePhotoStr;		// 学位证书
 
     public MultipartFile getDegreePhotoFile() {
         return degreePhotoFile;
@@ -146,5 +148,20 @@ public class WorkStaffEducation extends DataEntity<WorkStaffEducation> {
 	public void setDegreePhoto(String degreePhoto) {
 		this.degreePhoto = degreePhoto;
 	}
-	
+
+	public String getEduPhotoStr() {
+		return eduPhotoStr;
+	}
+
+	public void setEduPhotoStr(String eduPhotoStr) {
+		this.eduPhotoStr = eduPhotoStr;
+	}
+
+	public String getDegreePhotoStr() {
+		return degreePhotoStr;
+	}
+
+	public void setDegreePhotoStr(String degreePhotoStr) {
+		this.degreePhotoStr = degreePhotoStr;
+	}
 }

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

@@ -24,6 +24,7 @@ public class WorkStaffLanguages extends DataEntity<WorkStaffLanguages> {
 	private String certificate;		// 证书名称
 	private Date certifDate;		// 获证日期
 	private String filePath;		// 文件
+	private String filePathStr;		// 文件
 	private String fileName;		// 文件名
     private MultipartFile file;
 
@@ -104,4 +105,12 @@ public class WorkStaffLanguages extends DataEntity<WorkStaffLanguages> {
     public void setFile(MultipartFile file) {
         this.file = file;
     }
+
+	public String getFilePathStr() {
+		return filePathStr;
+	}
+
+	public void setFilePathStr(String filePathStr) {
+		this.filePathStr = filePathStr;
+	}
 }

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

@@ -20,6 +20,7 @@ public class WorkStaffRecord extends DataEntity<WorkStaffRecord> {
 	private String name;		// 档案名称
 	private String num;		// 编号
 	private String filePath;		// 文件
+	private String filePathStr;		// 文件
 	private String status;		// 验证
     private String fileName;		// 文件名
     private MultipartFile file;
@@ -92,5 +93,12 @@ public class WorkStaffRecord extends DataEntity<WorkStaffRecord> {
 	public void setStatus(String status) {
 		this.status = status;
 	}
-	
+
+	public String getFilePathStr() {
+		return filePathStr;
+	}
+
+	public void setFilePathStr(String filePathStr) {
+		this.filePathStr = filePathStr;
+	}
 }

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

@@ -25,6 +25,7 @@ public class WorkStaffTitle extends DataEntity<WorkStaffTitle> {
 	private String pathway;		// 取得途径
 	private String approvalAuthority;		// 审批单位
 	private String filePath;		// 文件
+	private String filePathStr;		// 文件
     private String fileName;		// 文件名
     private MultipartFile file;
 
@@ -114,5 +115,12 @@ public class WorkStaffTitle extends DataEntity<WorkStaffTitle> {
 	public void setFilePath(String filePath) {
 		this.filePath = filePath;
 	}
-	
+
+	public String getFilePathStr() {
+		return filePathStr;
+	}
+
+	public void setFilePathStr(String filePathStr) {
+		this.filePathStr = filePathStr;
+	}
 }

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

@@ -28,6 +28,7 @@ public class WorkStaffTraining extends DataEntity<WorkStaffTraining> {
 	private String hours;		// 学时
 	private String certificate;		// 所获证书
 	private String filePath;		// 文件
+	private String filePathStr;		// 文件
     private String fileName;		// 文件名
     private MultipartFile file;
 
@@ -144,5 +145,12 @@ public class WorkStaffTraining extends DataEntity<WorkStaffTraining> {
 	public void setFilePath(String filePath) {
 		this.filePath = filePath;
 	}
-	
+
+	public String getFilePathStr() {
+		return filePathStr;
+	}
+
+	public void setFilePathStr(String filePathStr) {
+		this.filePathStr = filePathStr;
+	}
 }

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

@@ -602,6 +602,21 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         UserUtils.pushIm(userIds, contentStr);
     }
 
+    private void sendCertificationMessage(WorkStaffBasicInfo workStaffBasicInfo, String contentStr, String titleStr, String remark) {
+        if (workStaffBasicInfo == null || StringUtils.isBlank(workStaffBasicInfo.getId()) || StringUtils.isBlank(workStaffBasicInfo.getUserId())) {
+            return;
+        }
+        WorkProjectNotify workProjectNotify = UtilNotify.saveNotify(workStaffBasicInfo.getId(), null, workStaffBasicInfo.getCompany().getId(),
+                titleStr, contentStr, "86", "0", "重新申请", "");
+        List<String> userIds = new ArrayList<>();
+        userIds.add(workStaffBasicInfo.getUserId());
+        workProjectNotify.setUser(new User(workStaffBasicInfo.getUserId()));
+        workProjectNotify.setId("");
+        workProjectNotify.setNotifyRole("");
+        workProjectNotifyService.save(workProjectNotify);
+        UserUtils.pushIm(userIds, contentStr);
+    }
+
     private String createNo(WorkStaffBasicInfo workStaffBasicInfo) {
         String newNo = "0001";
         String no = dao.queryMaxNoWithCompany(workStaffBasicInfo);
@@ -811,7 +826,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         String remark = "待处理";
         for (String s : split) {
             WorkStaffBasicInfo workStaffBasicInfo = workStaffAchivesDao.get(s);
-            this.sendMessage(workStaffBasicInfo, contentStr, titleStr, remark);
+            this.sendCertificationMessage(workStaffBasicInfo, contentStr, titleStr, remark);
         }
     }
 
@@ -833,18 +848,18 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         cou += this.cacuField(workStaffBasicInfo);
         //修改员工档案表父节点信息
         workStaffAchivesDao.updatePercent(workStaffBasicInfo.getId(), this.cacuPercent(cou));
-        if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())) {
+        /*if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())) {
             WorkProjectNotify workProjectNotify = new WorkProjectNotify();
             workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
             workProjectNotifyService.readByNotifyId(workProjectNotify);
             return;
-        }
-        if ("1".equals(workStaffBasicInfo.getNotifyFlag())) {
+        }*/
+        /*if ("1".equals(workStaffBasicInfo.getNotifyFlag())) {
             String contentStr = "待处理，请及时完善员工档案信息。";
             String titleStr = "完善档案信息，待处理";
             String remark = "待处理";
             this.sendMessage(workStaffBasicInfo, contentStr, titleStr, remark);
-        }
+        }*/
     }
 
     public WorkStaffBasicInfo getAchive(WorkStaffBasicInfo workStaffBasicInfo) {
@@ -932,14 +947,14 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         if (StringUtils.isBlank(achiveIds)) {
             return "";
         }
-        String contentStr = "待处理，请及时审核修改档案信息申请。";
-        String titleStr = "修改档案信息申请，待处理";
+        String contentStr = "待处理，请及时审核修改职业资格证信息申请。";
+        String titleStr = "修改职业资格证信息申请，待处理";
         String remark = "待处理";
         WorkStaffBasicInfo workStaffBasicInfo = workStaffAchivesDao.get(achiveIds);
         WorkProjectNotify workProjectNotify = UtilNotify.saveNotify(workStaffBasicInfo.getId(), null, workStaffBasicInfo.getCompany().getId(),
                 titleStr, contentStr, "86", "0", remark, "");
         List<String> userIds = new ArrayList<>();
-        List<User> rlzyList = UserUtils.getByRoleActivityEnname("rlzy", 3, UserUtils.getSelectOffice().getId(), "22", UserUtils.getUser());
+        List<User> rlzyList = UserUtils.getByRoleActivityEnname("ryzzgly", 3, UserUtils.getSelectOffice().getId(), "22", UserUtils.getUser());
         List<User> rszrList = UserUtils.findRszrList(UserUtils.getUser());
         rlzyList.addAll(rszrList);
         if (rlzyList.size() == 0) {

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

@@ -25,6 +25,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
@@ -63,7 +64,13 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
 	}
 	
 	public List<WorkStaffCertificate> findList(WorkStaffCertificate workStaffCertificate) {
-		return super.findList(workStaffCertificate);
+        List<WorkStaffCertificate> list = super.findList(workStaffCertificate);
+        for (WorkStaffCertificate staffCertificate : list) {
+            if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+            }
+        }
+        return super.findList(workStaffCertificate);
 	}
 	
 	public Page<WorkStaffCertificate> findPage(Page<WorkStaffCertificate> page, WorkStaffCertificate workStaffCertificate) {
@@ -246,8 +253,8 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                 String path = new StringBuilder("/employeeInfo/").append(date)
                         .append(file.getOriginalFilename()).toString();
                 InputStream inputStream = file.getInputStream();
-                BOSClientUtil bosClientUtil = new BOSClientUtil();
-                String url = bosClientUtil.upload(path, inputStream);
+                OSSClientUtil ossClientUtil = new OSSClientUtil();
+                String url = ossClientUtil.uploadFile2OSS(file, "certificate");
                 return url;
             }
         }catch (Exception e){
@@ -380,6 +387,11 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                     }
                 }
                 newList.add(workStaffCertificate);
+                for (WorkStaffCertificate staffCertificate : newList) {
+                    if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                        staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+                    }
+                }
             }
         }
         //新增

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

@@ -24,8 +24,10 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +59,16 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
 	}
 	
 	public List<WorkStaffEducation> findList(WorkStaffEducation workStaffEducation) {
-		return super.findList(workStaffEducation);
+        List<WorkStaffEducation> list = super.findList(workStaffEducation);
+        for (WorkStaffEducation info : list) {
+            if(StringUtils.isNotBlank(info.getDegreePhoto())){
+                info.setDegreePhotoStr( WorkattachmentService.fileUrlManage(info.getDegreePhoto()));
+            }
+            if(StringUtils.isNotBlank(info.getEduPhoto())){
+                info.setEduPhotoStr( WorkattachmentService.fileUrlManage(info.getEduPhoto()));
+            }
+        }
+		return list;
 	}
 	
 	public Page<WorkStaffEducation> findPage(Page<WorkStaffEducation> page, WorkStaffEducation workStaffEducation) {
@@ -121,8 +132,8 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                 String path = new StringBuilder("/employeeInfo/").append(date)
                         .append(file.getOriginalFilename()).toString();
                 InputStream inputStream = file.getInputStream();
-                BOSClientUtil bosClientUtil = new BOSClientUtil();
-                String url = bosClientUtil.upload(path, inputStream);
+                OSSClientUtil ossClientUtil = new OSSClientUtil();
+                String url = ossClientUtil.uploadFile2OSS(file, "certificate");
                 return url;
             }
         }catch (Exception e){
@@ -252,6 +263,14 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                     }
                 }
                 newList.add(workStaffEducation);
+                for (WorkStaffEducation info : newList) {
+                    if(StringUtils.isNotBlank(info.getDegreePhoto())){
+                        info.setDegreePhotoStr( WorkattachmentService.fileUrlManage(info.getDegreePhoto()));
+                    }
+                    if(StringUtils.isNotBlank(info.getEduPhoto())){
+                        info.setEduPhotoStr( WorkattachmentService.fileUrlManage(info.getEduPhoto()));
+                    }
+                }
             }
         }
         //新增

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

@@ -21,8 +21,10 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -53,7 +55,13 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
 	}
 	
 	public List<WorkStaffLanguages> findList(WorkStaffLanguages workStaffLanguages) {
-		return super.findList(workStaffLanguages);
+        List<WorkStaffLanguages> list = super.findList(workStaffLanguages);
+        for (WorkStaffLanguages staffLanguages : list) {
+            if(StringUtils.isNotEmpty(staffLanguages.getFilePath())) {
+                staffLanguages.setFilePathStr(WorkattachmentService.fileUrlManage(staffLanguages.getFilePath()));
+            }
+        }
+        return super.findList(workStaffLanguages);
 	}
 	
 	public Page<WorkStaffLanguages> findPage(Page<WorkStaffLanguages> page, WorkStaffLanguages workStaffLanguages) {
@@ -262,6 +270,11 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
                     }
                 }
                 newList.add(workStaffLanguages);
+                for (WorkStaffLanguages staffCertificate : newList) {
+                    if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                        staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+                    }
+                }
             }
         }
         //新增

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

@@ -21,8 +21,10 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.entity.WorkStaffLanguages;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -53,7 +55,13 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
 	}
 	
 	public List<WorkStaffRecord> findList(WorkStaffRecord workStaffRecord) {
-		return super.findList(workStaffRecord);
+        List<WorkStaffRecord> list = super.findList(workStaffRecord);
+        for (WorkStaffRecord staffRecord : list) {
+            if(StringUtils.isNotEmpty(staffRecord.getFilePath())) {
+                staffRecord.setFilePathStr(WorkattachmentService.fileUrlManage(staffRecord.getFilePath()));
+            }
+        }
+        return super.findList(workStaffRecord);
 	}
 	
 	public Page<WorkStaffRecord> findPage(Page<WorkStaffRecord> page, WorkStaffRecord workStaffRecord) {
@@ -260,6 +268,11 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
                     }
                 }
                 newList.add(workStaffRecord);
+                for (WorkStaffRecord staffCertificate : newList) {
+                    if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                        staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+                    }
+                }
             }
         }
         //新增

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

@@ -23,9 +23,9 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
-import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
-import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
+import com.jeeplus.modules.workstaff.entity.*;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
-import com.jeeplus.modules.workstaff.entity.WorkStaffTitle;
 import com.jeeplus.modules.workstaff.dao.WorkStaffTitleDao;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -55,7 +54,13 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
 	}
 	
 	public List<WorkStaffTitle> findList(WorkStaffTitle workStaffTitle) {
-		return super.findList(workStaffTitle);
+        List<WorkStaffTitle> list = super.findList(workStaffTitle);
+        for (WorkStaffTitle info : list) {
+            if(StringUtils.isNotEmpty(info.getFilePath())) {
+                info.setFilePathStr(WorkattachmentService.fileUrlManage(info.getFilePath()));
+            }
+        }
+		return list;
 	}
 	
 	public Page<WorkStaffTitle> findPage(Page<WorkStaffTitle> page, WorkStaffTitle workStaffTitle) {
@@ -115,8 +120,8 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
                 String path = new StringBuilder("/employeeInfo/").append(date)
                         .append(file.getOriginalFilename()).toString();
                 InputStream inputStream = file.getInputStream();
-                BOSClientUtil bosClientUtil = new BOSClientUtil();
-                String url = bosClientUtil.upload(path, inputStream);
+                OSSClientUtil ossClientUtil = new OSSClientUtil();
+                String url = ossClientUtil.uploadFile2OSS(file, "certificate");
                 return url;
             }
         }catch (Exception e){
@@ -246,6 +251,11 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
                     }
                 }
                 newList.add(workStaffTitle);
+                for (WorkStaffTitle staffCertificate : newList) {
+                    if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                        staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+                    }
+                }
             }
         }
         //新增

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

@@ -23,8 +23,10 @@ import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -55,7 +57,13 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
 	}
 	
 	public List<WorkStaffTraining> findList(WorkStaffTraining workStaffTraining) {
-		return super.findList(workStaffTraining);
+        List<WorkStaffTraining> list = super.findList(workStaffTraining);
+        for (WorkStaffTraining staffTraining : list) {
+            if(StringUtils.isNotEmpty(staffTraining.getFilePath())) {
+                staffTraining.setFilePathStr(WorkattachmentService.fileUrlManage(staffTraining.getFilePath()));
+            }
+        }
+        return super.findList(workStaffTraining);
 	}
 	
 	public Page<WorkStaffTraining> findPage(Page<WorkStaffTraining> page, WorkStaffTraining workStaffTraining) {
@@ -117,8 +125,8 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
                 String path = new StringBuilder("/employeeInfo/").append(date)
                         .append(file.getOriginalFilename()).toString();
                 InputStream inputStream = file.getInputStream();
-                BOSClientUtil bosClientUtil = new BOSClientUtil();
-                String url = bosClientUtil.upload(path, inputStream);
+                OSSClientUtil ossClientUtil = new OSSClientUtil();
+                String url = ossClientUtil.uploadFile2OSS(file, "certificate");
                 return url;
             }
         }catch (Exception e){
@@ -252,6 +260,12 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
                     }
                 }
                 newList.add(workStaffTraining);
+
+                for (WorkStaffTraining staffCertificate : newList) {
+                    if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
+                        staffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(staffCertificate.getFilePath()));
+                    }
+                }
             }
         }
         //新增

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

@@ -121,6 +121,12 @@ public class QualificationsController extends BaseController {
 				model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 			}
 		}
+		if(StringUtils.isBlank(workStaffBasicInfo.getStatus())){
+			workStaffBasicInfo.setStatus("正式");
+		}
+		if(StringUtils.isBlank(workStaffBasicInfo.getUserLoginFlag())){
+			workStaffBasicInfo.setUserLoginFlag("1");
+		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
 		for (WorkStaffBasicInfo info:list){

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

@@ -120,6 +120,12 @@ public class WorkStaffBasicInfoController extends BaseController {
 				model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 			}
 		}
+		if(StringUtils.isBlank(workStaffBasicInfo.getStatus())){
+			workStaffBasicInfo.setStatus("正式");
+		}
+		if(StringUtils.isBlank(workStaffBasicInfo.getUserLoginFlag())){
+			workStaffBasicInfo.setUserLoginFlag("1");
+		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
 		for (WorkStaffBasicInfo info:list){
@@ -730,7 +736,6 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
 			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
 		}
-		workStaffBasicInfo.setHome("home");
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workStaffBasicDetailModify";
 	}
@@ -759,8 +764,20 @@ public class WorkStaffBasicInfoController extends BaseController {
 		workStaffBasicInfo.setRoleName(roleNameStr);
 
 		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
-			workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
+			workStaffBasicInfoService.queryDetailsApply(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;
+				}
+			}
 		}
+
 		workStaffBasicInfo.setHome("home");
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workStaffBasicDetailModifyDirectly";
@@ -796,7 +813,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && ("home".equals(workStaffBasicInfo.getHome()) || "notifyList".equals(workStaffBasicInfo.getHome()))) {
 			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
 			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
 			workProjectNotifyService.readByNotifyId(workProjectNotify);
@@ -804,6 +821,11 @@ public class WorkStaffBasicInfoController extends BaseController {
 		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
 		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
 		addMessage(redirectAttributes, "申请员工档案信息成功");
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "notifyList".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
 	}
 

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

@@ -439,7 +439,7 @@
                                         编辑<i class="fa fa-wrench"></i>
                                     </a>
                                     <ul class="dropdown-menu dropdown-user">
-                                        <li><a id="userEdit" data-toggle="modal" onclick="openDialog('修改档案信息', '${ctx}/workstaff/workStaffBasicInfo/applyEdit','95%','95%')" data-target="#register">申请修改</a>
+                                        <li><a id="userEdit" data-toggle="modal" onclick="openDialog('修改职业资格证信息', '${ctx}/workstaff/workStaffBasicInfo/applyEdit','95%','95%')" data-target="#register">职业资格证修改</a>
                                         </li>
                                         <li><a id="userEditDirectly" data-toggle="modal" onclick="openDialog2('修改档案信息', '${ctx}/workstaff/workStaffBasicInfo/applyEditDirectly','95%','95%')" data-target="#register">直接修改</a>
                                         </li>
@@ -716,10 +716,10 @@
                                                         <fmt:formatDate value="${education.endDate}" pattern="yyyy-MM-dd"/>
                                                     </td>
                                                     <td class="text-left op-td">
-                                                        <c:if test="${not empty education.eduPhoto}"><img src="${education.eduPhoto}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.eduPhoto}','90%','90%')" alt=""></c:if>
+                                                        <c:if test="${not empty education.eduPhotoStr}"><img src="${education.eduPhotoStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.eduPhotoStr}','90%','90%')" alt=""></c:if>
                                                     </td>
                                                     <td class="text-left op-td">
-                                                        <c:if test="${not empty education.degreePhoto}"><img src="${education.degreePhoto}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.degreePhoto}','90%','90%')" alt=""></c:if>
+                                                        <c:if test="${not empty education.degreePhotoStr}"><img src="${education.degreePhotoStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.degreePhotoStr}','90%','90%')" alt=""></c:if>
                                                     </td>
                                                 </tr>
                                             </c:forEach>
@@ -811,7 +811,7 @@
                                                         <fmt:formatDate value="${language.certifDate}" pattern="yyyy-MM-dd"/>
                                                     </td>
                                                     <td>
-                                                        <c:if test="${not empty language.filePath}"><img src="${language.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${language.filePath}','90%','90%')" alt=""></c:if>
+                                                        <c:if test="${not empty language.filePathStr}"><img src="${language.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${language.filePathStr}','90%','90%')" alt=""></c:if>
                                                     </td>
                                                 </tr>
                                             </c:forEach>
@@ -872,7 +872,7 @@
                                             <tr>
                                                 <th width="10%"><span class="require-item">*</span>证书名称</th>
                                                 <th width="10%"><span class="require-item">*</span>证书编号</th>
-                                                <th width="10%"><span class="require-item">*</span>发证机关</th>
+                                                <th width="10%">发证机关</th>
                                                 <th width="10%"><span class="require-item">*</span>发证日期</th>
                                                 <th width="10%">注册日期</th>
                                                 <th width="10%">注册证书编号</th>
@@ -913,7 +913,7 @@
                                                             ${certificate.issType}
                                                     </td>
                                                     <td >
-                                                        <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>
+                                                        <c:if test="${not empty certificate.filePathStr}"><img src="${certificate.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePathStr}','90%','90%')" alt=""></c:if>
                                                     </td>
                                                 </tr>
                                             </c:forEach>
@@ -954,7 +954,7 @@
                                                             ${title.approvalAuthority}
                                                     </td>
                                                     <td>
-                                                        <c:if test="${not empty title.filePath}"><img src="${title.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${title.filePath}','90%','90%')" alt=""></c:if>
+                                                        <c:if test="${not empty title.filePathStr}"><img src="${title.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${title.filePathStr}','90%','90%')" alt=""></c:if>
                                                     </td>
                                                 </tr>
                                             </c:forEach>
@@ -1045,7 +1045,7 @@
                                                             ${training.certificate}
                                                     </td>
                                                     <td>
-                                                        <c:if test="${not empty training.filePath}"><img src="${training.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${training.filePath}','90%','90%')" alt="${training.fileName}"></c:if>
+                                                        <c:if test="${not empty training.filePathStr}"><img src="${training.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${training.filePathStr}','90%','90%')" alt="${training.fileName}"></c:if>
                                                     </td>
                                                     <td>
                                                             ${training.remarks}
@@ -1193,7 +1193,7 @@
                                                             ${record.num}
                                                     </td>
                                                     <td>
-                                                        <c:if test="${not empty record.filePath}"><img src="${record.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${record.filePath}','90%','90%')" alt="${record.fileName}"></c:if>
+                                                        <c:if test="${not empty record.filePathStr}"><img src="${record.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${record.filePathStr}','90%','90%')" alt="${record.fileName}"></c:if>
                                                     </td>
                                                     <td>
                                                             ${record.status}

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -1277,7 +1277,22 @@
 						}
 
                     }
-                    else{
+                    else if(d.remarks == "待处理" && d.status != "1" && d.type == "86") {
+                    	if (d.isreply == "2"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "1"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
+                    } else{
                     	if (d.isreply == "1"){
 							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 									"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+ d.title +"</span>" +

src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewAudit.jsp

@@ -19,6 +19,11 @@
                 } else {
                     $('#flag').val('no');
                 }
+
+                if (!arraysEqual()) {
+                    parent.layer.msg("数电发票未全部确认，请检查确认后再次提交!", {icon: 5});
+                    return false
+                }
                 $("#inputForm").submit();
                 return true;
             } else {
@@ -28,6 +33,14 @@
             return false;
         }
 
+        function arraysEqual() {
+            const idArray = allDataList.map(item => item.id);
+            if (confirmIdList.length !== idArray.length) return false;
+            const sortedA1 = [...confirmIdList].sort();
+            const sortedA2 = [...idArray].sort();
+            return sortedA1.every((val, idx) => val === sortedA2[idx]);
+        }
+
         $(document).ready(function () {
             layui.use('form', function () {
 
@@ -159,7 +172,7 @@
                    value="${workReimbursement.reimbursementType}"/>
             <input type="hidden" id="pageFlag" name="pageFlag" value="${pageFlag}"/>
             <div class="form-group layui-row first ">
-                <div class="form-group-label"><h2>基础信息1</h2></div>
+                <div class="form-group-label"><h2>基础信息</h2></div>
 
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销项：</label>
@@ -515,8 +528,8 @@
                             <th width="100px"><font color="red">*</font>税额</th>
                             <th width="100px"><font color="red">*</font>价税合计</th>
 
-                            <c:if test="${ isChangeStatus == '1' }">
-                                <th width="80px">确认状态</th>
+                            <c:if test="${ showChangeStatus == '1' }">
+                                <th width="80px">票据确认</th>
                             </c:if>
                             <th width="180px">操作
                             <th>
@@ -754,7 +767,7 @@
 
                                     <%--确认状态--%>
 
-                                     <c:if test="${ isChangeStatus == '1' }">
+                                     <c:if test="${ showChangeStatus == '1' }">
                                     <td style="text-align: center; vertical-align: middle;"  id="td-${reimbursementElectronicInvoiceVATTaxes.id}">
                                         <span class="layui-badge layui-bg-green">已确认</span>
                                         <span class="layui-badge">未确认</span>
@@ -870,7 +883,7 @@
                             </td>
 
 
-                            <c:if test="${isChangeStatus == '1'}">
+                            <c:if test="${showChangeStatus == '1'}">
                             <th width="80px"></th>
                             </c:if>
                             <th width="180px"></th>
@@ -1274,10 +1287,12 @@
             var el = document.getElementById('btn-container-' + item.id);
             var trEl = document.getElementById('reimbursementElectronicInvoiceVATTaxes-' + item.id);
             var tdEl = document.getElementById('td-'+ item.id);
-            if (!el) return;
+
             var id = String(item.id || '').trim();
             if (confirmIdList.indexOf(item.id) !== -1) {
-                el.innerHTML = '<a href="javascript:void(0)" onclick="changeStatus(\'0\', \'' + id + '\')" class="op-btn op-btn-download layui-bg-red">取消确认</a>';
+                if (el){
+                    el.innerHTML = '<a href="javascript:void(0)" onclick="changeStatus(\'0\', \'' + id + '\')" class="op-btn op-btn-download layui-bg-red">取消确认</a>';
+                }
                 // 设置背景色
                 if (trEl) {
                     trEl.style.backgroundColor = '#fff3cd';
@@ -1294,7 +1309,9 @@
                     }
                 }
             } else {
+                if (el){
                 el.innerHTML = '<a href="javascript:void(0)" onclick="changeStatus(\'1\', \'' + id + '\')" class="op-btn op-btn-download layui-bg-green">确认</a>';
+                }
                 if (trEl) {
                     trEl.style.backgroundColor = ''; // 清除背景色
                     $("#reimbursementElectronicInvoiceVATTaxes-" + item.id+" td input").css("background-color", "");

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

@@ -161,8 +161,8 @@
             }
             console.log(url);
             var fileType = file.type;
-            if(index==1 && (file.size > 100*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0))){
-                layer.msg("请上传100KB内扫描件!",{icon:2});
+            if(index==1 && (file.size > 1000*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0))){
+                layer.msg("请上传1000KB内图片!",{icon:2});
                 return;
             }
             var spanId = $(obj).attr("id") + 'Name' + index;

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

@@ -140,10 +140,10 @@
                         </div>
                     </div>
                     <div class="layui-item query athird">
-                        <label class="layui-form-label">经办部门：</label>
+                        <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/treeDataAll?type=6" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
+                                            title="部门" url="/sys/office/treeDataAll?type=7" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">

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

@@ -206,8 +206,8 @@
             }
             console.log(url);
             var fileType = file.type;
-            if(file.size > 100*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0)){
-                layer.msg("请上传100KB内扫描件!",{icon:2});
+            if(file.size > 1000*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0)){
+                layer.msg("请上传1000KB内图片!",{icon:2});
                 return;
             }
             var spanId = $(obj).attr("id") + 'Name' + index;
@@ -944,7 +944,7 @@
                             <th class="hide"></th>
                             <th width="10%"><span class="require-item">*</span>证书名称</th>
                             <th width="10%"><span class="require-item">*</span>证书编号</th>
-                            <th width="10%"><span class="require-item">*</span>发证机关</th>
+                            <th width="10%">发证机关</th>
                             <th width="11%"><span class="require-item">*</span>发证日期</th>
                             <th width="11%">注册日期</th>
                             <th width="9%">注册证书编号</th>
@@ -975,7 +975,7 @@
                                     <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" 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" class="form-control" 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"
@@ -1757,12 +1757,7 @@
                                     <input id="recordList${varStatus.index}_filePath" name="recordList[${varStatus.index}].filePath" type="hidden" value="${record.filePath}"/>
                                 </td>
                                 <td>
-                                    <select id="recordList${varStatus.index}_name" name="recordList[${varStatus.index}].name" class="form-control required">
-                                        <option value="" ></option>
-                                        <c:forEach items="${fns:getMainDictList('record_type')}" var="var">
-                                            <option value="${var.label}" <c:if test="${var.label eq record.name}">selected</c:if>>${var.label}</option>
-                                        </c:forEach>
-                                    </select>
+                                    <input id="recordList${varStatus.index}_name" name="recordList[${varStatus.index}].name" class="form-control" value="${record.name}"/>
                                 </td>
                                 <td>
                                     <input id="recordList${varStatus.index}_num" name="recordList[${varStatus.index}].num" class="form-control" value="${record.num}"/>
@@ -1790,12 +1785,7 @@
                                 <input id="recordList{{idx}}_filePath" name="recordList[{{idx}}].filePath" type="hidden" value="{{row.filePath}}"/>
                             </td>
                             <td>
-                                <select id="recordList{{idx}}_name" name="recordList[{{idx}}].name" class="form-control required">
-                                    <option value="" ></option>
-                                    <c:forEach items="${fns:getMainDictList('record_type')}" var="var">
-                                        <option value="${var.label}">${var.label}</option>
-                                    </c:forEach>
-                                </select>
+                                <input id="recordList{{idx}}_name" name="recordList[{{idx}}].name" class="form-control" value="{{row.name}}"/>
                             </td>
                             <td>
                                 <input id="recordList{{idx}}_num" name="recordList[{{idx}}].num" class="form-control" value="{{row.num}}"/>

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

@@ -206,8 +206,8 @@
             }
             console.log(url);
             var fileType = file.type;
-            if(file.size > 100*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0)){
-                layer.msg("请上传100KB内扫描件!",{icon:2});
+            if(file.size > 1000*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0)){
+                layer.msg("请上传1000KB内图片!",{icon:2});
                 return;
             }
             var spanId = $(obj).attr("id") + 'Name' + index;
@@ -944,7 +944,7 @@
                             <th class="hide"></th>
                             <th width="10%"><span class="require-item">*</span>证书名称</th>
                             <th width="10%"><span class="require-item">*</span>证书编号</th>
-                            <th width="10%"><span class="require-item">*</span>发证机关</th>
+                            <th width="10%">发证机关</th>
                             <th width="11%"><span class="require-item">*</span>发证日期</th>
                             <th width="11%">注册日期</th>
                             <th width="9%">注册证书编号</th>
@@ -975,7 +975,7 @@
                                     <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" 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" class="form-control" 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"

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

@@ -343,8 +343,8 @@
             }
             console.log(url);
             var fileType = file.type;
-            if(index==1 && (file.size > 100*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0))){
-                layer.msg("请上传100KB内扫描件!",{icon:2});
+            if(index==1 && (file.size > 1000*1024 || !(fileType.indexOf("png")>=0||fileType.indexOf("bmp")>=0||fileType.indexOf("jpg")>=0||fileType.indexOf("jpeg")>=0))){
+                layer.msg("请上传1000KB内图片!",{icon:2});
                 return;
             }
             var spanId = $(obj).attr("id") + 'Name' + index;
@@ -362,50 +362,46 @@
                 <form:hidden path="home"/>
                 <div class="form-group layui-row first">
                     <div class="form-group-label"><h2>基本信息</h2></div>
-                    <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
-                        <div class="layui-item layui-col-sm12">
+                        <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="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                             </div>
                         </div>
-                        <div class="layui-item layui-col-sm12">
+                    <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="name" 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">
+                            <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard 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 value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control  layui-input" />
                                 <input name="gender" value="${workStaffBasicInfo.gender}" type="hidden" readonly="true" class="form-control  layui-input" />
                             </div>
                         </div>
-                        <div class="layui-item layui-col-sm12">
-                            <label class="layui-form-label"><span class="require-item">*</span>身份证号码：</label>
-                            <div class="layui-input-block">
-                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input required"/>
-                            </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">
+                            <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input "/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <div style="margin-right: 120px;">
-                            <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
-                                <div class="layui-input-block">
-                                    <form:input path="name" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
-                                </div>
-                            </div>
-                            <div class="layui-item layui-col-sm12">
+                    <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 value="${fns:getDictLabel(workStaffBasicInfo.nation,'nation_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                                     <input name="nation" value="${workStaffBasicInfo.nation}" type="hidden" readonly="true" class="form-control  layui-input" />
                                 </div>
                             </div>
-                            <div class="layui-item layui-col-sm12">
-                                <label class="layui-form-label"><span class="require-item">*</span>年    龄：</label>
-                                <div class="layui-input-block">
-                                    <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="profile_box_wrapper">
+                        <%--<div class="profile_box_wrapper">
                             <div class="profile_box">
                                 <div id="this_upload_image_div_1">
                                     <div id="this_upload_div_1" style="position:relative;">
@@ -423,7 +419,7 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                        </div>--%>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>出生日期：</label>
@@ -447,79 +443,79 @@
                     <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="mobile" htmlEscape="false" readonly="true" class="form-control layui-input required isPhone"/>
+                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input  isPhone"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">座机：</label>
-                        <div class="layui-input-block">
-                            <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"><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 class="layui-item layui-col-sm6 lw7">
+                            <label class="layui-form-label">座机：</label>
+                            <div class="layui-input-block">
+                                <form:input path="phone" id="phone" placeholder=""  readonly="true"  htmlEscape="false"   class="form-control isTel  layui-input"  maxlength="50"/>
+                            </div>
                         </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" class="form-control layui-input digits"/>
+                        <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>
-                    <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 id="marriage" name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control basicInfo layui-input" />
+                        <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" class="form-control layui-input digits"/>
+                            </div>
                         </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 id="politics" name="politics" value="${workStaffBasicInfo.politics}"  readonly="true" class="form-control basicInfo layui-input" />
+                        <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 id="marriage" name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control basicInfo layui-input" />
+                            </div>
                         </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" />
+                        <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 id="politics" name="politics" value="${workStaffBasicInfo.politics}"  readonly="true" class="form-control basicInfo layui-input" />
+                            </div>
                         </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 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" />
+                            </div>
                         </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"/>
+                        <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>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">是否退伍军人：</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" />
+                        <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"/>
+                            </div>
                         </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 class="layui-item layui-col-sm6 lw7">
+                            <label class="layui-form-label double-line">是否退伍军人：</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" />
+                            </div>
                         </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 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>
+                        <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">职    位：</label>
                         <div class="layui-input-block">
@@ -546,12 +542,12 @@
                             <%--<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">
+                    <%--<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>--%>
                     <%--<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">
@@ -573,7 +569,7 @@
                                    value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </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="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
@@ -586,7 +582,7 @@
                             <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>--%>
                     <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">考勤截止日期：</label>
                         <div class="layui-input-block">
@@ -595,7 +591,7 @@
                         </div>
                     </div>--%>
                 </div>
-                <div class="form-group layui-row">
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="educationTable" class="table table-bordered table-condensed can-edit">
@@ -661,8 +657,8 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
-                <div class="form-group layui-row">
+                </div>--%>
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>劳动关系</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="labourTable" class="table table-bordered table-condensed details">
@@ -688,7 +684,7 @@
                                     <td><fmt:formatDate value="${buyDetails.contractEndTime}" pattern="yyyy-MM-dd"/></td>
                                     <td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>
                                     <td><fmt:formatDate value="${buyDetails.transactTime}" pattern="yyyy-MM-dd"/></td>
-                                        <%--试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>--%>
+                                        &lt;%&ndash;试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>&ndash;%&gt;
 
                                     <c:forEach items="${buyDetails.workAttachments}" var = "workClientAttachment" varStatus="status">
                                         <c:choose>
@@ -716,8 +712,8 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
-                <div class="form-group layui-row">
+                </div>--%>
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>外语语种</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="languageTable" class="table table-bordered table-condensed can-edit">
@@ -764,8 +760,8 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
-                <div class="form-group layui-row">
+                </div>--%>
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>工作经历</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="experienceTable" class="table table-bordered table-condensed can-edit">
@@ -816,7 +812,7 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
+                </div>--%>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>执业资格证书</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
@@ -826,7 +822,7 @@
                                 <th class="hide"></th>
                                 <th width="10%"><span class="require-item">*</span>证书名称</th>
                                 <th width="10%"><span class="require-item">*</span>证书编号</th>
-                                <th width="10%"><span class="require-item">*</span>发证机关</th>
+                                <th width="10%">发证机关</th>
                                 <th width="11%"><span class="require-item">*</span>发证日期</th>
                                 <th width="11%">注册日期</th>
                                 <th width="9%">注册证书编号</th>
@@ -850,13 +846,13 @@
                                         <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" readonly="true" class="form-control required" value="${certificate.num}"/>
+                                        <input id="certificateList${varStatus.index}_num" name="certificateList[${varStatus.index}].num" readonly="true" class="form-control " value="${certificate.num}"/>
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" readonly="true" class="form-control required" value="${certificate.issuingAuthority}"/>
+                                        <input id="certificateList${varStatus.index}_issuingAuthority" name="certificateList[${varStatus.index}].issuingAuthority" readonly="true" class="form-control" 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" type="text"  maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                                value="<fmt:formatDate value="${certificate.issuingDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td>
@@ -867,7 +863,7 @@
                                         <input id="certificateList${varStatus.index}_registNum" name="certificateList[${varStatus.index}].registNum" readonly="true" class="form-control" value="${certificate.registNum}"/>
                                     </td>
                                     <td>
-                                        <select  disabled readonly="true" class="form-control required">
+                                        <select  disabled readonly="true" class="form-control ">
                                             <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>
@@ -877,10 +873,10 @@
                                         <input id="certificateList${varStatus.index}_grade" name="certificateList[${varStatus.index}].grade" readonly="true" class="form-control" value="${certificate.grade}"/>
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_issType" name="certificateList[${varStatus.index}].issType" readonly="true" class="form-control required" value="${certificate.issType}"/>
+                                        <input id="certificateList${varStatus.index}_issType" name="certificateList[${varStatus.index}].issType" readonly="true" class="form-control" value="${certificate.issType}"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <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.filePathStr}"><img src="${certificate.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePathStr}','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>
                                 </tr>
@@ -889,7 +885,7 @@
                         </table>
                     </div>
                 </div>
-                <div class="form-group layui-row">
+                <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>职称</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">
                         <table id="titleTable" class="table table-bordered table-condensed can-edit">
@@ -1220,7 +1216,7 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
+                </div>--%>
             </form:form>
         </div>
     </div>

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

@@ -220,7 +220,7 @@
                         <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/treeDataAll?type=6" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
+                                            title="部门" url="/sys/office/treeDataAll?type=7" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">

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

@@ -372,8 +372,8 @@
                                 <th width="12%">所学专业</th>
                                 <th width="12%"><span class="require-item">*</span>学    历</th>
                                 <th width="12%">学    位</th>
-                                <th width="12%">学历性质</th>
-                                <th width="10%">入学日期</th>
+                                <th width="12%"><span class="require-item">*</span>学历性质</th>
+                                <th width="10%"><span class="require-item">*</span>入学日期</th>
                                 <th width="10%">毕业日期</th>
                                 <th width="10%">学历证书</th>
                                 <th width="10%">学位证书</th>
@@ -404,10 +404,10 @@
                                         <fmt:formatDate value="${education.endDate}" pattern="yyyy-MM-dd"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <c:if test="${not empty education.eduPhoto}"><img src="${education.eduPhoto}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.eduPhoto}','90%','90%')" alt=""></c:if>
+                                        <c:if test="${not empty education.eduPhotoStr}"><img src="${education.eduPhotoStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.eduPhotoStr}','90%','90%')" alt=""></c:if>
                                     </td>
                                     <td class="text-left op-td">
-                                        <c:if test="${not empty education.degreePhoto}"><img src="${education.degreePhoto}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.degreePhoto}','90%','90%')" alt=""></c:if>
+                                        <c:if test="${not empty education.degreePhotoStr}"><img src="${education.degreePhotoStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.degreePhotoStr}','90%','90%')" alt=""></c:if>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -499,7 +499,7 @@
                                         <fmt:formatDate value="${language.certifDate}" pattern="yyyy-MM-dd"/>
                                     </td>
                                     <td>
-                                        <c:if test="${not empty language.filePath}"><img src="${language.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${language.filePath}','90%','90%')" alt=""></c:if>
+                                        <c:if test="${not empty language.filePathStr}"><img src="${language.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${language.filePathStr}','90%','90%')" alt=""></c:if>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -585,7 +585,7 @@
                                         ${certificate.issuingAuthority}
                                     </td>
                                     <td >
-                                        <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>
+                                        <c:if test="${not empty certificate.filePathStr}"><img src="${certificate.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${certificate.filePathStr}','90%','90%')" alt=""></c:if>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -626,7 +626,7 @@
                                         ${title.approvalAuthority}
                                     </td>
                                     <td>
-                                        <c:if test="${not empty title.filePath}"><img src="${title.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${title.filePath}','90%','90%')" alt=""></c:if>
+                                        <c:if test="${not empty title.filePathStr}"><img src="${title.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${title.filePathStr}','90%','90%')" alt=""></c:if>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -717,7 +717,7 @@
                                         ${training.certificate}
                                     </td>
                                     <td>
-                                        <c:if test="${not empty training.filePath}"><img src="${training.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${training.filePath}','90%','90%')" alt="${training.fileName}"></c:if>
+                                        <c:if test="${not empty training.filePathStr}"><img src="${training.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${training.filePathStr}','90%','90%')" alt="${training.fileName}"></c:if>
                                     </td>
                                     <td>
                                         ${training.remarks}
@@ -865,7 +865,7 @@
                                         ${record.num}
                                     </td>
                                     <td>
-                                        <c:if test="${not empty record.filePath}"><img src="${record.filePath}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${record.filePath}','90%','90%')" alt="${record.fileName}"></c:if>
+                                        <c:if test="${not empty record.filePathStr}"><img src="${record.filePathStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${record.filePathStr}','90%','90%')" alt="${record.fileName}"></c:if>
                                     </td>
                                     <td>
                                         ${record.status}