feats

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -4,10 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.DateUtils;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -80,19 +77,23 @@ public class TaIssueController extends BaseController {
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
-                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
+                             @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
+                             @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                             @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
 
         SysUser sysUser = currentUser();
-        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
+        boolean isRooter = Constants.ROOT_ID.equals(sysUser.getUserId());
 
         List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
-        if (dutyList == null || dutyList.size() < 1) {
+        if (!isRooter && (dutyList == null || dutyList.size() < 1)) {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        Boolean mine = false;
+        Boolean mine = true;
         Integer validateStatus = null;
-        if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+        if (isRooter) {
+            mine = false;
+        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
             mine = true;
         } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
             mine = true;
@@ -101,9 +102,9 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("org_id", orgId);
 
         if (Constants.PROCESS_START.equals(bizStatus)) {
             // 待交办
@@ -124,15 +125,19 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
-        if (mine && null != validateStatus) {
-            Integer vst = validateStatus;
-            queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", vst));
-        } else if (mine) {
-            queryWrapper.eq(mine, "create_user", sysUser.getUserId());
-        } else if (null != validateStatus) {
-            queryWrapper.gt(null != validateStatus, "validate_status", validateStatus);
+        // 既是督察员又是管理员
+        if (!isRooter) {
+            if (dutyList.contains(Constants.DUTY_MANAGER)) {
+                // 管理员
+                queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", 0));
+            } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+                // 督察员
+                queryWrapper.eq("create_user", sysUser.getUserId());
+            }
         }
 
+        queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
+        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
         queryWrapper.eq(Constants.ISSUE_SOURCE_FEEDBACK.equals(sourceType), "source_type", "feedback");
         queryWrapper.ne(Constants.ISSUE_SOURCE_INSPECTOR.equals(sourceType), "source_type", "feedback");
         queryWrapper.gt("status", Constants.STATUS_DELETE);