修改降序

src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java

@@ -106,16 +106,15 @@ public class DataVCaseVerifController {
     @GetMapping("/getConfinementAndPause")
     public Result<JSONObject> getConfinement(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                              @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
-        List<EchartsVo> jbclList =   caseVerificationService.getConfinementAndPause(beginTime, endTime, 1);   // 禁闭
-        List<EchartsVo> tzclList =  caseVerificationService.getConfinementAndPause(beginTime, endTime, 2);  // 停职
+        List<EchartsVo> jbclList = caseVerificationService.getConfinementAndPause(beginTime, endTime, 1);   // 禁闭
+        List<EchartsVo> tzclList = caseVerificationService.getConfinementAndPause(beginTime, endTime, 2);  // 停职
         JSONObject data = new JSONObject()
-                    .fluentPut("jbclList", jbclList)
+                .fluentPut("jbclList", jbclList)
                 .fluentPut("tzclList", tzclList);
         return Result.success(data);
     }
 
 
-
     // endregion
 
 

src/main/java/com/biutag/supervision/mapper/CountyStreetDeptMapper.java

@@ -15,7 +15,12 @@ import java.util.List;
 */
 public interface CountyStreetDeptMapper extends BaseMapper<CountyStreetDept> {
 
-    @Select("select * from county_street_dept where pid = #{id}")
+    @Select("SELECT id, dept_pid_name, dept_pid, pid, \n" +
+            "CONVERT(coordinates, CHAR) AS coordinates, \n" +
+            "level, name, sort, \n" +
+            "CONVERT(geometry, CHAR) AS geometry, \n" +
+            "area_name, dept_id, dept_name\n" +
+            "FROM\tcounty_street_dept \twhere pid = 3490;")
     List<CountyStreetDept> props(Integer id);
 
 }

src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@@ -219,7 +219,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "WHERE  ng.problemSourcesCode=16 " +
             "AND checkStatus <> 3 " +
             "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " +
-            "GROUP BY npr.threeLevelContent")
+            "GROUP BY npr.threeLevelContent ")
     List<EchartsVo> getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime);
 
     @Select("SELECT sd1.short_name AS label, " +
@@ -230,7 +230,8 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "WHERE checkStatus <> 3 " +
             "AND problemSourcesCode=16 " +
             "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " +
-            "GROUP BY sd1.short_name ")
+            "GROUP BY sd1.short_name " +
+            "ORDER BY `value` DESC")
     List<OrganizeProblemRankVo> getVideoSuperviseProblemRank(Date beginTime, Date endTime, Integer groupId);
 
     @Select("SELECT  sd1.short_name AS `name`, " +
@@ -265,7 +266,8 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "WHERE checkStatus <> 3 " +
             "AND problemSourcesCode in (17, 18, 19, 20) " +
             "AND discoveryTime BETWEEN #{beginTime} AND #{endTime} " +
-            "GROUP BY sd1.short_name")
+            "GROUP BY sd1.short_name " +
+            "ORDER BY `value` DESC")
     List<OrganizeProblemRankVo> getCaseVerificationRank(Date beginTime, Date endTime, int groupId);
 
     List<EchartsVo> getCaseVerificationTrend(String year);