人员信息调整

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

@@ -15,6 +15,7 @@ import com.jeeplus.modules.activityassignment.entity.ActivityAssignment;
 import com.jeeplus.modules.sys.dao.*;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sysparameter.dao.SysParameterDao;
 import com.jeeplus.modules.sysparameter.dao.SysParameterValueDao;
 import com.jeeplus.modules.sysparameter.entity.SysParameter;
@@ -310,6 +311,14 @@ public class UserUtils {
 		if (principal!=null){
 			User user = get(principal.getId());
 			if (user != null){
+
+				WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoDao.getWorkStaffBasicInfoByUserId(user.getId());
+				if(workStaffBasicInfo != null && StringUtils.isNotBlank(workStaffBasicInfo.getPicture())){
+					String urlManage = WorkattachmentService.fileUrlManage(workStaffBasicInfo.getPicture());
+					user.setPhoto(urlManage);
+				}else{
+					user.setPhoto("/static/common/login/images/portrait.png");
+				}
 				return user;
 			}
 			return new User();

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

@@ -21,10 +21,7 @@ import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.security.FormAuthenticationFilter;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.SystemConfigService;
-import com.jeeplus.modules.sys.service.SystemService;
-import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.service.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
@@ -548,6 +545,10 @@ public class UserController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(workStaffBasicInfo.getPicture())){
+            String urlManage = WorkattachmentService.fileUrlManage(workStaffBasicInfo.getPicture());
+            workStaffBasicInfo.setPictureStr(urlManage);
+        }
         model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
         return "modules/sys/userInfo";
     }

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

@@ -7719,44 +7719,9 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("113")) {    //工作内容报告归档
 					return this.getProjectCaseBase(workProjectNotify, model);
 				} else if ("86".equals(workProjectNotify.getType())) {    //日常事务
-
-					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.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";
-						}
-					}
+					return this.saveAchiveModify(workProjectNotify, model);
+				} else if ("186".equals(workProjectNotify.getType())) {
+					return this.saveAchiveModifyDirectly(workProjectNotify, model);
 				} else if ("70".equals(workProjectNotify.getType())) {    //部门调转
 					WorkChangeJob workChangeJob = workChangeJobService.get(workProjectNotify.getNotifyId());
 					Act act = getByAct(workChangeJob.getProcessInstanceId());
@@ -11276,4 +11241,108 @@ public class WorkProjectNotifyController extends BaseController {
 		}
     }
 
+	/**
+	 * 业务用章申请
+	 * @param workProjectNotify
+	 * @param model
+	 * @return
+	 */
+	private String saveAchiveModify(WorkProjectNotify workProjectNotify,Model model) throws Exception {
+
+		WorkStaffBasicInfo select = new WorkStaffBasicInfo();
+		select.setAchiveId(workProjectNotify.getNotifyId());
+		WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoService.getAchive(select);
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getId())) {
+			workStaffBasicInfoService.queryDetailsApply(workStaffBasicInfo);
+		}
+		workStaffBasicInfoService.querys(workStaffBasicInfo);
+
+		List<Role> roleList = Lists.newArrayList();
+		List<String> roleNameList = Lists.newArrayList();
+		List<String> roleIdList = Lists.newArrayList();
+		List<String> roleIdByUserIdList = roleService.getRoleIdByUserIdList(workStaffBasicInfo.getUserId());
+		for (String roleId : roleIdByUserIdList) {
+			Role role = roleService.get(roleId);
+			roleList.add(role);
+			roleNameList.add(role.getName());
+			roleIdList.add(role.getId());
+		}
+		String roleNameStr = StringUtils.join(roleNameList, "，");
+		String roleIdStr = StringUtils.join(roleIdList, "，");
+
+		workStaffBasicInfo.setRoleId(roleIdStr);
+		workStaffBasicInfo.setRoleName(roleNameStr);
+
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getPicture())){
+			String urlManage = WorkattachmentService.fileUrlManage(workStaffBasicInfo.getPicture());
+			workStaffBasicInfo.setPictureStr(urlManage);
+		}
+		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";
+			}
+		}
+    }
+
+	/**
+	 * 业务用章申请
+	 * @param workProjectNotify
+	 * @param model
+	 * @return
+	 */
+	private String saveAchiveModifyDirectly(WorkProjectNotify workProjectNotify,Model model) throws Exception {
+
+		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.setRoleId(roleIdStr);
+		workStaffBasicInfo.setRoleName(roleNameStr);
+
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getPicture())){
+			String urlManage = WorkattachmentService.fileUrlManage(workStaffBasicInfo.getPicture());
+			workStaffBasicInfo.setPictureStr(urlManage);
+		}
+
+		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";
+			}
+		}
+    }
+
 }

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementNewController.java

