diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index c9901ec..22b6f55 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -457,7 +457,7 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); - String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId(); + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); //用户级别 double level = Double.parseDouble(levelId); //总监拥有全部报告的预览和下载权力 @@ -717,7 +717,7 @@ public class IReportServiceImpl extends ServiceImpl }); } UserEO userEo = userEODao.selectById(UserUtils.getUserId()); - String levelId = userEo.getLevelId() == null ? "1.0" : userEo.getLevelId(); + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); //用户级别 double level = Double.parseDouble(levelId); if (level <= 0.5) { diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java index 69e6851..5843c73 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -105,4 +106,9 @@ public class ReportDetailVo { * 标签列表名 */ private List labels; + + /** + * 保密到期日期 + */ + private Date secrecyLast; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 05095f3..4bf88c4 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -286,7 +286,8 @@ rm.fileId AS fileId, f.file_name as fileName, rm.confidentialLevel AS confidentialLevel, - rm.privacyLevel AS privacyLevel + rm.privacyLevel AS privacyLevel, + rm.secrecy_last AS secrecyLast FROM `tt_report_manage` AS rm LEFT JOIN ts_user AS u ON u.USID = rm.createUserId LEFT JOIN ts_org as org on org.id = rm.department diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 9f9f344..634da53 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -4,10 +4,8 @@ import com.adc.da.base.web.BaseController; import com.adc.da.excel.poi.excel.ExcelImportUtil; import com.adc.da.excel.poi.excel.entity.ImportParams; import com.adc.da.sys.constant.SysConstants; -import com.adc.da.sys.dao.mysql.UserOrgEODao; import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserOrgEO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.util.EncryptUtil; import com.adc.da.sys.util.RSAUtil; @@ -15,9 +13,9 @@ import com.adc.da.sys.vo.UserImportVO; import com.adc.da.sys.vo.UserVO; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; +import com.adc.da.util.utils.CollectionUtils; import com.adc.da.util.utils.FileUtil; import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -26,7 +24,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -53,9 +50,6 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; - @Autowired - private UserOrgEODao userOrgEODao; - @Value("${isPassEncrypted}") private boolean isPassEncrypted; @@ -121,22 +115,7 @@ public class UserEOController extends BaseController { userEOService.save(eo); - //保存部门 - LambdaQueryWrapper userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid()); - userOrgEODao.delete(userOrgEOLambdaQueryWrapper); - String orgId = eo.getOrgId(); - if (StringUtils.isNotEmpty(orgId)){ - String[] split = orgId.split(","); - List userOrgEOS = new ArrayList<>(); - for (String s : split) { - UserOrgEO userOrgEO = new UserOrgEO(); - userOrgEO.setUserId(eo.getUsid()); - userOrgEO.setOrgId(s); - userOrgEOS.add(userOrgEO); - } - userOrgEODao.insertBatch(userOrgEOS); - } + return Result.success(); } @@ -245,9 +224,12 @@ public class UserEOController extends BaseController { @ApiOperation(value = "查询自己领导") @GetMapping("getOwnLeader") public ResponseMessage getOwnLeader(String userId){ - UserEO userEoById = userEOService.getUserEoById(userId); + UserVO userEoById = userEOService.getUserEoById(userId); List orgEOList = userEoById.getOrgEOList(); - List leaderList = userEOService.getOwnLeader(orgEOList); + List leaderList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(orgEOList)){ + leaderList = userEOService.getOwnLeader(orgEOList); + } return Result.success(leaderList); } } 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 98019d2..4429887 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 @@ -42,9 +42,9 @@ public interface UserEODao extends BaseMapper { List> allList( @Param("account") String account, @Param("roleName") String roleName); - UserEO getUserEoById(@Param("usid") String usid); + UserVO getUserEoById(@Param("usid") String usid); - UserEO selectUserByIdNodel(String userId); + UserVO selectUserByIdNodel(String userId); List getOwnLeader(@Param("Vo") List orgEOList); } 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 ab731bd..4ec759d 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 @@ -185,8 +185,8 @@ public class UserEOServiceImpl implements IUserEoService { } @Override - public UserEO getUserEoById(String usid) { - UserEO userEO = dao.getUserEoById(usid); + public UserVO getUserEoById(String usid) { + UserVO userEO = dao.getUserEoById(usid); return userEO; } @@ -328,7 +328,7 @@ public class UserEOServiceImpl implements IUserEoService { } @Override - public UserEO getUserByIdNodel(String userId) { + public UserVO getUserByIdNodel(String userId) { return dao.selectUserByIdNodel(userId); } 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 f7f8a9b..35824d6 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 @@ -36,7 +36,7 @@ public interface IUserEoService { UserEO getUserById(String usid); - UserEO getUserEoById(String usid); + UserVO getUserEoById(String usid); List getUserByIdList(List userIdList); @@ -67,7 +67,7 @@ public interface IUserEoService { * @param userId * @return */ - UserEO getUserByIdNodel(String userId); + UserVO getUserByIdNodel(String userId); List getOwnLeader(List orgEOList); } 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 00ffa4c..295a31a 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 @@ -184,7 +184,7 @@ #{id} - select users.usid, users.usname, @@ -201,13 +201,13 @@ o.bmdm_14 as o_bmdm14 from TS_USER users left join TR_USER_ROLE ur on users.usid = ur.user_id - left join TS_ROLE r on ur.role_id = r.id + left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0 left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.org_code + left join TS_ORG o on uo.org_id = o.org_code and o.status = 1 where users.del_flag != 1 and users.usid=#{usid} - select users.usid, users.usname, @@ -230,7 +230,7 @@ where users.usid=#{usid} - select users.usid, @@ -262,7 +262,7 @@ uo.org_id in - #{item.Id} + #{item.id} and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1 diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 9b869de..0bd0148 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class index f180a61..9d15265 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class and b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/UserEODao.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index 47b6da4..fc828f2 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class index 88db361..2576191 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/iservice/IUserEoService.class differ diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml index 00ffa4c..295a31a 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -184,7 +184,7 @@ #{id} - select users.usid, users.usname, @@ -201,13 +201,13 @@ o.bmdm_14 as o_bmdm14 from TS_USER users left join TR_USER_ROLE ur on users.usid = ur.user_id - left join TS_ROLE r on ur.role_id = r.id + left join TS_ROLE r on ur.role_id = r.id and r.del_flag = 0 left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.org_code + left join TS_ORG o on uo.org_id = o.org_code and o.status = 1 where users.del_flag != 1 and users.usid=#{usid} - select users.usid, users.usname, @@ -230,7 +230,7 @@ where users.usid=#{usid} - select users.usid, @@ -262,7 +262,7 @@ uo.org_id in - #{item.Id} + #{item.id} and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1 diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index 60a0293..b1e65eb 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -87,7 +87,7 @@ public class TaskController { BusProcessNew processNew = iBusProcessNewService.getOne(processNewQueryWrapper); if(processNew!=null){ - UserEO assignee = userEoService.getUserByIdNodel(processNew.getUserId()); + UserVO assignee = userEoService.getUserByIdNodel(processNew.getUserId()); if(assignee != null){ historicTaskInstance.put("assignee", assignee.getUsname()); historicTaskInstance.put("assigneeId", assignee.getUsid()); @@ -101,7 +101,7 @@ public class TaskController { historicTaskInstance.put("assignee", assignee.getUsname()); historicTaskInstance.put("assigneeId", assignee.getUsid()); if(assignee.getOrgEOList().size()>0){ - historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0)); + historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getOrgName()); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); @@ -115,8 +115,11 @@ public class TaskController { HashMap map = new HashMap<>(); UserEO assigneenActual = userEoService.getUserById(busProcessEntrust.getUserId()); String consigner = assigneenActual.getUsname(); - UserEO userById = userEoService.getUserById(busProcessEntrust.getEnUserId()); + UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId()); String enUserName = userById.getUsname(); + if(userById.getOrgEOList().size()>0){ + map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); + } map.put("assignee", enUserName+"(" + consigner + " 委托)"); map.put("assigneeId", busProcessEntrust.getEnUserId()); map.put("prcType",one.getPrcType()); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 9af309c..f892965 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -283,10 +283,14 @@ public class TodoTaskController { @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), @ApiImplicitParam(name = "assignee", value = "被改派人员"), @ApiImplicitParam(name = "userId", value = "改派人员"), @ApiImplicitParam(name = "pId", value = "流程实例ID")}) - @GetMapping("/changeAssigneeNew") - public Wrapper changeAssigneeNew(String taskId, String assignee, String userId, String pId, - @RequestParam(required = false,value = "replaceMap")String replaceMap, - String approvalOpinion) { + @PostMapping("/changeAssigneeNew") + public Wrapper changeAssigneeNew(@RequestBody BusProcessEntrust busProcessEntrustEO) { + String assignee = busProcessEntrustEO.getAssignee(); + String taskId = busProcessEntrustEO.getTaskId(); + String pId = busProcessEntrustEO.getPrcId(); + String userId = busProcessEntrustEO.getUserId(); + String approvalOpinion = busProcessEntrustEO.getApprovalOpinion(); + String replaceMap = busProcessEntrustEO.getReplaceMap(); List list = Arrays.asList(taskId.split(",")); for (String str : list) { diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java index 60df3bb..cb96c6d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java @@ -67,4 +67,10 @@ public class BusProcessEntrust implements Serializable { @TableField("APPROVAL_OPINION") private String approvalOpinion; + @TableField(exist = false) + private String replaceMap; + + @TableField(exist = false) + private String assignee; + } diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class index 766bd72..8efaceb 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class index 06d76ae..ec7b55e 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index 4c20034..7debd00 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index bb98d85..a075105 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class index 781f65d..de479d6 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class differ