Merge remote-tracking branch 'origin/main'

zhyc-module/src/main/java/com/zhyc/module/base/1

@@ -0,0 +1 @@
+

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -37,8 +38,10 @@ public class Deworm extends BaseEntity
     private String variety;
     @Excel(name = "羊只类别")
     private String sheepType;
-    @Excel(name = "羊只性别")
+
     private String gender;
+    @Excel(name = "羊只性别")
+    private String genderName;
     @Excel(name = "月龄")
     private Long monthAge;
     @Excel(name = "繁殖状态")
@@ -70,4 +73,8 @@ public class Deworm extends BaseEntity
     @Excel(name = "备注")
     private String comment;
 
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java

@@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,6 +29,10 @@ public class Diagnosis extends BaseEntity
     @Excel(name = "治疗记录")
     private Long treatId;
     private Integer[] treatIds;
+    /** 时间日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date datetime;
 
     /** 羊只id */
     @Excel(name = "羊只耳号")
@@ -35,10 +40,7 @@ public class Diagnosis extends BaseEntity
 
     private Long sheepId;
 
-    /** 时间日期 */
+
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date datetime;
 
     /** 羊只类别 */
     @Excel(name = "羊只类别")
@@ -46,6 +48,7 @@ public class Diagnosis extends BaseEntity
 
     /** 性别 */
     @Excel(name = "性别")
+    private String genderName;
     private String gender;
 
     /** 性别 */
@@ -93,4 +96,8 @@ public class Diagnosis extends BaseEntity
 
     private Long sheepfoldId;
 
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.Data;
 import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;
@@ -41,6 +42,7 @@ public class Health extends BaseEntity
     @Excel(name = "羊只类别")
     private String sheepType;
     @Excel(name = "羊只性别")
+    private String genderName;
     private String gender;
     @Excel(name = "月龄")
     private Long monthAge;
@@ -65,4 +67,9 @@ public class Health extends BaseEntity
 
     //    药品使用
     private List<SwMedicineUsageDetails> usageDetails;
+
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -42,6 +43,7 @@ public class Immunity extends BaseEntity
     private String sheepType;
 
     @Excel(name = "羊只性别")
+    private String genderName;
     private String gender;
 
     @Excel(name = "月龄")
@@ -73,5 +75,8 @@ public class Immunity extends BaseEntity
 
     //    药品使用
     private List<SwMedicineUsageDetails> usageDetails;
-
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java

@@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -38,6 +39,7 @@ public class QuarantineReport extends BaseEntity
     @Excel(name = "羊只类别")
     private String sheepType;
     @Excel(name = "羊只性别")
+    private String genderName;
     private String gender;
     @Excel(name = "月龄")
     private Long monthAge;
@@ -89,5 +91,8 @@ public class QuarantineReport extends BaseEntity
     @Excel(name = "备注")
     private String comment;
 
-
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhyc.module.enums.Gender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -50,6 +51,7 @@ public class Treatment extends BaseEntity
 
     /** 性别 */
     @Excel(name = "性别")
+    private String genderName;
     private String gender;
 
     /** 胎次 */
@@ -104,5 +106,8 @@ public class Treatment extends BaseEntity
     /** 备注 */
     @Excel(name = "备注")
     private String comment;
-
+    public void setGender(String gender) {
+        this.gender = gender;
+        this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/enums/Gender.java

@@ -0,0 +1,25 @@
+package com.zhyc.module.enums;
+
+public enum Gender {
+    MU(1, "母"),
+    GONG(2, "公"),
+    YANYANG(3, "腌羊"),
+    JIANXING(4, "兼性");
+
+    private final int code;
+    private final String desc;
+
+    Gender(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static String getDescByCode(Integer code) {
+        for (Gender g : values()) {
+            if (g.code == code) {
+                return g.desc;
+            }
+        }
+        return "未知";
+    }
+}