@@ -323,7 +323,7 @@ public class WorkReimbursementNewController extends BaseController {
 			int reimbursementThreeResult = nowDate.compareTo(reimbursementThreeAuditDate);
 
 
-			if(reimbursementThreeResult > 0 && workReimbursement.getOldDataType() > 0 && !"10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
+			if(reimbursementThreeResult > 0 && (null ==workReimbursement.getOldDataType() || workReimbursement.getOldDataType() > 0) && !"10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
 				if ("bmzr".equals(taskDefKey)){
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 					if (users==null )
@@ -339,9 +339,14 @@ public class WorkReimbursementNewController extends BaseController {
 					}
 				}else  if ("cw".equals(taskDefKey)){
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),2);
-					if (users==null )
+					if (users==null ){
 						//users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-						users = UserUtils.getByRoleActivityEnname("bmzr", 2, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
+						if("d8cf33fafd2d4f04a603e89f7e28e54c".equals(workReimbursement.getOfficeId())) {	//如果是苏州团队的  部门主任审核人为一部部门主任
+							users = UserUtils.getByRoleActivityEnname("bmzr", 2, "7f776d072d7b4c839cef4e63ce6dbfa5", "8", workReimbursement.getCreateBy());
+						}else{
+							users = UserUtils.getByRoleActivityEnname("bmzr", 2, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
+						}
+					}
 
 				}else  if ("gsld".equals(taskDefKey)){
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);

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

@@ -63,6 +63,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     private Date industryDate;        // 从事本行业日期
     private String ts;        // 是否TS人员
     private String picture;        // 照片
+    private String pictureStr;        // 照片
     private Date beginEntryDate;        // 开始 入职日期
     private Date endEntryDate;        // 结束 入职日期
     private Date dimissionDate;  //离职日期
@@ -123,6 +124,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 
     private String areaRemark; //地区备注（永不标注部门中所在的城市，比如一部中有 苏州、安徽的等等）
     private String areaPrincipal; //是否为地区负责人	1：是；0：不是
+    private List<String> notOfficeParentIdList; //不展示的部门的部门id
 
     //劳动关系临时属性
     private String relationshipStatus;
@@ -542,6 +544,14 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
         this.picture = picture;
     }
 
+    public String getPictureStr() {
+        return pictureStr;
+    }
+
+    public void setPictureStr(String pictureStr) {
+        this.pictureStr = pictureStr;
+    }
+
     public Date getBeginEntryDate() {
         return beginEntryDate;
     }
@@ -946,4 +956,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     public void setAreaPrincipal(String areaPrincipal) {
         this.areaPrincipal = areaPrincipal;
     }
+
+    public List<String> getNotOfficeParentIdList() {
+        return notOfficeParentIdList;
+    }
+
+    public void setNotOfficeParentIdList(List<String> notOfficeParentIdList) {
+        this.notOfficeParentIdList = notOfficeParentIdList;
+    }
 }

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

@@ -49,10 +49,13 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -219,6 +222,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
                 workStaffBasicInfo.getCurrentUser().setBranchOffice(workStaffBasicInfo.getCurrentUser().getCompany());
             }
         }
