2023-4-18 进出记录详情为空，需要校验，违规排序。

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabPhotoInspectionController.java

@@ -2,6 +2,7 @@ package com.zd.laboratory.controller;
 
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.*;
 import com.zd.common.core.web.controller.BaseController;
@@ -114,6 +115,9 @@ public class LabPhotoInspectionController extends BaseController {
     @GetMapping(value = "/detial/{id}")
     public TableDataInfo getDetail(@PathVariable("id") Long id) {
         LabPhotoInspection photoInspection = labPhotoInspectionService.selectLabPhotoInspectionById(id);
+        if(StringUtils.isNull(photoInspection)){
+            throw new ServiceException("详情不存在！");
+        }
         List<Map<String,String>> allList = new ArrayList <>();
         imgList(allList,photoInspection.getSubUrl(),"实验室照片");
         imgList(allList,photoInspection.getGarbageUrl(),"垃圾桶清理后照片");

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabViolationMapper.xml

@@ -289,9 +289,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="statistics" resultType="java.util.Map">
         SELECT dd.id AS type, dd.violation_name AS content, IFNULL( lv.num, 0) AS count
         FROM (
-            SELECT ss.`id`,ss.violation_name FROM lab_violation_score_site ss
+            SELECT ss.`id`,ss.violation_name,ss.`id` orderASC FROM lab_violation_score_site ss
             UNION ALL
-            SELECT '-99' id,'其他' violation_name FROM DUAL
+            SELECT '-99' id,'其他' violation_name,'999999999' orderASC FROM DUAL
         ) dd LEFT JOIN (
         SELECT t.violation_type , COUNT(1) num FROM (
             SELECT v.reason violation_type, v.`id` num,t.`build_id` dept_id
@@ -315,6 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY t.violation_type
         ) lv ON dd.violation_name = lv.violation_type
+        ORDER BY dd.orderASC ASC
     </select>
 
     <select id="columnar" resultType="com.zd.laboratory.domain.vo.LabViolationColumnarVO">