人员信息添加注销激活功能

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/entity/WorkStaffBasicInfo.java

@@ -110,6 +110,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	private String highestEducation;	//最高学历
 	private String handSignature;	//手签章路径
 	private String handSignatureUrl;	//手签章路径(展示)
+	private String userLoginFlag;	//用户登录状态
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -835,4 +836,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setHandSignatureUrl(String handSignatureUrl) {
 		this.handSignatureUrl = handSignatureUrl;
 	}
+
+	public String getUserLoginFlag() {
+		return userLoginFlag;
+	}
+
+	public void setUserLoginFlag(String userLoginFlag) {
+		this.userLoginFlag = userLoginFlag;
+	}
 }

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

@@ -1065,4 +1065,12 @@ 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

@@ -941,4 +941,15 @@ 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,9 +167,11 @@
 		SELECT
 			<include refid="workStaffBasicInfoColumns"/>
 		,su.name as "auditUserName"
+		,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 != ''">
@@ -690,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

@@ -270,8 +270,18 @@
                         ////对操作进行初始化
                         var xml = "<div class=\"layui-btn-group\">";
 
-                        if(d.canedit != undefined && d.canedit == "1")
+                        if(d.canedit != undefined && d.canedit == "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>";
+                        }
+
+
+                        if(d.freeze != undefined && d.freeze == "1"){
+                            if(d.userLoginFlag == 1){
+                                xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/freeze?userId=" + d.userId + "\" onclick=\"return confirmx('确认要注销该人员信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-btn-warm\"> 注销</a>";
+                            }else{
+                                xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/freeze?userId=" + d.userId + "\" onclick=\"return confirmx('确认要激活该人员信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-btn-normal\"> 激活</a>";
+                            }
+                        }
 
                         if(d.candelete != undefined && d.candelete == "1")
                             xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
@@ -289,6 +299,7 @@
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
                     ,"role":"${workStaffBasicInfo.roleName}"
+                    ,"userLoginFlag":"${workStaffBasicInfo.userLoginFlag}"
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
                     ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
@@ -296,9 +307,11 @@
                     ,'office':"<c:out value="${workStaffBasicInfo.office.name}" escapeXml="true"/>"
                     ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
                     ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
+                    ,"userId":"${workStaffBasicInfo.userId}"
                     ,'highestEducation':"<c:out value="${workStaffBasicInfo.highestEducation}"/>"
                     ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
                     <shiro:hasPermission name="workstaff:workStaffBasicInfo:edit">,"canedit":"1"</shiro:hasPermission>
+                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:freeze">,"freeze":"1"</shiro:hasPermission>
                     <shiro:hasPermission name="workstaff:workStaffBasicInfo:del">,"candelete":"1"</shiro:hasPermission>
                 }
                 </c:forEach>