+
+        List<String> notOfficeParentIdList = officeService.getChildrenOffice("897d1bf0975a4598b3bb248049e2d1cf");
+        notOfficeParentIdList.add("897d1bf0975a4598b3bb248049e2d1cf");
+        workStaffBasicInfo.setNotOfficeParentIdList(notOfficeParentIdList);
+
         if (null != workStaffBasicInfo.getOffice() && StringUtils.isNotBlank(workStaffBasicInfo.getOffice().getId())) {
             if ("一部本部".equals(workStaffBasicInfo.getOffice().getId())) {
                 List<String> officeIdList = Lists.newArrayList();
@@ -463,38 +471,10 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     public void uploadFile(WorkStaffBasicInfo workStaffBasicInfo) {
         MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
         if (pictureFile != null && !pictureFile.isEmpty() && pictureFile.getSize() > 0) {
-            String oldPhoto = workStaffBasicInfo.getPicture();
-            BOSClientUtil bosClientUtil = new BOSClientUtil();
-            /*if (StringUtils.isNotBlank(oldPhoto)) {
-                String aliyunUrl = Global.getAliyunUrl();
-                String aliDownloadUrl = Global.getAliDownloadUrl();
-                String cons = "";
-                if (oldPhoto.contains(aliyunUrl)) {
-                    cons = aliyunUrl;
-                } else if (oldPhoto.contains("http://gangwan-app.oss-cn-hangzhou.aliyuncs.com")) {
-                    cons = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com";
-                } else {
-                    cons = aliDownloadUrl;
-                }
-                String[] arr = oldPhoto.split(cons + "/");
-                key = arr[1];
-            }
-            try {
-                OSSClientUtil ossUtil1 = new OSSClientUtil();
-                if (StringUtils.isNotBlank(key)) {
-                    ossUtil1.deleteSingleObject(key);
-                }
-            }catch (Exception e){
-                logger.error("oss删除文件失败！");
-            }*/
             try {
-                if (StringUtils.isNotBlank(oldPhoto)) {
-                    bosClientUtil.deleteObject(oldPhoto);
-                }
-                String path = new StringBuilder("/headImg/")
-                        .append(workStaffBasicInfo.getName() + System.currentTimeMillis()).append(".png").toString();
-                String uploadPath = bosClientUtil.upload(path, pictureFile.getInputStream());
-                workStaffBasicInfo.setPicture(uploadPath);
+                OSSClientUtil ossClientUtil = new OSSClientUtil();
+                String url = ossClientUtil.uploadFile2OSS(pictureFile, "certificate");
+                workStaffBasicInfo.setPicture(url);
             } catch (Exception e) {
                 logger.error("oss上传文件失败！");
             }
@@ -826,7 +806,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         String remark = "待处理";
         for (String s : split) {
             WorkStaffBasicInfo workStaffBasicInfo = workStaffAchivesDao.get(s);
-            this.sendCertificationMessage(workStaffBasicInfo, contentStr, titleStr, remark);
+            this.sendMessage(workStaffBasicInfo, contentStr, titleStr, remark);
         }
     }
 
@@ -848,18 +828,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) {
@@ -926,6 +906,84 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         queryRelationShips(workStaffBasicInfo);
     }
 
+
+    public void querys(WorkStaffBasicInfo workStaffBasicInfo) {
+        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+        if(workStaffBasicInfo==null|| StringUtils.isBlank(workStaffBasicInfo.getId())){
+            return;
+        }
+                Class<? extends WorkStaffBasicInfo> newClass = workStaffBasicInfo.getClass();
+                Field[] declaredFields = newClass.getDeclaredFields();
+                for (Field field : declaredFields) {
+                    String name = field.getName();
+                    if ("picture".equals(name) || "marriage".equals(name) || "politics".equals(name) || "exSoldier".equals(name) || "address".equals(name)
+                            || "nativePlace".equals(name) || "household".equals(name) || "industryDate".equals(name) || "idCard".equals(name) || "age".equals(name)
+                            || "birthday".equals(name) || "email".equals(name) || "nation".equals(name)) {
+                        String setMethod = "set"+name.substring(0,1).toUpperCase()+name.substring(1);
+                        String getMethod = "get"+name.substring(0,1).toUpperCase()+name.substring(1);
+                        WorkStaffAchivesLog workStaffAchivesLog=new WorkStaffAchivesLog();
+                        workStaffAchivesLog.setStaffId(workStaffBasicInfo.getId());
+                        workStaffAchivesLog.setModule("基本信息");
+                        workStaffAchivesLog.setFields(name);
+                        workStaffAchivesLog.setType("修改");
+                        workStaffAchivesLog.setState("1");
+                        List<WorkStaffAchivesLog> logs=workStaffAchivesLogService.findList(workStaffAchivesLog);
+                        try {
+                            Object newInvoke = newClass.getMethod(getMethod).invoke(workStaffBasicInfo);//修改后
+                            if(newInvoke instanceof String){
+                                Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, String.class);
+                                if(logs!=null&&logs.size()>0){
+                                    setReadOnly.invoke(workStaffBasicInfo,logs.get(0).getNewKey());
+                                }
+                            }
+                            if(newInvoke instanceof Integer){
+                                Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, String.class);
+                                if(logs!=null&&logs.size()>0){
+                                    setReadOnly.invoke(workStaffBasicInfo,logs.get(0).getNewKey());
+                                }
+                            }
+                            if(newInvoke instanceof Date){//日期
+                                Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, Date.class);
+                                if(logs!=null&&logs.size()>0){
+                                    Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                    setReadOnly.invoke(workStaffBasicInfo,myDate);
+                                }
+                            }
+                            if(null == newInvoke){
+                                try {
+                                    Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, String.class);
+                                    if(logs!=null&&logs.size()>0){
+                                        setReadOnly.invoke(workStaffBasicInfo,logs.get(0).getNewKey());
+                                    }
+                                } catch (NoSuchMethodException e) {
+                                    try {
+                                        Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, Integer.class);
+                                        if(logs!=null&& !logs.isEmpty()){
+                                            Integer newKey = Integer.valueOf(logs.get(0).getNewKey());
+                                            setReadOnly.invoke(workStaffBasicInfo,newKey);
+                                        }
+                                    } catch (NoSuchMethodException ex) {
+                                        Method setReadOnly = workStaffBasicInfo.getClass().getMethod(setMethod, Date.class);
+                                        if(logs!=null&&logs.size()>0){
+                                            Date myDate = dateFormat1.parse(logs.get(0).getNewKey());
+                                            setReadOnly.invoke(workStaffBasicInfo,myDate);
+                                        }
+                                    }
+                                }
+                            }
+                        } catch (NoSuchMethodException e) {
+                            e.printStackTrace();
+                        } catch (IllegalAccessException e) {
+                            e.printStackTrace();
+                        } catch (InvocationTargetException e) {
+                            e.printStackTrace();
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+    }
+
     private int saveDetailsApply(WorkStaffBasicInfo workStaffBasicInfo, boolean first) {
         int count = 0;
         if (achievementService.saveApply(workStaffBasicInfo, first)) count++;
@@ -947,14 +1005,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("ryzzgly", 3, UserUtils.getSelectOffice().getId(), "22", UserUtils.getUser());
+        List<User> rlzyList = UserUtils.getByRoleActivityEnname("rlzy", 3, UserUtils.getSelectOffice().getId(), "22", UserUtils.getUser());
         List<User> rszrList = UserUtils.findRszrList(UserUtils.getUser());
         rlzyList.addAll(rszrList);
         if (rlzyList.size() == 0) {
@@ -1005,6 +1063,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         CODE_MAP.put("nativePlace", "籍贯");
         CODE_MAP.put("picture", "头像");
         CODE_MAP.put("industryDate", "从事本行业日期");
+        CODE_MAP.put("idCard", "身份证号码");
+        CODE_MAP.put("age", "年龄");
+        CODE_MAP.put("birthday", "生日");
+        CODE_MAP.put("email", "油箱");
+        CODE_MAP.put("nation", "民族");
     }
 
     @Transactional(readOnly = false)
@@ -1023,7 +1086,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         for (Field field : declaredFields) {
             String name = field.getName();
             if ("picture".equals(name) || "marriage".equals(name) || "politics".equals(name) || "exSoldier".equals(name) || "address".equals(name)
-                    || "nativePlace".equals(name) || "household".equals(name) || "industryDate".equals(name)) {
+                    || "nativePlace".equals(name) || "household".equals(name) || "industryDate".equals(name) || "idCard".equals(name) || "age".equals(name)
+                    || "birthday".equals(name) || "email".equals(name) || "nation".equals(name)) {
                 String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
                 WorkStaffAchivesLog workStaffAchivesLog = new WorkStaffAchivesLog();
                 workStaffAchivesLog.setStaffId(workStaffBasicInfo.getId());
@@ -1057,6 +1121,29 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 
                         }
                     }
+                    if (newInvoke instanceof Integer) {
+                        String newValue = newInvoke.toString();
+                        String oldValue = "";
+                        if (oldInvoke != null)
+                            oldValue = oldInvoke.toString();
+                        if (!newValue.equals(oldValue)) {
+                            if ("exSoldier".equals(name)) {
+                                workStaffAchivesLogService.saveStaffLog(workStaffAchivesLog, workStaffBasicInfo.getId(),
+                                        "基本信息", describes, name,
+                                        DictUtils.getDictLabel(oldValue, "yes_no", ""),
+                                        DictUtils.getDictLabel(newValue, "yes_no", ""),
+                                        oldValue,
+                                        newValue,
+                                        "", "修改");
+                            } else {
+                                workStaffAchivesLogService.saveStaffLog(workStaffAchivesLog, workStaffBasicInfo.getId(),
+                                        "基本信息", describes, name,
+                                        oldValue, newValue, oldValue, newValue, "", "修改");
+                            }
+
+                        }
+                    }
+
                     if (newInvoke instanceof Date) {//日期
                         String newDate = "";
                         String oldDate = "";

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

@@ -386,6 +386,9 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffCertificate.getFilePath())){
+                    workStaffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(workStaffCertificate.getFilePath()));
+                }
                 newList.add(workStaffCertificate);
                 for (WorkStaffCertificate staffCertificate : newList) {
                     if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
@@ -443,6 +446,9 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffCertificate.getFilePath())){
+                    workStaffCertificate.setFilePathStr(WorkattachmentService.fileUrlManage(workStaffCertificate.getFilePath()));
+                }
                 newList.add(workStaffCertificate);
             }
         }

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

