Yansen пре 2 година
родитељ
комит
cfa7f51273

+ 0
- 1
src/main/java/com/example/civilizedcity/mapper/TaFeedbackMapper.java Прегледај датотеку

@@ -22,7 +22,6 @@ public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
22 22
 
23 23
     long countByVerifyStatus(@Param("personId") String personId, @Param("verifyStatus") String verifyStatus);
24 24
 
25
-    @MapKey("id")
26 25
     Map<String, Object> statMaIndex(@Param("personId") String personId);
27 26
 
28 27
     IPage<TaIssue> getPageBy(IPage<TaIssue> pg,

+ 0
- 2
src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java Прегледај датотеку

@@ -29,10 +29,8 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
29 29
 
30 30
      int updateValidateStatus(@Param("issueId") Integer issueId, @Param("validateStatus") int validateStatus);
31 31
 
32
-     @MapKey("id")
33 32
      Map<String, Object> statMaIndex(@Param("userId") String userId);
34 33
 
35
-     @MapKey("id")
36 34
      Map<String, Object> statIssueOrg(@Param("orgId") String orgId);
37 35
 
38 36
      List<StatVo> statIssueType();

+ 0
- 1
src/main/java/com/example/civilizedcity/mapper/TaOrgIssueMapper.java Прегледај датотеку

@@ -27,6 +27,5 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
27 27
 
28 28
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
29 29
 
30
-     @MapKey("id")
31 30
      Map<String, Object> statMaIndex(@Param("orgId") String orgId);
32 31
  }

+ 1
- 1
src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java Прегледај датотеку

@@ -85,7 +85,7 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
85 85
         else if (Constants.DUTY_QUERY_PERSON.equals(duty)) {
86 86
             Map<String, Object> res = baseMapper.statMaIndex(null);
87 87
             result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
88
-            result.add(new StatVo().setName("处理").setValue(getStatValueBy(res.get("assigned_num"), 0)));
88
+            result.add(new StatVo().setName("处理").setValue(getStatValueBy(res.get("assigned_num"), 0)));
89 89
             result.add(new StatVo().setName("已办结").setValue(getStatValueBy(res.get("end_num"), 0)));
90 90
         }
91 91
 

+ 0
- 1
src/main/resources/mapper/TaFeedbackMapper.xml Прегледај датотеку

@@ -15,7 +15,6 @@
15 15
     </select>
16 16
     <select id="statMaIndex" resultType="java.util.Map">
17 17
         SELECT
18
-            UUID_SHORT() as id,
19 18
             sum(IF(s.process_node = 'start', 1, 0)) as unassigned_num,
20 19
             sum(IF(s.process_node = 'assigned', 1, 0)) as assigned_num,
21 20
             sum(IF(s.process_node = 'end', 1, 0)) as end_num,

+ 0
- 1
src/main/resources/mapper/TaIssueMapper.xml Прегледај датотеку

@@ -47,7 +47,6 @@
47 47
     </select>
48 48
     <select id="statMaIndex" resultType="java.util.Map">
49 49
         SELECT
50
-            UUID_SHORT() as id,
51 50
             count(*) as published_num,
52 51
             sum(IF(t.process_node = 'start', 1, 0)) as unassigned_num,
53 52
             sum(IF(t.process_node = 'assigned', 1, 0)) as assigned_num,

+ 0
- 1
src/main/resources/mapper/TaOrgIssueMapper.xml Прегледај датотеку

@@ -48,7 +48,6 @@
48 48
     </select>
49 49
     <select id="statMaIndex" resultType="java.util.Map">
50 50
         select
51
-            UUID_SHORT() as id,
52 51
             SUM(IF(TO_DAYS(now()) > TO_DAYS(s.expire_date), 1, 0)) as delay_num,
53 52
             SUM(s.process_node == 'end', 1, 0) as end_num,
54 53
             SUM(s.process_node != 'end', 1, 0) as doing_num