xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.协作任务查看所有增加角色办公室主任、副所长

Browse Source
This commit is contained in:
zty 2024-10-12 10:15:17 +08:00
parent 752935dfbd
commit fe9fbd8992
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/xqopen/kehui/admin/service/impl/AdminTaskServiceImpl.java
View File

@ -1,16 +1,17 @@
package com.xqopen.kehui.admin.service.impl; package com.xqopen.kehui.admin.service.impl;
import java.sql.Array;
import java.util.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.xqopen.kehui.admin.dto.*; import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.xqopen.kehui.admin.dto.AdminTaskReqs;
import com.xqopen.kehui.admin.dto.QuarterlyPlanTaskHasDown;
import com.xqopen.kehui.admin.dto.QuarterlyPlanTaskResp;
import com.xqopen.kehui.admin.dto.QuarterlyTaskReq;
import com.xqopen.kehui.admin.entity.AdminDocumentManagement; import com.xqopen.kehui.admin.entity.AdminDocumentManagement;
import com.xqopen.kehui.admin.entity.AdminTask; import com.xqopen.kehui.admin.entity.AdminTask;
import com.xqopen.kehui.admin.service.IAdminDocumentManagementService; import com.xqopen.kehui.admin.service.IAdminDocumentManagementService;
import com.xqopen.kehui.admin.service.IAdminTaskService;
import com.xqopen.kehui.admin.unit.TaskTypeEnum; import com.xqopen.kehui.admin.unit.TaskTypeEnum;
import com.xqopen.kehui.common.entity.SystemContent; import com.xqopen.kehui.common.entity.SystemContent;
import com.xqopen.kehui.common.service.ISystemContentService; import com.xqopen.kehui.common.service.ISystemContentService;
@ -19,17 +20,17 @@ import com.xqopen.kehui.common.service.ISystemUserRoleService;
import com.xqopen.kehui.exception.ErrorCode; import com.xqopen.kehui.exception.ErrorCode;
import com.xqopen.kehui.exception.XQException; import com.xqopen.kehui.exception.XQException;
import com.xqopen.kehui.mapper.AdminTaskDao; import com.xqopen.kehui.mapper.AdminTaskDao;
import com.xqopen.kehui.admin.service.IAdminTaskService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.xqopen.kehui.personal.entity.PersonalMember;
import com.xqopen.kehui.personal.service.IPersonalMemberService; import com.xqopen.kehui.personal.service.IPersonalMemberService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
* 任务管理 服务实现类 * 任务管理 服务实现类
@ -153,7 +154,7 @@ public class AdminTaskServiceImpl extends ServiceImpl<AdminTaskDao, AdminTask> i
} }
} }
else if (adminTaskReqs.getTaskType() == TaskTypeEnum.COOPERATIONTASK.getIndex()) { else if (adminTaskReqs.getTaskType() == TaskTypeEnum.COOPERATIONTASK.getIndex()) {
if (userRoleName.contains("所长")) { if (userRoleName.contains("所长")||userRoleName.contains("副所长") || userRoleName.contains("办公室主任")) {
postTaskList = taskDao.getAllList(page, userId, adminTaskReqs); postTaskList = taskDao.getAllList(page, userId, adminTaskReqs);
} }
else if (iSystemUserOrgService.checkIsLeader(userId) > 0) {//如果是部门领导，则可以看本部门下的 else if (iSystemUserOrgService.checkIsLeader(userId) > 0) {//如果是部门领导，则可以看本部门下的