@@ -262,6 +262,12 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffEducation.getDegreePhoto())){
+                    workStaffEducation.setDegreePhotoStr( WorkattachmentService.fileUrlManage(workStaffEducation.getDegreePhoto()));
+                }
+                if(StringUtils.isNotBlank(workStaffEducation.getEduPhoto())){
+                    workStaffEducation.setEduPhotoStr( WorkattachmentService.fileUrlManage(workStaffEducation.getEduPhoto()));
+                }
                 newList.add(workStaffEducation);
                 for (WorkStaffEducation info : newList) {
                     if(StringUtils.isNotBlank(info.getDegreePhoto())){
@@ -321,6 +327,12 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffEducation.getDegreePhoto())){
+                    workStaffEducation.setDegreePhotoStr( WorkattachmentService.fileUrlManage(workStaffEducation.getDegreePhoto()));
+                }
+                if(StringUtils.isNotBlank(workStaffEducation.getEduPhoto())){
+                    workStaffEducation.setEduPhotoStr( WorkattachmentService.fileUrlManage(workStaffEducation.getEduPhoto()));
+                }
                 newList.add(workStaffEducation);
             }
         }

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

@@ -269,6 +269,9 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffLanguages.getFilePath())){
+                    workStaffLanguages.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffLanguages.getFilePath()));
+                }
                 newList.add(workStaffLanguages);
                 for (WorkStaffLanguages staffCertificate : newList) {
                     if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
@@ -325,6 +328,9 @@ public class WorkStaffLanguagesService extends CrudService<WorkStaffLanguagesDao
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffLanguages.getFilePath())){
+                    workStaffLanguages.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffLanguages.getFilePath()));
+                }
                 newList.add(workStaffLanguages);
             }
         }

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

