Yansen 2 years ago
parent
commit
9f0872e6ab

+ 16
- 22
src/main/java/com/example/civilizedcity/controller/TaIssueController.java View File

89
             return ResponseBean.error("暂无权限查询数据");
89
             return ResponseBean.error("暂无权限查询数据");
90
         }
90
         }
91
 
91
 
92
-        Boolean mine = true;
93
-        Integer validateStatus = null;
94
-        if (isRooter) {
95
-            mine = false;
96
-        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
97
-            mine = true;
98
-        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
99
-            mine = true;
100
-            validateStatus = 0;
101
-        } else {
102
-            return ResponseBean.error("暂无权限查询数据");
103
-        }
92
+//        Boolean mine = true;
93
+//        Integer validateStatus = null;
94
+//        if (isRooter) {
95
+//            mine = false;
96
+//        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
97
+//            mine = true;
98
+//        } else if (dutyList.contains(Constants.DUTY_MANAGER)) {
99
+//            mine = false;
100
+//            validateStatus = 0;
101
+//        } else {
102
+//            return ResponseBean.error("暂无权限查询数据");
103
+//        }
104
 
104
 
105
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
105
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
106
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
106
         QueryWrapper<TaIssue> queryWrapper = new QueryWrapper<>();
107
-//        queryWrapper.eq("org_id", orgId);
108
 
107
 
109
         if (Constants.PROCESS_START.equals(bizStatus)) {
108
         if (Constants.PROCESS_START.equals(bizStatus)) {
110
             // 待交办
109
             // 待交办
125
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
124
             queryWrapper.eq("process_status", Constants.PROCESS_STATUS_REJECT);
126
         }
125
         }
127
 
126
 
128
-        // 既是督察员又是管理员
129
-        if (!isRooter) {
130
-            if (dutyList.contains(Constants.DUTY_MANAGER)) {
131
-                // 管理员
132
-                queryWrapper.nested(q -> q.eq("create_user", sysUser.getUserId()).or().gt("validate_status", 0));
133
-            } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
134
-                // 督察员
135
-                queryWrapper.eq("create_user", sysUser.getUserId());
136
-            }
127
+        // 督察员
128
+        if (dutyList.contains(Constants.DUTY_INSPECTOR) && !dutyList.contains(Constants.DUTY_MANAGER)) {
129
+            // 督察员
130
+            queryWrapper.eq("create_user", sysUser.getUserId());
137
         }
131
         }
138
 
132
 
139
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);
133
         queryWrapper.eq(StringUtils.isNotEmpty(locId), "loc_id", locId);

+ 3
- 1
src/main/java/com/example/civilizedcity/controller/TaIssueProcessController.java View File

157
 
157
 
158
         if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
158
         if (StringUtils.isEmpty(taIssueProcess.getOrgId())) {
159
             return ResponseBean.error("请指定交办单位");
159
             return ResponseBean.error("请指定交办单位");
160
+        } else {
161
+            taIssue.setOrgId(taIssueProcess.getOrgId());
160
         }
162
         }
161
         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
163
         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
162
             return ResponseBean.error("请设置截止日期");
164
             return ResponseBean.error("请设置截止日期");
177
 
179
 
178
         updateIssue(taIssue, taIssueProcess);
180
         updateIssue(taIssue, taIssueProcess);
179
 
181
 
180
-        taOrgIssueService.createNewIssue(taIssue, taIssueProcess, sysUser);
182
+        taOrgIssueService.createNewIssue(taIssue, sysUser);
181
 
183
 
182
         return ResponseBean.success(taIssueProcess);
184
         return ResponseBean.success(taIssueProcess);
183
     }
185
     }

+ 1
- 1
src/main/java/com/example/civilizedcity/service/TaOrgIssueService.java View File

15
 
15
 
16
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
16
      IPage<TaIssue> getIssuePageBy(IPage<TaIssue> pg, String orgId, String sourceType, String bizStatus);
17
 
17
 
18
-     void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser);
18
+     void createNewIssue(TaIssue taIssue, SysUser sysUser);
19
  }
19
  }

+ 2
- 2
src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java View File

40
     }
40
     }
41
 
41
 
42
     @Override
42
     @Override
43
-    public void createNewIssue(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser sysUser) {
43
+    public void createNewIssue(TaIssue taIssue, SysUser sysUser) {
44
         TaOrgIssue taOrgIssue = new TaOrgIssue();
44
         TaOrgIssue taOrgIssue = new TaOrgIssue();
45
         taOrgIssue.setIssueId(taIssue.getIssueId());
45
         taOrgIssue.setIssueId(taIssue.getIssueId());
46
-        taOrgIssue.setOrgId(taIssueProcess.getOrgId());
46
+        taOrgIssue.setOrgId(taIssue.getOrgId());
47
         taOrgIssue.setProcessStatus(Constants.PROCESS_START);
47
         taOrgIssue.setProcessStatus(Constants.PROCESS_START);
48
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
48
         taOrgIssue.setStatus(Constants.STATUS_NORMAL);
49
         taOrgIssue.setCreateDate(LocalDateTime.now());
49
         taOrgIssue.setCreateDate(LocalDateTime.now());

+ 13
- 8
src/main/resources/mapper/TaIssueMapper.xml View File

74
     </select>
74
     </select>
75
     <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
75
     <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
76
         SELECT
76
         SELECT
77
-            t.type_name AS `name`,
78
-            COUNT( 1 ) AS `value`
77
+            *
79
         FROM
78
         FROM
80
-            ta_issue t
81
-        WHERE
82
-            t.`status` &gt; -1
83
-        GROUP BY
84
-            t.type_id
79
+            (
80
+                SELECT
81
+                    t.`name`,
82
+                    sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
83
+                FROM
84
+                    td_issue_type t
85
+                        LEFT JOIN ta_issue s ON s.type_id = t.type_id
86
+                        AND s.`status` &gt; - 1
87
+                GROUP BY
88
+                    t.type_id
89
+            ) a
85
         ORDER BY
90
         ORDER BY
86
-            t.type_name ASC
91
+            a.`value` DESC
87
     </select>
92
     </select>
88
 </mapper>
93
 </mapper>