parent
3c8e07cfe4
commit
9e968e5f0d
|
|
@ -134,8 +134,32 @@ public class SysUser extends BaseEntity {
|
|||
private String isPd;
|
||||
|
||||
/**
|
||||
* 是否项目部
|
||||
* 是否授予更新人脸权限
|
||||
*/
|
||||
private String isFace;
|
||||
|
||||
/**
|
||||
* 应用人脸
|
||||
*/
|
||||
private String appliedFace;
|
||||
|
||||
/**
|
||||
* 修改人脸
|
||||
*/
|
||||
private String newFace;
|
||||
|
||||
/**
|
||||
* 0 待审核 1 已审核 2 不通过
|
||||
*/
|
||||
private String isCheck;
|
||||
|
||||
/**
|
||||
* 审批意见
|
||||
*/
|
||||
private String examineOpinion;
|
||||
|
||||
/**
|
||||
* 采集时间
|
||||
*/
|
||||
private String collectionTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import com.bonus.system.api.domain.MapVo;
|
|||
import com.bonus.system.api.domain.SysUser;
|
||||
import com.bonus.system.basic.service.SysMenuService;
|
||||
import com.bonus.system.basic.service.SysUserService;
|
||||
import com.bonus.system.dept.entity.ProDeptRoleDo;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.util.IOUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -90,6 +91,16 @@ public class SysUserController extends BaseController {
|
|||
return userService.updatePwd(user);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 授予更新人脸权
|
||||
*/
|
||||
@Log(title = "系统管理->人员信息->授予更新人脸权", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/updateIsFace")
|
||||
public AjaxResult updateIsFace(@Validated @RequestBody SysUser user){
|
||||
return userService.updateIsFace(user);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改用户
|
||||
*/
|
||||
|
|
@ -240,6 +251,20 @@ public class SysUserController extends BaseController {
|
|||
return userService.getSelectUserCurrent();
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批项目部角色配置
|
||||
*/
|
||||
@PostMapping("checkPersonAssignment")
|
||||
@Log(title = "项目部管理->项目部角色管理->项目部角色审批", businessType = BusinessType.UPDATE)
|
||||
public AjaxResult checkPersonAssignment(@RequestBody SysUser bean) {
|
||||
try{
|
||||
return toAjax(userService.checkPersonAssignment(bean));
|
||||
}catch (Exception e){
|
||||
logger.error(e.toString(),e);
|
||||
}
|
||||
return error("系统异常");
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户模板-下载模板
|
||||
* @param request
|
||||
|
|
|
|||
|
|
@ -211,4 +211,14 @@ public interface SysUserMapper
|
|||
* @return
|
||||
*/
|
||||
SysUser checkUserNameUnique(String userName);
|
||||
List<MapVo> getAttGroupByUserId(SysUser user);
|
||||
|
||||
/**
|
||||
* 授予更新人脸权
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
int updateIsFace(SysUser user);
|
||||
|
||||
int checkPersonAssignment(SysUser bean);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,4 +130,14 @@ public interface SysUserService {
|
|||
* @return
|
||||
*/
|
||||
boolean checkUserNameUnique(SysUser user);
|
||||
// List<MapVo> getAttGroupByUserId(SysUser user);
|
||||
|
||||
/**
|
||||
* 授予更新人脸权
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
AjaxResult updateIsFace(SysUser user);
|
||||
|
||||
int checkPersonAssignment(SysUser bean);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,6 +203,23 @@ public class SysUserServiceImpl implements SysUserService
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult updateIsFace(SysUser user) {
|
||||
int result = userMapper.updateIsFace(user);
|
||||
if (result == 0) {
|
||||
return AjaxResult.error("修改失败");
|
||||
}else if (result == 1) {
|
||||
return AjaxResult.success();
|
||||
}else {
|
||||
return AjaxResult.error("修改失败");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int checkPersonAssignment(SysUser bean) {
|
||||
return userMapper.checkPersonAssignment(bean);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int deleteUserByIds(Long userId) {
|
||||
|
|
|
|||
|
|
@ -69,6 +69,14 @@
|
|||
where user_id = #{userId}
|
||||
</update>
|
||||
|
||||
<update id="updateIsFace">
|
||||
update sys_user set is_face = #{isFace} where user_id = #{userId}
|
||||
</update>
|
||||
|
||||
<update id="checkPersonAssignment">
|
||||
UPDATE sys_user_face SET `is_check` = #{isCheck}, `examine_opinion` = #{examineOpinion} WHERE `user_id` = #{userId}
|
||||
</update>
|
||||
|
||||
<select id="selectUserByUserName" resultType="com.bonus.system.api.domain.SysUser">
|
||||
select * from sys_user su
|
||||
where su.is_active = 1 and su.phone = #{userName}
|
||||
|
|
@ -101,7 +109,12 @@
|
|||
GROUP_CONCAT(DISTINCT so.org_name ORDER BY so.id SEPARATOR ', ') as orgName,
|
||||
GROUP_CONCAT(DISTINCT sdd.dict_label ORDER BY sdd.dict_code SEPARATOR ', ') as postName,
|
||||
GROUP_CONCAT(DISTINCT sr.role_name ORDER BY sr.role_id SEPARATOR ', ') as roleName,
|
||||
su.phone,su.is_cadre as isCadre
|
||||
su.phone,su.is_cadre as isCadre,
|
||||
su.is_face as isFace,
|
||||
case when suf.new_face is not null then suf.new_face else suf.applied_face end new_face,
|
||||
suf.is_check,
|
||||
suf.examine_opinion as examineOpinion,
|
||||
suf.collection_time
|
||||
FROM
|
||||
sys_user su
|
||||
LEFT JOIN sys_user_post sup on sup.user_id=su.user_id and sup.is_active=1
|
||||
|
|
@ -110,6 +123,7 @@
|
|||
LEFT JOIN sys_role sr on sr.role_id=sur.role_id and sr.del_flag=0
|
||||
LEFT JOIN sys_user_org suo on suo.user_id=su.user_id and suo.is_active=1
|
||||
LEFT JOIN sys_organization so on so.id=suo.org_id and so.is_active=1
|
||||
LEFT JOIN sys_user_face suf ON suf.user_id = su.user_id
|
||||
WHERE
|
||||
su.is_active =1
|
||||
<if test="userName != null and userName != ''">
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, '出差报备', #{leaveReason},
|
||||
#{leaveStartDate}, #{leaveStartInterval}, #{leaveEndDate}, #{leaveEndInterval},
|
||||
#{leaveDuration}, #{source}, #{createUserId}, #{isAgree}, #{location}, #{hostUserId}, #{remark},
|
||||
#{uuId}, #{createUserId},'1')
|
||||
#{uuid}, #{createUserId},'1')
|
||||
</insert>
|
||||
|
||||
<update id="updateEvection">
|
||||
|
|
@ -56,13 +56,13 @@
|
|||
leave_duration = #{leaveDuration},
|
||||
update_user_id = #{updateUserId}
|
||||
</set>
|
||||
where leave_form_id = #{uuId}
|
||||
where leave_form_id = #{uuid}
|
||||
</update>
|
||||
|
||||
<update id="deleteEvectionById">
|
||||
update leave_apply
|
||||
SET is_active = '0'
|
||||
WHERE leave_form_id = #{uuId}
|
||||
WHERE leave_form_id = #{uuid}
|
||||
</update>
|
||||
|
||||
<select id="getEvectionList" resultType="com.bonus.system.evection.entity.EvectionBean">
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
l.leave_end_interval,
|
||||
l.leave_duration,
|
||||
GROUP_CONCAT(d.dict_label SEPARATOR ', ') AS postName,
|
||||
l.leave_form_id as uuId,
|
||||
l.leave_form_id as uuid,
|
||||
l.submit_id,
|
||||
l.update_time
|
||||
FROM
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
ORDER BY l.update_time DESC
|
||||
) a
|
||||
LEFT JOIN sys_user su ON su.user_id = a.submit_id
|
||||
GROUP BY uuId
|
||||
GROUP BY uuid
|
||||
ORDER BY leave_start_date DESC
|
||||
</select>
|
||||
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
l.leave_end_interval,
|
||||
l.leave_duration,
|
||||
GROUP_CONCAT(d.dict_label SEPARATOR ', ') AS postName,
|
||||
l.leave_form_id as uuId,
|
||||
l.leave_form_id as uuid,
|
||||
l.submit_id,
|
||||
l.host_user_id,
|
||||
l.is_agree,
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
LEFT JOIN sys_dict_data d on d.dict_code = p.post_id
|
||||
WHERE l.is_active = '1'
|
||||
AND l.leave_type = '出差报备'
|
||||
and l.leave_form_id = #{uuId}
|
||||
and l.leave_form_id = #{uuid}
|
||||
GROUP BY l.id,
|
||||
l.user_id,
|
||||
l.user_name,
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
l.remark
|
||||
ORDER BY l.update_time DESC) a
|
||||
LEFT JOIN sys_user su ON su.user_id = a.submit_id
|
||||
GROUP BY uuId
|
||||
GROUP BY uuid
|
||||
</select>
|
||||
|
||||
<select id="getPostName" resultType="com.bonus.system.evection.entity.EvectionBean">
|
||||
|
|
|
|||
Loading…
Reference in New Issue