diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index e32258a..4009339 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -77,4 +77,7 @@ public class Deworm extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } +// 排序查询 + private String orderByColumn; + private String isAsc; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java index dddbe59..b394a6d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java @@ -100,4 +100,8 @@ public class Diagnosis extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } + + // 排序查询 + private String orderByColumn; + private String isAsc; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java index 7d86f0a..1a2c69d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java @@ -72,4 +72,7 @@ public class Health extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } + // 排序查询 + private String orderByColumn; + private String isAsc; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index 0a01a07..ea3fe8b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -79,4 +79,8 @@ public class Immunity extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } + // 排序查询 + private String orderByColumn; + private String isAsc; + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java index 0f0db0b..665c4c3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java @@ -95,4 +95,8 @@ public class QuarantineReport extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } + + // 排序查询 + private String orderByColumn; + private String isAsc; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index 13843e2..c878cc9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -4,6 +4,7 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -39,7 +40,8 @@ public class SwMedicineUsage extends BaseEntity private String sheepNo; private Integer sheepId; /** 使用时间 */ - @Excel(name = "使用时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "使用日期", width = 30, dateFormat = "yyyy-MM-dd") private Date datetime; /** 使用类型 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index c2ce219..657abba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -110,4 +110,8 @@ public class Treatment extends BaseEntity this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); } + + // 排序查询 + private String orderByColumn; + private String isAsc; } diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index 9efa115..7ac6e53 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -33,13 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - and name like concat('%', #{name}, '%') - and use_type = #{useType} - and bs.manage_tags like concat('%', #{sheepNo}, '%') - and smu.datetime between #{params.beginUseTime} and #{params.endUseTime} - and smu.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and smu.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + SELECT + smu.id, + smu.sheepfold AS sheepfold_id, + smu.sheep AS sheep_id, + smu.name, + smu.datetime, + smu.use_type, + smu.update_by, + smu.update_time, + smu.create_by, + smu.create_time, + ds.sheepfold_name, + bs.manage_tags AS sheep_no + FROM sw_medicine_usage smu + LEFT JOIN da_sheepfold ds ON ds.id = smu.sheepfold + LEFT JOIN bas_sheep bs ON bs.id = smu.sheep + + + + + AND smu.use_type = #{useType} + + + + + AND bs.manage_tags LIKE CONCAT('%', #{sheepNo}, '%') + + + + + AND smu.datetime BETWEEN #{params.beginUseTime} AND #{params.endUseTime} + + + + + AND smu.create_time BETWEEN #{params.beginCreateTime} AND #{params.endCreateTime} + + + + AND EXISTS ( + SELECT 1 + FROM sw_medicine_usage_details mud + JOIN sw_medicine sm ON sm.id = mud.medi_id + WHERE mud.medi_usage = smu.id + AND sm.name LIKE CONCAT('%', #{name}, '%') + ) + - ORDER BY datetime DESC + ORDER BY smu.datetime DESC