@@ -267,6 +267,9 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffRecord.getFilePath())){
+                    workStaffRecord.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffRecord.getFilePath()));
+                }
                 newList.add(workStaffRecord);
                 for (WorkStaffRecord staffCertificate : newList) {
                     if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
@@ -312,6 +315,9 @@ public class WorkStaffRecordService extends CrudService<WorkStaffRecordDao, Work
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffRecord.getFilePath())){
+                    workStaffRecord.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffRecord.getFilePath()));
+                }
                 newList.add(workStaffRecord);
             }
         }

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

@@ -250,6 +250,9 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffTitle.getFilePath())){
+                    workStaffTitle.setFilePathStr(WorkattachmentService.fileUrlManage(workStaffTitle.getFilePath()));
+                }
                 newList.add(workStaffTitle);
                 for (WorkStaffTitle staffCertificate : newList) {
                     if(StringUtils.isNotEmpty(staffCertificate.getFilePath())) {
@@ -306,6 +309,9 @@ public class WorkStaffTitleService extends CrudService<WorkStaffTitleDao, WorkSt
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffTitle.getFilePath())){
+                    workStaffTitle.setFilePathStr(WorkattachmentService.fileUrlManage(workStaffTitle.getFilePath()));
+                }
                 newList.add(workStaffTitle);
             }
         }

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

@@ -259,6 +259,9 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffTraining.getFilePath())){
+                    workStaffTraining.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffTraining.getFilePath()));
+                }
                 newList.add(workStaffTraining);
 
                 for (WorkStaffTraining staffCertificate : newList) {
@@ -317,6 +320,9 @@ public class WorkStaffTrainingService extends CrudService<WorkStaffTrainingDao,
                         }
                     }
                 }
+                if(StringUtils.isNotBlank(workStaffTraining.getFilePath())){
+                    workStaffTraining.setFilePathStr( WorkattachmentService.fileUrlManage(workStaffTraining.getFilePath()));
+                }
                 newList.add(workStaffTraining);
             }
         }

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

@@ -20,6 +20,7 @@ import com.jeeplus.modules.sys.entity.MainDict;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.RoleService;
 import com.jeeplus.modules.sys.service.SysRoleActivityService;
 import com.jeeplus.modules.sys.service.UserService;

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

@@ -21,6 +21,7 @@ import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.RoleService;
 import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
