feats

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

@@ -89,22 +89,21 @@ public class TaIssueController extends BaseController {
             return ResponseBean.error("暂无权限查询数据");
         }
 
-        Boolean mine = true;
-        Integer validateStatus = null;
-        if (isRooter) {
-            mine = false;
-        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
-            mine = true;
-        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
-            mine = true;
-            validateStatus = 0;
-        } else {
-            return ResponseBean.error("暂无权限查询数据");
-        }
+//        Boolean mine = true;
+//        Integer validateStatus = null;
+//        if (isRooter) {
+//            mine = false;
+//        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
+//            mine = true;
+//        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
+//            mine = false;
+//            validateStatus = 0;
+//        } else {
+//            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)) {
             // 待交办
@@ -125,15 +124,10 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
         }
 
-        // 既是督察员又是管理员
-        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());
-            }
+        // 督察员
+        if (dutyList.contains(Constants.DUTY_INSPECTOR) && !dutyList.contains(Constants.DUTY_MANAGER)) {
+            // 督察员
+            queryWrapper.eq("create_user", sysUser.getUserId());
         }
 
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);

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

@@ -157,6 +157,8 @@ public class TaIssueProcessController extends BaseController {
 
         if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
             return ResponseBean.error("请指定交办单位");
+        } else {
+            taIssue.setOrgId(taIssueProcess.getOrgId());
         }
         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
             return ResponseBean.error("请设置截止日期");
@@ -177,7 +179,7 @@ public class TaIssueProcessController extends BaseController {
 
         updateIssue(taIssue, taIssueProcess);
 
-        taOrgIssueService.createNewIssue(taIssue, taIssueProcess, sysUser);
+        taOrgIssueService.createNewIssue(taIssue, sysUser);
 
         return ResponseBean.success(taIssueProcess);
     }

src/main/java/com/example/civilizedcity/service/TaOrgIssueService.java

@@ -15,5 +15,5 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
 
-     void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser);
+     void createNewIssue(TaIssue taIssue, SysUser sysUser);
  }

src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java

@@ -40,10 +40,10 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
     }
 
     @Override
-    public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) {
+    public void createNewIssue(TaIssue taIssue, SysUser sysUser) {
         TaOrgIssue taOrgIssue = new TaOrgIssue();
         taOrgIssue.setIssueId(taIssue.getIssueId());
-        taOrgIssue.setOrgId(taIssueProcess.getOrgId());
+        taOrgIssue.setOrgId(taIssue.getOrgId());
         taOrgIssue.setProcessStatus(Constants.PROCESS_START);
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
         taOrgIssue.setCreateDate(LocalDateTime.now());

src/main/resources/mapper/TaIssueMapper.xml

@@ -74,15 +74,20 @@
     </select>
     <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
         SELECT
-            t.type_name AS `name`,
-            COUNT( 1 ) AS `value`
+            *
         FROM
-            ta_issue t
-        WHERE
-            t.`status` &gt; -1
-        GROUP BY
-            t.type_id
+            (
+                SELECT
+                    t.`name`,
+                    sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
+                FROM
+                    td_issue_type t
+                        LEFT JOIN ta_issue s ON s.type_id = t.type_id
+                        AND s.`status` &gt; - 1
+                GROUP BY
+                    t.type_id
+            ) a
         ORDER BY
-            t.type_name ASC
+            a.`value` DESC
     </select>
 </mapper>