admin/zhyc-sheep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:b47e1d115a9d8949f7c139af6541ec6e5f59c376
Branches Tags
admin:main
..
compare: admin:6ec984c510f2cf548dcbae4d818b9c8c49d622b4
Branches Tags
admin:main

No commits in common. "b47e1d115a9d8949f7c139af6541ec6e5f59c376" and "6ec984c510f2cf548dcbae4d818b9c8c49d622b4" have entirely different histories.
b47e1d115a ... 6ec984c510

8 changed files with 8 additions and 70 deletions
Show Stats Expand all files Collapse all files

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

@ -1 +0,0 @@

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

@ -4,7 +4,6 @@ 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;
@ -38,10 +37,8 @@ public class Deworm extends BaseEntity
private String variety;
@Excel(name = "羊只类别")
private String sheepType;
private String gender;
@Excel(name = "羊只性别")
private String genderName;
private String gender;
@Excel(name = "月龄")
private Long monthAge;
@Excel(name = "繁殖状态")
@ -73,8 +70,4 @@ 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));
}
}

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

@ -2,7 +2,6 @@ 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;
@ -29,10 +28,6 @@ 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 = "羊只耳号")
@ -40,7 +35,10 @@ 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 = "羊只类别")
@ -48,7 +46,6 @@ public class Diagnosis extends BaseEntity
/** 性别 */
@Excel(name = "性别")
private String genderName;
private String gender;
/** 性别 */
@ -96,8 +93,4 @@ public class Diagnosis extends BaseEntity
private Long sheepfoldId;
public void setGender(String gender) {
this.gender = gender;
this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
}
}

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

@ -4,7 +4,6 @@ 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;
@ -42,7 +41,6 @@ public class Health extends BaseEntity
@Excel(name = "羊只类别")
private String sheepType;
@Excel(name = "羊只性别")
private String genderName;
private String gender;
@Excel(name = "月龄")
private Long monthAge;
@ -67,9 +65,4 @@ public class Health extends BaseEntity
// 药品使用
private List<SwMedicineUsageDetails> usageDetails;
public void setGender(String gender) {
this.gender = gender;
this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
}
}

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

@ -4,7 +4,6 @@ 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;
@ -43,7 +42,6 @@ public class Immunity extends BaseEntity
private String sheepType;
@Excel(name = "羊只性别")
private String genderName;
private String gender;
@Excel(name = "月龄")
@ -75,8 +73,5 @@ public class Immunity extends BaseEntity
// 药品使用
private List<SwMedicineUsageDetails> usageDetails;
public void setGender(String gender) {
this.gender = gender;
this.genderName = Gender.getDescByCode(Integer.valueOf(gender));
}
}

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

@ -2,7 +2,6 @@ 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;
@ -39,7 +38,6 @@ public class QuarantineReport extends BaseEntity
@Excel(name = "羊只类别")
private String sheepType;
@Excel(name = "羊只性别")
private String genderName;
private String gender;
@Excel(name = "月龄")
private Long monthAge;
@ -91,8 +89,5 @@ 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));
}
}

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

@ -4,7 +4,6 @@ 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;
@ -51,7 +50,6 @@ public class Treatment extends BaseEntity
/** 性别 */
@Excel(name = "性别")
private String genderName;
private String gender;
/** 胎次 */
@ -106,8 +104,5 @@ 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));
}
}

25
zhyc-module/src/main/java/com/zhyc/module/enums/Gender.java
View File

@ -1,25 +0,0 @@
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 "未知";
}
}