@@ -778,6 +779,11 @@ public class WorkStaffBasicInfoController extends BaseController {
 			}
 		}
 
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getPicture())){
+			String urlManage = WorkattachmentService.fileUrlManage(workStaffBasicInfo.getPicture());
+			workStaffBasicInfo.setPictureStr(urlManage);
+		}
+
 		workStaffBasicInfo.setHome("home");
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 		return "modules/workstaff/workStaffBasicDetailModifyDirectly";
@@ -837,15 +843,15 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-        MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
-        if(pictureFile != null && pictureFile.getSize()>0){
-            String path = new StringBuilder("/employeeImg/")
-                    .append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
-            InputStream inputStream = pictureFile.getInputStream();
-            BOSClientUtil bosClientUtil = new BOSClientUtil();
-            String url = bosClientUtil.upload(path, inputStream);
-            workStaffBasicInfo.setPicture(url);
-        }
+		MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
+		if(pictureFile != null && pictureFile.getSize()>0){
+			String path = new StringBuilder("/employeeImg/")
+					.append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
+			InputStream inputStream = pictureFile.getInputStream();
+			BOSClientUtil bosClientUtil = new BOSClientUtil();
+			String url = bosClientUtil.upload(path, inputStream);
+			workStaffBasicInfo.setPicture(url);
+		}
 
 		String achieveId = workStaffBasicInfo.getId();
 		WorkStaffBasicInfo t = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
@@ -855,7 +861,11 @@ public class WorkStaffBasicInfoController extends BaseController {
 		t.setId(staffId);
 		workStaffBasicInfoService.updateAchieveDirectly(t,request);
 		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/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -207,6 +207,12 @@
 			<if test="userLoginFlag != null and userLoginFlag != ''">
 				AND suc.login_flag = #{userLoginFlag}
 			</if>
+			<if test="notOfficeParentIdList!=null and notOfficeParentIdList.size!=0">
+				and a.office_id not in
+				<foreach collection="notOfficeParentIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">

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

@@ -246,7 +246,7 @@
             <ul class="nav" id="side-menu">
                 <li class="nav-header" id="nav-header" style="border-bottom:solid 2px #0f92fb;">
                     <div class="dropdown profile-element">
-                        <span><img alt="image" class="img-circle profile" style="height:90px;width:90px;" src="${ctxStatic}/common/login/images/portrait.png" /></span>
+                        <span><img alt="image" class="img-circle profile" style="height:90px;width:90px;" src="${fns:getUser().photo}" /></span>
                         <%--<a data-toggle="dropdown" class="dropdown-toggle" href="javascript:void(0)">--%>
                                 <span class="clear">
                                <span class="block m-t-xs" style="font-size: 14px;cursor:default">${fns:getUser().name}</span>
@@ -276,7 +276,7 @@
                         </ul>
                     </div>
                     <div class="logo-element">
-                        <span><img alt="image" class="img-circle profile" style="height:50px;width:50px;" src="${ctxStatic}/common/login/images/portrait.png" /></span>
+                        <span><img alt="image" class="img-circle profile" style="height:50px;width:50px;" src="${fns:getUser().photo}" /></span>
                         <span class="block m-t-xs" style="font-size: 12px;">${fns:getUser().name}</span>
                     </div>
                 </li>

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

@@ -439,10 +439,10 @@
                                         编辑<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>
-                                        <li><a id="userEditDirectly" data-toggle="modal" onclick="openDialog2('修改档案信息', '${ctx}/workstaff/workStaffBasicInfo/applyEditDirectly','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>--%>
                                     </ul>
                                 </div>
                             </div>
@@ -497,9 +497,9 @@
                                                 <div id="this_upload_image_div_1">
                                                     <div id="this_upload_div_1" style="position:relative;">
                                                         <c:choose>
-                                                            <c:when test="${not empty workStaffBasicInfo.picture}">
+                                                            <c:when test="${not empty workStaffBasicInfo.pictureStr}">
                                                                 <%--<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>--%>
-                                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" />
+                                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}" />
                                                             </c:when>
                                                             <c:otherwise>
                                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" />

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

@@ -19,10 +19,11 @@
                 } else {
                     $('#flag').val('no');
                 }
