From 6cdfdf8da9bc3b1d3e75c84bb7e1653f46d30c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 5 Jan 2025 17:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/system/api/RemoteProService.java | 10 --- .../yanzhu/system/api/RemoteRoleService.java | 5 +- .../yanzhu/system/api/RemoteUserService.java | 16 ++++ .../api/factory/RemoteProFallbackFactory.java | 6 -- .../factory/RemoteUserFallbackFactory.java | 6 ++ .../domain/ProProjectInfoSubdeptsUsers.java | 11 +++ .../ProProjectInfoSubdeptsUsersMapper.java | 8 ++ .../mapper/manage/ProProjectInfoMapper.xml | 6 +- .../ProProjectInfoSubdeptsUsersMapper.xml | 10 ++- .../resources/mapper/system/SysUserMapper.xml | 4 +- ...ProProjectInfoSubdeptsGroupController.java | 14 ++++ ...ProProjectInfoSubdeptsUsersController.java | 14 +++- .../IProProjectInfoSubdeptsGroupService.java | 7 ++ .../IProProjectInfoSubdeptsUsersService.java | 8 ++ ...roProjectInfoSubdeptsGroupServiceImpl.java | 84 ++++++++++++++++++- .../ProProjectInfoSubdeptsServiceImpl.java | 1 + ...roProjectInfoSubdeptsUsersServiceImpl.java | 18 ++++ .../system/controller/SysUserController.java | 9 ++ .../system/service/ISysUserService.java | 7 ++ .../service/impl/SysUserServiceImpl.java | 15 ++++ .../api/manage/proProjectInfoSubdeptsGroup.js | 9 ++ .../api/manage/proProjectInfoSubdeptsUsers.js | 17 ++++ .../src/api/manage/proProjectInfoUsers.js | 52 ------------ .../src/components/CurrentProject/index.vue | 2 +- .../manage/proProjectInfoSubdepts/index.vue | 4 +- .../proProjectInfoSubdeptsGroup/index.vue | 67 ++++++++++----- 26 files changed, 305 insertions(+), 105 deletions(-) delete mode 100644 yanzhu-ui-vue3/src/api/manage/proProjectInfoUsers.js diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java index de31a8ca..524c10a2 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteProService.java @@ -30,16 +30,6 @@ public interface RemoteProService @GetMapping(value = "/proProjectInfo/info/{id}") public R> info(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** - * 获取当前用户入场项目信息 - * - * @param userId 用户主键 - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/proProjectInfoUsers/projects/{userId}") - public R>> getProjects(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** * 分包人员审批通过信息同步 * diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java index b603fa52..dae91aea 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteRoleService.java @@ -4,11 +4,10 @@ import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.constant.ServiceNameConstants; import com.yanzhu.common.core.domain.R; import com.yanzhu.system.api.domain.SysRole; +import com.yanzhu.system.api.domain.SysUser; import com.yanzhu.system.api.factory.RemoteUserFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; /** * 用户服务 diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteUserService.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteUserService.java index 8e8d1005..b94d6b73 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteUserService.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteUserService.java @@ -110,6 +110,22 @@ public interface RemoteUserService @PostMapping("/user/register") public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 删除用户角色 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/user/removeUserRoles") + public R removeUserRoles(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 修改用户信息 + * @param sysUser + * @param source + * @return + */ @PutMapping("/user") public R updateUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java index d60cb9b0..00e28f72 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteProFallbackFactory.java @@ -33,12 +33,6 @@ public class RemoteProFallbackFactory implements FallbackFactory>> getProjects(Long userId, String source) - { - return R.fail("获取用户项目信息失败:" + throwable.getMessage()); - } - @Override public R approveSubDeptsUser(Long busKey, String source) { diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java index a7a8f38b..21ba5635 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java @@ -84,6 +84,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory removeUserRoles(SysUser sysUser, String source) + { + return R.fail("删除用户角色失败:" + throwable.getMessage()); + } + @Override public R updateUserInfo(SysUser sysUser, String source) { return R.fail("修改用户失败:" + throwable.getMessage()); diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java index e4760aaf..f727343d 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java @@ -172,6 +172,9 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity /** 进行步骤 */ private Long subStep; + /** 排序规则 */ + private Long sortBy; + /** 删除标识 */ @Excel(name = "数据状态") private Long isDel; @@ -512,6 +515,14 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.userNation = userNation; } + public Long getSortBy() { + return sortBy; + } + + public void setSortBy(Long sortBy) { + this.sortBy = sortBy; + } + @Override public String toString() { return "ProProjectInfoSubdeptsUsers{" + diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java index 2fa89c14..1b08251c 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java @@ -107,4 +107,12 @@ public interface ProProjectInfoSubdeptsUsersMapper * @param subDeptGroupId 班组主键 */ public void updateUseStatusByParams(@Param("subDeptId")Long subDeptId, @Param("subDeptGroupId")Long subDeptGroupId); + + /** + * 修改项目人员的默认项目 + * + * @param id 项目人员主键 + * @return 结果 + */ + int editDefaultProjectById(Long id); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index 73b634e8..f764e718 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -88,13 +88,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update pro_project_info_subdepts_group set use_status = 2 + update pro_project_info_subdepts_users set use_status = 2 where 1=1 and sub_dept_id = #{subDeptId} - and u.sub_dept_group = #{subDeptGroupId} + and sub_dept_group = #{subDeptGroupId} + + + + update pro_project_info_subdepts_group set sort_by = project_id where user_id = #{userId} \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml index a554abc0..1a6d8cc1 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml @@ -299,10 +299,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java index d0b6166e..05629d06 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java @@ -1,5 +1,6 @@ package com.yanzhu.manage.controller; +import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; @@ -8,12 +9,14 @@ import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; +import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Objects; /** * 单位班组Controller @@ -85,6 +88,17 @@ public class ProProjectInfoSubdeptsGroupController extends BaseController return toAjax(proProjectInfoSubdeptsGroupService.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup)); } + /** + * 修改班组组长 + * @param proProjectInfoSubdeptsGroup 班组信息 + * @return + */ + @RequiresPermissions("manage:proProjectInfoSubdeptsGroup:edit") + @PostMapping("/updateGroupLeader") + public AjaxResult updateGroupLeader(@RequestBody ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup){ + return toAjax(proProjectInfoSubdeptsGroupService.updateGroupLeader(proProjectInfoSubdeptsGroup)); + } + /** * 单位班组入场/离场 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index f2cf1c56..1b5580cd 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -1,6 +1,7 @@ package com.yanzhu.manage.controller; import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -151,7 +153,7 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController * @param state * @return */ - @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:remove") + @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:edit") @PostMapping("/enterState/{state}") public AjaxResult updateEnterState(@RequestBody List ids,@PathVariable int state){ try { @@ -197,4 +199,14 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController List list = proProjectInfoSubdeptsUsersService.findAllProSubDeptsUser(proProjectInfoSubdeptsUsers); return success(list); } + + /** + * 修改为默认项目 + */ + @GetMapping("/changeDefaultProject/{id}") + public AjaxResult changeDefaultProject(@PathVariable("id") Long id) + { + return toAjax(proProjectInfoSubdeptsUsersService.editDefaultProjectById(id)); + } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsGroupService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsGroupService.java index fab6d3d2..9b960efb 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsGroupService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsGroupService.java @@ -43,6 +43,13 @@ public interface IProProjectInfoSubdeptsGroupService */ public int updateProProjectInfoSubdeptsGroup(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup); + /** + * 修改班组组长 + * @param proProjectInfoSubdeptsGroup + * @return + */ + public int updateGroupLeader(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup); + /** * 修改班组状态 * @param id 班组主键 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java index 1c5fb4b6..8b8aee21 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java @@ -132,4 +132,12 @@ public interface IProProjectInfoSubdeptsUsersService * @param proId */ List> statsSubDeptsUsersByProId(Long proId); + + /** + * 修改项目人员的默认项目 + * + * @param id 项目人员主键 + * @return 结果 + */ + int editDefaultProjectById(Long id); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index 0f5be84b..424e12d2 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -1,6 +1,7 @@ package com.yanzhu.manage.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; +import com.yanzhu.common.core.annotation.Excel; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.exception.ServiceException; @@ -304,13 +305,93 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu } } } - return res; } } return res; } + /** + * 修改班组组长 + * @param proProjectInfoSubdeptsGroup + * @return + */ + @Override + @Transactional + public int updateGroupLeader(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup){ + int res = 1; + ProProjectInfoSubdeptsGroup entiry = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(proProjectInfoSubdeptsGroup.getId()); + if(StringUtils.isEmpty(entiry.getGroupLeaderPhone()) || !Objects.equals(entiry.getGroupLeaderPhone(),proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ + // 删除旧班组长角色信息 + if(StringUtils.isNotEmpty(entiry.getGroupLeaderPhone())){ + ProProjectInfoSubdeptsUsers oldQuery = new ProProjectInfoSubdeptsUsers(); + oldQuery.setProjectId(entiry.getProjectId()); + oldQuery.setSubDeptId(entiry.getSubDeptId()); + oldQuery.setUserPhone(entiry.getGroupLeaderPhone()); + List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(oldQuery); + ProProjectInfoSubdeptsUsers oldUser = dataList.get(0); + oldUser.setUserPost(UserPostEnums.LWGR.getCode()); + oldUser.setQrCode(""); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUser); + try { + SysUser sysUser = new SysUser(); + sysUser.setUserName(entiry.getGroupLeaderPhone()); + sysUser.setActiveProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + remoteUserService.removeUserRoles(sysUser, SecurityConstants.INNER); + }catch (Exception e){ + e.printStackTrace(); + } + } + ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); + query.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + query.setSubDeptId(proProjectInfoSubdeptsGroup.getSubDeptId()); + query.setUserPhone(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = dataList.get(0); + entiry.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + entiry.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + entiry.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); + entiry.setUpdateBy(SecurityUtils.getUsername()); + entiry.setUpdateTime(DateUtils.getNowDate()); + res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(entiry); + if(res > 0){ + proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.BZZ.getCode()); + proProjectInfoSubdeptsUsers.setSubDeptGroup(entiry.getId()); + proProjectInfoSubdeptsUsers.setSubDeptGroupName(entiry.getGroupName()); + // 设置班组长二维码信息... + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + // 生成二维码 + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + proProjectInfoSubdeptsUsers.setQrCode(profilePath); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); + }catch (Exception e){ + log.error(e.getMessage()); + } + // 修改用户角色信息 + try { + SysUser sysUser = new SysUser(); + sysUser.setUserName(entiry.getGroupLeaderPhone()); + sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); + sysUser.setNickName(entiry.getGroupLeaderName()); + sysUser.setPhonenumber(entiry.getGroupLeaderPhone()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); + sysUser.setRemark(entiry.getSubDeptName()); + sysUser.setActiveProjectId(entiry.getProjectId()); + remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + }catch (Exception e){ + e.printStackTrace(); + } + } + } + return res; + } + /** * 修改班组状态 * @param id 班组主键 @@ -318,6 +399,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu * @return */ @Override + @Transactional public int updateUseStatus(Long id, String status){ if(StringUtils.isNotEmpty(status)){ ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(id); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index e3236673..e7ec8b58 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -462,6 +462,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept * @return */ @Override + @Transactional public int updateUseStatus(Long id, String status){ if(StringUtils.isNotEmpty(status)){ ProProjectInfoSubdepts proProjectInfoSubdepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(id); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 7aebcad7..17ed79b3 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -683,4 +683,22 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu return proProjectInfoSubdeptsUsersMapper.statsSubDeptsUsersByProId(query); } + /** + * 修改项目人员的默认项目 + * + * @param id 项目人员主键 + * @return 结果 + */ + @Override + @Transactional + public int editDefaultProjectById(Long id){ + int res = proProjectInfoSubdeptsUsersMapper.editDefaultProjectById(SecurityUtils.getUserId()); + if(res>0){ + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); + proProjectInfoSubdeptsUsers.setSortBy(0L); + res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); + } + return res; + } + } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 25c33e86..257b65e8 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -208,6 +208,15 @@ public class SysUserController extends BaseController { return R.ok(userService.registerUser(sysUser)); } + /** + * 删除用户角色 + */ + @InnerAuth + @PostMapping("/removeUserRoles") + public R removeUserRoles(@RequestBody SysUser sysUser) { + return R.ok(userService.removeUserRoles(sysUser)); + } + /** * 获取用户信息 */ diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java index 9240775c..c21cf706 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java @@ -149,6 +149,13 @@ public interface ISysUserService */ public Long registerUser(SysUser user); + /** + * 删除用户角色 + * @param user + * @return + */ + public Long removeUserRoles(SysUser user); + /** * 修改用户信息 * diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index 54ac5605..090f1282 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -383,6 +383,21 @@ public class SysUserServiceImpl implements ISysUserService return userId; } + /** + * 删除用户角色 + * @param user + * @return + */ + @Override + public Long removeUserRoles(SysUser user){ + SysUser info = userMapper.checkUserNameUnique(user.getUserName()); + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(info.getUserId()); + userRole.setDeptId(user.getActiveProjectId()); + userRoleMapper.deleteUserRoleByUserRole(userRole); + return info.getUserId(); + } + /** * 保存单位角色... * @param roleName diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsGroup.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsGroup.js index 9c472eb8..5817602b 100644 --- a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsGroup.js +++ b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsGroup.js @@ -43,6 +43,15 @@ export function editUseStatus(id,status) { }) } +// 修改分包单位班组 +export function updateGroupLeader(data) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/updateGroupLeader', + method: 'post', + data: data + }) +} + // 删除分包单位班组 export function delProProjectInfoSubdeptsGroup(id) { return request({ diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js index 89d0ff1e..cd8a6695 100644 --- a/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js +++ b/yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js @@ -9,6 +9,15 @@ export function listProProjectInfoSubdeptsUsers(query) { }) } +// 查询分包单位工人列表 +export function findAllProSubDeptsUser(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/findAllProSubDeptsUser', + method: 'get', + params: query + }) +} + // 查询分包单位工人详细 export function getProProjectInfoSubdeptsUsers(id) { return request({ @@ -51,3 +60,11 @@ export function updateEnterState(ids,state) { data: ids }) } + +// 修改项目排序 +export function changeDefaultProject(id) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/changeDefaultProject/' + id, + method: 'get' + }) +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfoUsers.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfoUsers.js deleted file mode 100644 index 05fe0cd8..00000000 --- a/yanzhu-ui-vue3/src/api/manage/proProjectInfoUsers.js +++ /dev/null @@ -1,52 +0,0 @@ -import request from '@/utils/request' - -// 查询项目人员列表 -export function listProProjectInfoUsers(query) { - return request({ - url: '/manage/proProjectInfoUsers/list', - method: 'get', - params: query - }) -} - -// 查询项目人员详细 -export function getProProjectInfoUsers(id) { - return request({ - url: '/manage/proProjectInfoUsers/' + id, - method: 'get' - }) -} - -// 新增项目人员 -export function addProProjectInfoUsers(data) { - return request({ - url: '/manage/proProjectInfoUsers', - method: 'post', - data: data - }) -} - -// 修改项目人员 -export function updateProProjectInfoUsers(data) { - return request({ - url: '/manage/proProjectInfoUsers', - method: 'put', - data: data - }) -} - -// 删除项目人员 -export function delProProjectInfoUsers(id) { - return request({ - url: '/manage/proProjectInfoUsers/' + id, - method: 'delete' - }) -} - -// 改变项目排序 -export function changeDefaultProject(id) { - return request({ - url: '/manage/proProjectInfoUsers/changeDefaultProject/' + id, - method: 'get' - }) -} diff --git a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue index 982437a5..d2523e37 100644 --- a/yanzhu-ui-vue3/src/components/CurrentProject/index.vue +++ b/yanzhu-ui-vue3/src/components/CurrentProject/index.vue @@ -62,7 +62,7 @@ import { OfficeBuilding } from '@element-plus/icons-vue' import { findMyProjectList } from "@/api/publics"; import { switchProject, cancelProject } from '@/api/login' -import { changeDefaultProject } from "@/api/manage/proProjectInfoUsers"; +import { changeDefaultProject } from "@/api/manage/proProjectInfoSubdeptsUsers"; const { proxy } = getCurrentInstance(); import useUserStore from '@/store/modules/user' diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue index 1ffa3aa6..0a2bcbc9 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue @@ -61,7 +61,7 @@ - - + @@ -76,7 +76,7 @@ - + diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue index 60915b66..a1eeaf75 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue @@ -72,7 +72,7 @@ - + + + + - + @@ -141,13 +146,13 @@ - + {{ leaderForm.projectName }} @@ -163,16 +168,16 @@ {{leaderForm.groupName}} - - + + @@ -180,12 +185,14 @@