From 61c65f1b5041552cec5b9773d3fae171d3ee2811 Mon Sep 17 00:00:00 2001 From: "xuetao.li" Date: Mon, 17 Apr 2023 17:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=94=99=E8=AF=AF=E5=AE=8C=E6=88=90=EF=BC=88?= =?UTF-8?q?=E9=83=BD=E6=B7=BB=E5=8A=A0=E4=BA=86TODO=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/sys/dao/mysql/RoleEODao.java | 1 - .../adc/da/sys/dao/mysql/RoleMenuEODao.java | 3 - .../com/adc/da/sys/dao/mysql/UserEODao.java | 6 - .../com/adc/da/sys/service/RoleEOService.java | 43 --- .../adc/da/sys/service/UserEOServiceImpl.java | 17 - .../sys/service/iservice/IUserEoService.java | 3 - .../main/java/com/adc/da/sys/vo/UserVO.java | 5 + .../java/com/adc/da/sys/vo/ddm/DdmMenuVO.java | 13 - .../da/sys/vo/ddm/DdmRoleMenuCreateVO.java | 18 - .../adc/da/sys/vo/ddm/DdmRoleUserQuery.java | 10 - .../com/adc/da/sys/vo/ddm/DdmUserQueryVO.java | 14 - .../java/com/adc/da/sys/vo/ddm/DdmUserVO.java | 18 - .../java/com/adc/da/sys/vo/iam/orgsIAM.java | 14 + .../mapper/sys/mysql/RoleMenuEOMapper.xml | 13 - .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 16 - .../task/TaskController.java | 44 ++- .../task/TodoTaskController.java | 345 ++++++------------ .../entity/BusProcessApprove.java | 14 +- .../entity/BusProcessEntrust.java | 63 ++++ .../business_main/entity/BusProcessName.java | 17 +- .../business_main/entity/BusProcessNew.java | 39 +- .../mapper/BusProcessApproveMapper.java | 17 + .../mapper/BusProcessEntrustMapper.java | 16 + .../service/IBusProcessApproveService.java | 13 + .../service/IBusProcessEntrustService.java | 16 + .../impl/BusProcessApproveServiceImpl.java | 23 ++ .../impl/BusProcessEntrustServiceImpl.java | 20 + .../business_main/vo/ApproveDataVO.java | 2 + .../mapper/BusProcessApproveMapper.xml | 5 + .../mapper/BusProcessEntrustMapper.xml | 5 + 30 files changed, 368 insertions(+), 465 deletions(-) delete mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmMenuVO.java delete mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleMenuCreateVO.java delete mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleUserQuery.java delete mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserQueryVO.java delete mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserVO.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessEntrustMapper.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessEntrustService.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java create mode 100644 report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessEntrustServiceImpl.java create mode 100644 report-activity/src/main/resources/mapper/BusProcessApproveMapper.xml create mode 100644 report-activity/src/main/resources/mapper/BusProcessEntrustMapper.xml diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleEODao.java index df2e0b7..d4fb191 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleEODao.java @@ -3,7 +3,6 @@ package com.adc.da.sys.dao.mysql; import java.util.List; import com.adc.da.sys.vo.UserRoleVO; -import com.adc.da.sys.vo.ddm.DdmRoleUserQuery; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleMenuEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleMenuEODao.java index 5b3e786..bc9bf94 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleMenuEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleMenuEODao.java @@ -1,9 +1,7 @@ package com.adc.da.sys.dao.mysql; import com.adc.da.base.dao.BaseDao; -import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.RoleMenuEO; -import com.adc.da.sys.vo.ddm.DdmMenuVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,5 +17,4 @@ public interface RoleMenuEODao extends BaseDao { List getRoleMenuList(@Param("roleId") String roleId); - List getRoleMenuInfoList(@Param("roleId") String roleId); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java index 2dffaf7..1f11dd9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Map; import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -39,10 +37,6 @@ public interface UserEODao extends BaseMapper { // 根据account获取未逻辑删除的UserEO UserEO getUserEOByAccountNotDeleted(String account); - IPage getUserPage(IPage page, @Param("userAccount") String account, @Param("userName") String userName); - - Long getUserCount(DdmUserQueryVO ddmUserQueryVO); - int insertUserBatch(@Param("userEOList") List userEOList); List> allList( @Param("account") String account, @Param("roleName") String roleName); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java index 39d19f9..3dfb3bc 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java @@ -2,29 +2,12 @@ package com.adc.da.sys.service; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import com.adc.da.sys.dao.mysql.*; import com.adc.da.sys.entity.*; -import com.adc.da.sys.vo.MenuVO; -import com.adc.da.sys.vo.UserRoleVO; -import com.adc.da.sys.vo.ddm.DdmMenuVO; -import com.adc.da.sys.vo.ddm.DdmRoleMenuCreateVO; -import com.adc.da.sys.vo.ddm.DdmRoleUserQuery; -import com.adc.da.sys.vo.ddm.DdmUserVO; -import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.http.PageInfo; import com.adc.da.util.utils.BeanMapper; -import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.adc.da.base.service.BaseService; @@ -147,32 +130,6 @@ public class RoleEOService extends BaseService { return dao.getUserRoleListByRoleId(roleId); } - /** - * 查询角色所对应的用户 - * - * @param roleId 角色id - * @return 角色信息 - */ - @Transactional(readOnly = true) - public List getUserInfoListByRoleId(String roleId) { - return dao.getUserInfoListByRoleId(roleId); - } - - @Transactional(readOnly = true) - public PageInfo getUserInfoPageByRoleId(DdmRoleUserQuery query) { - IPage page = new Page(); - page.setCurrent(query.getPageNum()); - page.setSize(query.getPageSize()); - IPage userInfoList = dao.getUserInfoPageByRoleId(page, query.getRoleId()); - Long count = dao.getUserCountByRoleId(query.getRoleId()); - PageInfo pageInfo = new PageInfo(); - pageInfo.setPageSize(query.getPageSize()); - pageInfo.setCount(count); - pageInfo.setList(userInfoList.getRecords()); - return pageInfo; - } - - /** * 设置角色菜单关联 * diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 0c2bd85..1fda33e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -10,10 +10,7 @@ import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.util.EncryptUtil; import com.adc.da.sys.vo.UserImportVO; import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.http.PageInfo; import com.adc.da.util.utils.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -191,20 +188,6 @@ public class UserEOServiceImpl implements IUserEoService { return userEO; } - @Transactional(readOnly = true) - public PageInfo getUserPage(DdmUserQueryVO query) { - IPage page = new Page(); - page.setCurrent(query.getPageNum()); - page.setSize(query.getPageSize()); - IPage userPage = dao.getUserPage(page,query.getUserAccount(),query.getUserName()); - Long count = dao.getUserCount(query); - PageInfo pageInfo = new PageInfo(); - pageInfo.setPageSize(query.getPageSize()); - pageInfo.setCount(count); - pageInfo.setList(userPage.getRecords()); - return pageInfo; - } - @Override @Transactional(rollbackFor = Exception.class) public void importExcelUser(List list) { diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java index d9c9ae0..071ade5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java @@ -3,9 +3,6 @@ package com.adc.da.sys.service.iservice; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.vo.UserImportVO; import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; -import com.adc.da.util.http.PageInfo; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java index 618d586..a4914a5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.vo.iam.orgsIAM; import lombok.Data; @@ -46,5 +47,9 @@ public class UserVO { private List roleIdList = new ArrayList<>(); + /** + * 部门列表 + */ + private List orgList = new ArrayList(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmMenuVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmMenuVO.java deleted file mode 100644 index d8b8c98..0000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmMenuVO.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.adc.da.sys.vo.ddm; - -import lombok.Data; - -@Data -public class DdmMenuVO { - //菜单id - private String modelId; - //菜单父Id - private String parentModelId; - //菜单名称 - private String modelName; -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleMenuCreateVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleMenuCreateVO.java deleted file mode 100644 index 00e22e6..0000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleMenuCreateVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.adc.da.sys.vo.ddm; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -@Data -public class DdmRoleMenuCreateVO { - //菜单id - @NotBlank(message = "菜单id不能为空") - private String modelId; - //菜单父Id - @NotBlank(message = "菜单父id不能为空") - private String parentModelId; - //角色id - @NotBlank(message = "角色id不能为空") - private String roleId; -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleUserQuery.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleUserQuery.java deleted file mode 100644 index 417d6d4..0000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleUserQuery.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.adc.da.sys.vo.ddm; - -import lombok.Data; - -@Data -public class DdmRoleUserQuery { - private String roleId; - private Integer pageNum; - private Integer pageSize; -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserQueryVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserQueryVO.java deleted file mode 100644 index 978837e..0000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserQueryVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.adc.da.sys.vo.ddm; - -import lombok.Data; - -@Data -public class DdmUserQueryVO { - - private String userAccount; - private String userName; - private Integer pageNum; - private Integer pageSize; - - -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserVO.java deleted file mode 100644 index db8cb40..0000000 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.adc.da.sys.vo.ddm; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - - -@Data -public class DdmUserVO { - - private String userId; - - private String userName; - - private String userAccount; - -} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java new file mode 100644 index 0000000..918eca0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java @@ -0,0 +1,14 @@ +package com.adc.da.sys.vo.iam; + +import lombok.Data; + +@Data +public class orgsIAM { + + private String orgCode; // 组织编码 + + private String orgName; // 部门名称 + + private String orgShortName; // 部门简称 + +} diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleMenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleMenuEOMapper.xml index 2d1339e..f68957c 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleMenuEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleMenuEOMapper.xml @@ -75,17 +75,4 @@ select role_id,menu_id from TR_ROLE_MENU where role_id=#{roleId} - - diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index fdc5920..d648930 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -19,22 +19,6 @@ - -