Newspaper пре 2 година
родитељ
комит
689adcd09b

+ 1 - 0
src/main/java/com/huimv/admin/entity/vo/WarningVo.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 
 @Data
 public class WarningVo {
+    private Integer id;
     private String location;
 
     @JsonFormat(pattern = "MM-dd HH:mm" ,timezone = "GMT+8")

+ 1 - 1
src/main/resources/mapper/EnvWarningMapper.xml

@@ -14,7 +14,7 @@
     </select>
 
     <select id="listWarning" resultType="com.huimv.admin.entity.vo.WarningVo">
-        SELECT CONCAT(b.build_name,a.build_name) AS  'location',w.warning_content as warningContent,w.update_time AS DATE
+        SELECT w.id as id, CONCAT(b.build_name,a.build_name) AS  'location',w.warning_content as warningContent,w.update_time AS DATE
         FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND b.parent_id != 0
         LEFT JOIN `env_warning` w ON w.unit_id = a.id
         WHERE w.farm_id = #{farmId} and w.update_time >= #{timeMorning}