人员信息部分代码更改

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

@@ -6,7 +6,6 @@ package com.jeeplus.modules.workstaff.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -84,4 +83,11 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     Integer updateAuditUser(WorkStaffBasicInfo workStaffBasicInfo);
 
     List<WorkStaffBasicInfo> getByName(String name);
+
+    /**
+     * 员工信息冻结或激活
+     * @param workStaffBasicInfo
+     * @return
+     */
+    int freeze(WorkStaffBasicInfo workStaffBasicInfo);
 }

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

@@ -3,26 +3,19 @@
  */
 package com.jeeplus.modules.workstaff.service;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
-import com.jeeplus.common.utils.FileUtils;
-import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.AreaDao;
-import com.jeeplus.modules.sys.dao.UserDao;
-import com.jeeplus.modules.sys.entity.*;
+import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -36,21 +29,28 @@ import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workrelationship.dao.WorkRelationshipDao;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workstaff.dao.*;
-import com.jeeplus.modules.workstaff.entity.*;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfoExcel;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.service.CrudService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 员工基本信息Service
@@ -1063,4 +1063,13 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         return super.findPage(page, workStaffBasicInfo);
     }
 
+    /**
+     * 员工信息冻结或激活
+     * @param workStaffBasicInfo
+     */
+    @Transactional(readOnly = false)
+    public void freeze(WorkStaffBasicInfo workStaffBasicInfo) {
+        workStaffBasicInfoDao.freeze(workStaffBasicInfo);
+    }
+
 }

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

@@ -16,7 +16,6 @@ import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -51,7 +50,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -939,4 +941,16 @@ public class WorkStaffBasicInfoController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
 	}
+
+
+	/**
+	 * 员工信息冻结或激活
+	 */
+	@RequiresPermissions("workstaff:workStaffBasicInfo:freeze")
+	@RequestMapping(value = "freeze")
+	public String freeze(WorkStaffBasicInfo workStaffBasicInfo, RedirectAttributes redirectAttributes) {
+		workStaffBasicInfoService.freeze(workStaffBasicInfo);
+		addMessage(redirectAttributes, "员工登录权限更新成功");
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+	}
 }

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

@@ -167,10 +167,11 @@
 		SELECT
 			<include refid="workStaffBasicInfoColumns"/>
 		,su.name as "auditUserName"
-		,u.login_flag as "userLoginFlag"
+		,suc.login_flag as "userLoginFlag"
 		FROM work_staff_basic_info a
 		<include refid="workStaffBasicInfoJoins"/>
 		LEFT JOIN sys_user su ON su.id = a.audit_user_id
+		LEFT JOIN sys_user suc ON suc.id = a.user_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="company != null and company.id != null and company.id != ''">
@@ -691,4 +692,10 @@
 		WHERE a.name = #{name} and a.del_flag = 0
 	</select>
 
+	<update id="freeze">
+		update sys_user
+		set login_flag = CASE login_flag WHEN 0 THEN 1 WHEN 1 THEN 0 END
+		where id = #{userId}
+	</update>
+
 </mapper>

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

@@ -276,9 +276,9 @@
 
                         if(d.freeze != undefined && d.freeze == "1"){
                             if(d.userLoginFlag == 1){
-                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('冻结', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 冻结</a>";
+                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('冻结', '${ctx}/workstaff/workStaffBasicInfo/freeze?userId="+ d.userId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 冻结</a>";
                             }else{
-                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('激活', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 激活</a>";
+                                xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('激活', '${ctx}/workstaff/workStaffBasicInfo/freeze?userId="+ d.userId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 激活</a>";
                             }
                         }
 
@@ -297,6 +297,7 @@
                     "index":"${index.index+1}"
                     ,"id":"${workStaffBasicInfo.id}"
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
+                    ,"userId":"${workStaffBasicInfo.userId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
                     ,"role":"${workStaffBasicInfo.roleName}"
                     ,"userLoginFlag":"${workStaffBasicInfo.userLoginFlag}"