guarantee-lsq 2 years ago
parent
commit
05fc3acc33

+ 1 - 1
platform-dao/src/main/resources/mapper/hidden/HiddenDangerMapper.xml

@@ -142,7 +142,7 @@
         select count(1) from t_hidden_danger
         <where>
             <if test="statusList != null and statusList.size > 0">
-                AND hidden.status in
+                AND status in
                 <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
                     #{item}
                 </foreach>

+ 1 - 1
platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -425,7 +425,7 @@
                 and sb.position_id = #{positionId}
             </if>
         </where>
-        group form.category
+        group by form.category
     </select>
 
     <select id="selectCountByPosition" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"

+ 2 - 2
platform-rest/src/main/java/com/platform/rest/controller/index/IndexController.java

@@ -127,7 +127,7 @@ public class IndexController {
      * @return R
      */
     @GetMapping("/platForm/screen/repair/category")
-    public R getStatisticRepairCategory(@RequestParam("positionId") String positionId) {
+    public R getStatisticRepairCategory(@RequestParam(defaultValue = "") String positionId) {
         return indexService.getStatisticRepairCategory(positionId);
     }
 
@@ -136,7 +136,7 @@ public class IndexController {
      * @return R
      */
     @GetMapping("/platForm/screen/statistic/data")
-    public R getStatisticData(@RequestParam("positionId") String positionId) {
+    public R getStatisticData(@RequestParam(defaultValue = "") String positionId) {
         return indexService.getStatisticData(positionId);
     }