-
-                if (!arraysEqual()) {
-                    parent.layer.msg("数电发票未全部确认，请检查确认后再次提交!", {icon: 5});
-                    return false
+                if(${ isChangeStatus == '1' }){
+                    if (!arraysEqual()) {
+                        parent.layer.msg("数电发票未全部确认，请检查确认后再次提交!", {icon: 5});
+                        return false
+                    }
                 }
                 $("#inputForm").submit();
                 return true;

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

@@ -38,11 +38,11 @@
                                 $("#nativePlaceId").val(data.newKey);
                                 $("#nativePlaceName").val(data.newValue);
                                 $("#nativePlaceName").css("color","red");
-                            }else if(name=="picture"){
+                            }/*else if(name=="picture"){
                                 $("#this_upload_image_1").prop("src",data.newValue);
                                 $("#picture").val(data.newValue);
                                 // this_upload_show_image("1");
-                            }else{
+                            }*/else{
                                 if(name=='exSoldier'){
                                     $("#exSoldierId").val(data.newValue);
                                     $("#exSoldierId").css("color","red");
@@ -294,8 +294,8 @@
         function this_upload_show_image(index){
             var obj =$("#this_upload_file_"+index)[0].files[0];
             var fileType = obj.type;
-            if(obj.size>100*1024){
-                layer.msg("请上传100KB内图片格式文件!",{icon:2});
+            if(obj.size>1000*1024){
+                layer.msg("请上传1000KB内图片格式文件!",{icon:2});
                 return false ;
             }
             var url ;
@@ -362,53 +362,57 @@
                 <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">
+                    <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">
+                        <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="no" 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="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">
+                        <div class="layui-item layui-col-sm12">
                             <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 value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control basicInfo 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-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 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 basicInfo layui-input required"/>
+                            </div>
                         </div>
                     </div>
-                    <div >
-                            <div class="layui-item layui-col-sm6 lw7">
+                    <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 basicInfo required"/>
+                                </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">
                                     <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="profile_box_wrapper">
+                            <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 basicInfo layui-input required"/>
+                                </div>
+                            </div>
+                        </div>
+                        <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;">
                                         <c:choose>
-                                            <c:when test="${not empty workStaffBasicInfo.picture}">
+                                            <c:when test="${not empty workStaffBasicInfo.pictureStr}">
                                                 <span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}"/>
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}"/>
                                             </c:when>
                                             <c:otherwise>
                                                 <img alt="_blank" id="this_upload_image_1" name="pictureFile" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"/>
@@ -419,12 +423,12 @@
                                     </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>
                         <div class="layui-input-block">
-                            <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control basicInfo layui-input" />
                         </div>
                     </div>
                     <%--<div class="layui-item layui-col-sm6 lw7">
@@ -437,19 +441,19 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">电子邮箱：</label>
                         <div class="layui-input-block">
-                            <form:input path="email" htmlEscape="false" readonly="true" class="form-control layui-input email"/>
+                            <form:input path="email" htmlEscape="false" readonly="true" class="form-control basicInfo layui-input email"/>
                         </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="mobile" htmlEscape="false" readonly="true" class="form-control layui-input  isPhone"/>
+                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input basicInfo isPhone"/>
                         </div>
                     </div>
-                        <%--<div class="layui-item layui-col-sm6 lw7">
+                        <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"/>
+                                <form:input path="phone" id="phone" placeholder=""  readonly="true"  htmlEscape="false"   class="form-control isTel basicInfo  layui-input"  maxlength="50"/>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
@@ -461,7 +465,7 @@
                         <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"/>
+                                <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input basicInfo digits"/>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
@@ -515,7 +519,7 @@
                             <div class="layui-input-block">
                                 <input name="roleName" value="${workStaffBasicInfo.roleName}" 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">职    位：</label>
                         <div class="layui-input-block">
@@ -547,13 +551,13 @@
                         <div class="layui-input-block">
                             <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw7">
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
                         <div class="layui-input-block">
                             <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
-                    </div>
+                    </div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">开户银行：</label>
                         <div class="layui-input-block">
@@ -562,14 +566,14 @@
                     </div>
 
 
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
                         <div class="layui-input-block">
                             <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon required basicInfo"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </div>
-                    </div>--%>
-                    <%--<div class="layui-item layui-col-sm6 lw7">
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">试用期结束日期：</label>
                         <div class="layui-input-block">
                             <input id="tryEndTime" name="tryEndTime" type="text" maxlength="20" readonly class="form-control layui-input"
@@ -591,7 +595,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">
@@ -645,11 +649,11 @@
                                                value="<fmt:formatDate value="${education.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="educationList${varStatus.index}_eduPhotoFileName1"><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></span>
+                                        <span id="educationList${varStatus.index}_eduPhotoFileName1"><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></span>
                                         <input id="educationList${varStatus.index}_eduPhotoFile" name="educationList[${varStatus.index}].eduPhotoFile" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="educationList${varStatus.index}_degreePhotoFileName1"><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></span>
+                                        <span id="educationList${varStatus.index}_degreePhotoFileName1"><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></span>
                                         <input id="educationList${varStatus.index}_degreePhotoFile" name="educationList[${varStatus.index}].degreePhotoFile" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                 </tr>
@@ -657,8 +661,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">
@@ -684,7 +688,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>
-                                        &lt;%&ndash;试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>&ndash;%&gt;
+                                        <%--试用期结束时间<td><fmt:formatDate value="${buyDetails.tryEndTime}" pattern="yyyy-MM-dd"/></td>--%>
 
                                     <c:forEach items="${buyDetails.workAttachments}" var = "workClientAttachment" varStatus="status">
                                         <c:choose>
@@ -712,8 +716,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">
@@ -752,7 +756,7 @@
                                                value="<fmt:formatDate value="${language.certifDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="languageList${varStatus.index}_fileName1"><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="${language.fileName}"></c:if></span>
+                                        <span id="languageList${varStatus.index}_fileName1"><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="${language.fileName}"></c:if></span>
                                         <input id="languageList${varStatus.index}_file" name="languageList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                 </tr>
@@ -760,8 +764,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">
@@ -812,7 +816,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">
@@ -885,7 +889,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">
@@ -926,7 +930,7 @@
                                         <input id="titleList${varStatus.index}_approvalAuthority" name="titleList[${varStatus.index}].approvalAuthority" readonly="true" class="form-control required" value="${title.approvalAuthority}"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="titleList${varStatus.index}_fileName1"><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></span>
+                                        <span id="titleList${varStatus.index}_fileName1"><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></span>
                                         <input id="titleList${varStatus.index}_file" name="titleList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                 </tr>
@@ -1032,7 +1036,7 @@
                                         <input id="trainingList${varStatus.index}_certificate" name="trainingList[${varStatus.index}].certificate" readonly="true" class="form-control required" value="${training.certificate}"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="trainingList${varStatus.index}_fileName1"><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=""></c:if></span>
+                                        <span id="trainingList${varStatus.index}_fileName1"><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=""></c:if></span>
                                         <input id="trainingList${varStatus.index}_file" name="trainingList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                     <td>
@@ -1205,7 +1209,7 @@
                                         <input id="recordList${varStatus.index}_num" name="recordList[${varStatus.index}].num" readonly="true" class="form-control" value="${record.num}"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="recordList${varStatus.index}_fileName1"><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=""></c:if></span>
+                                        <span id="recordList${varStatus.index}_fileName1"><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=""></c:if></span>
                                         <input id="recordList${varStatus.index}_file" name="recordList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                     <td>
@@ -1216,7 +1220,7 @@
                             </tbody>
                         </table>
                     </div>
-                </div>--%>
+                </div>
             </form:form>
         </div>
     </div>

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

@@ -229,14 +229,14 @@
                         <div class="layui-item layui-col-sm12">
                             <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 value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" 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">身份证号码：</label>
                             <div class="layui-input-block">
-                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
+                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);"  class="form-control idCard layui-input"/>
                             </div>
                         </div>
                     </div>
@@ -267,9 +267,9 @@
                                 <div id="this_upload_image_div_1">
                                     <div id="this_upload_div_1" style="position:relative;">
                                         <c:choose>
-                                            <c:when test="${not empty workStaffBasicInfo.picture}">
+                                            <c:when test="${not empty workStaffBasicInfo.pictureStr}">
                                                 <span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}"  onclick="this_upload_image_button(1)"/>
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}"  onclick="this_upload_image_button(1)"/>
                                             </c:when>
                                             <c:otherwise>
                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button(1)"/>
@@ -284,7 +284,7 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">出生日期：</label>
                         <div class="layui-input-block">
-                            <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <input id="birthday" name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <%--<div class="layui-item layui-col-sm6 lw7">
@@ -297,13 +297,13 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">电子邮箱：</label>
                         <div class="layui-input-block">
-                            <form:input path="email" htmlEscape="false" readonly="true" class="form-control layui-input email"/>
+                            <form:input path="email" htmlEscape="false"  class="form-control layui-input email"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">移动电话：</label>
                         <div class="layui-input-block">
-                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control layui-input isPhone"/>
+                            <form:input path="mobile" htmlEscape="false" class="form-control layui-input isPhone"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -385,7 +385,7 @@
                             <form:input path="roleName" htmlEscape="false" 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" />
@@ -406,7 +406,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">社保账号：</label>

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

@@ -281,9 +281,9 @@
                             <div id="this_upload_image_div_1">
                                 <div id="this_upload_div_1" style="position:relative;">
                                     <c:choose>
-                                        <c:when test="${not empty workStaffBasicInfo.picture}">
+                                        <c:when test="${not empty workStaffBasicInfo.pictureStr}">
                                             <span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>
-                                            <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" onclick="this_upload_image_button(1)"/>
+                                            <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}" onclick="this_upload_image_button(1)"/>
                                         </c:when>
                                         <c:otherwise>
                                             <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" onclick="this_upload_image_button(1)"/>
@@ -336,7 +336,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">银行卡号：</label>
                     <div class="layui-input-block">
-                        <form:input path="bankCard" htmlEscape="false" readonly="true"  maxlength="30" class="form-control layui-input digits"/>
+                        <form:input path="bankCard" htmlEscape="false" readonly="false"  maxlength="30" class="form-control layui-input digits"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">