diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java index 3211970..5046e7c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java @@ -73,4 +73,31 @@ public class SheepFileController extends BaseController return success(sheep); } + + @GetMapping("/stat/sheepType") + public AjaxResult statSheepType() { + return success(sheepFileService.countBySheepType()); + } + + @GetMapping("/stat/breedStatus") + public AjaxResult statBreedStatus() { + return success(sheepFileService.countByBreedStatus()); + } + + @GetMapping("/stat/variety") + public AjaxResult statVariety() { + return success(sheepFileService.countByVariety()); + } + + @GetMapping("/stat/lactationParity") + public AjaxResult statLactationParity() { + return success(sheepFileService.countParityOfLactation()); + } + + // 在群总数 + @GetMapping("/stat/inGroupCount") + public AjaxResult inGroupCount() { + return success(sheepFileService.countInGroup()); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java index bd1a9f4..810cad1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java @@ -2,6 +2,9 @@ package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.TreeEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author wyt * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepGroup extends TreeEntity { private static final long serialVersionUID = 1L; @@ -35,79 +41,4 @@ public class BasSheepGroup extends TreeEntity @Excel(name = "祖级列表名称") private String ancestorNames; - public void setAncestorNames(String ancestorNames) { - this.ancestorNames = ancestorNames; - } - - public String getAncestorNames() { - return ancestorNames; - } - - @Override - public String getAncestors() { - return ancestors; - } - - @Override - public void setAncestors(String ancestors) { - this.ancestors = ancestors; - } - - /** 是否为叶子节点 */ - private Boolean isLeaf; - - // ... getter 和 setter - public Boolean getIsLeaf() { - return isLeaf; - } - - public void setIsLeaf(Boolean isLeaf) { - this.isLeaf = isLeaf; - } - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - - public void setGroupName(String groupName) - { - this.groupName = groupName; - } - - public String getGroupName() - { - return groupName; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("groupId", getGroupId()) - .append("parentId", getParentId()) - .append("groupName", getGroupName()) - .append("ancestors", getAncestors()) - .append("ancestorNames", getAncestorNames()) // 新增这一行 - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java index 2dfdd71..eed7c36 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroupMapping.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author wyt * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepGroupMapping extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,42 +33,4 @@ public class BasSheepGroupMapping extends BaseEntity @Excel(name = "分组ID") private Long groupId; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("groupId", getGroupId()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java index f0a46a2..edf709e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-22 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepType extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,31 +27,5 @@ public class BasSheepType extends BaseEntity /** 羊只类型 */ private String name; - public void setId(Integer id) - { - this.id = id; - } - public Integer getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java index df8c797..56e8a36 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepVariety.java @@ -1,5 +1,8 @@ package com.zhyc.module.base.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class BasSheepVariety extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class BasSheepVariety extends BaseEntity @Excel(name = "品种") private String variety; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("variety", getVariety()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java index 75bf6c4..0216feb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java @@ -2,6 +2,9 @@ package com.zhyc.module.base.domain; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author wyt * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class DaSheepfold extends BaseEntity { private static final long serialVersionUID = 1L; @@ -47,97 +53,5 @@ public class DaSheepfold extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setRanchId(Long ranchId) - { - this.ranchId = ranchId; - } - - public Long getRanchId() - { - return ranchId; - } - - public void setSheepfoldName(String sheepfoldName) - { - this.sheepfoldName = sheepfoldName; - } - - public String getSheepfoldName() - { - return sheepfoldName; - } - - public void setSheepfoldTypeId(Long sheepfoldTypeId) - { - this.sheepfoldTypeId = sheepfoldTypeId; - } - - public Long getSheepfoldTypeId() - { - return sheepfoldTypeId; - } - - public void setSheepfoldNo(String sheepfoldNo) - { - this.sheepfoldNo = sheepfoldNo; - } - - public String getSheepfoldNo() - { - return sheepfoldNo; - } - - public void setRowNo(String rowNo) - { - this.rowNo = rowNo; - } - - public String getRowNo() - { - return rowNo; - } - - public void setColumns(String columns) - { - this.columns = columns; - } - - public String getColumns() - { - return columns; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ranchId", getRanchId()) - .append("sheepfoldName", getSheepfoldName()) - .append("sheepfoldTypeId", getSheepfoldTypeId()) - .append("sheepfoldNo", getSheepfoldNo()) - .append("rowNo", getRowNo()) - .append("columns", getColumns()) - .append("comment", getComment()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java index 8a2cf3a..acefce9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java @@ -3,7 +3,9 @@ package com.zhyc.module.base.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -16,6 +18,8 @@ import java.util.Date; * @date 2025-07-13 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SheepFile extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java index 575929b..52abe57 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMapper.java @@ -1,6 +1,7 @@ package com.zhyc.module.base.mapper; import com.zhyc.module.base.domain.BasSheepGroup; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author wyt * @date 2025-07-14 */ +@Mapper public interface BasSheepGroupMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java index 5cabb9c..2e4f1cc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.zhyc.module.base.domain.BasSheepGroupMapping; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * 羊只分组关联Mapper接口 @@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author wyt * @date 2025-07-16 */ +@Mapper public interface BasSheepGroupMappingMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java index d77f906..0802830 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepVarietyMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.base.mapper; import java.util.List; import com.zhyc.module.base.domain.BasSheepVariety; +import org.apache.ibatis.annotations.Mapper; /** * 羊只品种Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.base.domain.BasSheepVariety; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface BasSheepVarietyMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java index 21bb2d0..9b690ce 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaSheepfoldMapper.java @@ -1,6 +1,7 @@ package com.zhyc.module.base.mapper; import com.zhyc.module.base.domain.DaSheepfold; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author wyt * @date 2025-07-11 */ +@Mapper public interface DaSheepfoldMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java index 2392a19..9d4fc5a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java @@ -1,8 +1,10 @@ package com.zhyc.module.base.mapper; import com.zhyc.module.base.domain.SheepFile; +import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 羊只档案Mapper接口 @@ -10,6 +12,7 @@ import java.util.List; * @author wyt * @date 2025-07-13 */ +@Mapper public interface SheepFileMapper { /** @@ -36,4 +39,25 @@ public interface SheepFileMapper * @return 结果 */ SheepFile selectSheepByManageTags(String tags); + + + // 在群羊只总数 + Long countInGroup(); + + + // 羊只类别分布（按 name 分组） + List> countBySheepType(); + + // 繁育状态分布（按 breed 分组） + List> countByBreedStatus(); + + // 品种分布（按 variety 分组） + List> countByVariety(); + + // 泌乳羊胎次分布（name = '泌乳羊' 时按 parity 分组） + List> countParityOfLactation(); + + + + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java index da23952..8280603 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java @@ -3,6 +3,7 @@ package com.zhyc.module.base.service; import com.zhyc.module.base.domain.SheepFile; import java.util.List; +import java.util.Map; /** * 羊只档案Service接口 @@ -30,4 +31,11 @@ public interface ISheepFileService SheepFile selectBasSheepByManageTags(String trim); + + Long countInGroup(); + + List> countBySheepType(); + List> countByBreedStatus(); + List> countByVariety(); + List> countParityOfLactation(); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index 1a77d6a..351a4ad 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -7,7 +7,7 @@ import com.zhyc.module.base.service.ISheepFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.List;import java.util.Map; /** * 羊只档案Service业务层处理 @@ -47,4 +47,28 @@ public class SheepFileServiceImpl implements ISheepFileService { return sheepFileMapper.selectSheepByManageTags(tags); } + + @Override + public List> countBySheepType() { + return sheepFileMapper.countBySheepType(); + } + + @Override + public List> countByBreedStatus() { + return sheepFileMapper.countByBreedStatus(); + } + + @Override + public List> countByVariety() { + return sheepFileMapper.countByVariety(); + } + + @Override + public List> countParityOfLactation() { + return sheepFileMapper.countParityOfLactation(); + } + @Override + public Long countInGroup() { return sheepFileMapper.countInGroup(); } + + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java index 6b88da7..6fb5fba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java @@ -78,6 +78,7 @@ public class DewormController extends BaseController @PostMapping public AjaxResult add(@RequestBody Deworm deworm) { + System.out.println(deworm); return toAjax(dewormService.insertDeworm(deworm)); } @@ -97,7 +98,7 @@ public class DewormController extends BaseController */ @PreAuthorize("@ss.hasPermi('biosafety:deworm:remove')") @Log(title = "驱虫", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(dewormService.deleteDewormByIds(ids)); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java index d8138a2..39149cc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java @@ -96,7 +96,7 @@ public class DiagnosisController extends BaseController */ @PreAuthorize("@ss.hasPermi('diagnosis:diagnosis:remove')") @Log(title = "诊疗结果", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(diagnosisService.deleteDiagnosisByIds(ids)); 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 89896da..c3b60c5 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 @@ -1,7 +1,12 @@ 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; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +18,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class Deworm extends BaseEntity { private static final long serialVersionUID = 1L; @@ -20,34 +28,37 @@ public class Deworm extends BaseEntity /** $column.columnComment */ private Long id; - /** 羊只id */ - @Excel(name = "羊只id") private Long sheepId; - /** 药品使用记录 */ - @Excel(name = "药品使用记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") private String variety; - - /** 羊只类别 */ @Excel(name = "羊只类别") private String sheepType; - - /** 性别 */ - @Excel(name = "性别") + @Excel(name = "羊只性别") private String gender; - - /** 月龄 */ @Excel(name = "月龄") private Long monthAge; - + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; + + + /** 药品使用记录 */ + @Excel(name = "药品使用记录") + private Integer usageId; + + + // 药品使用 + private List usageDetails; + /** 驱虫日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "驱虫日期", width = 30, dateFormat = "yyyy-MM-dd") @@ -61,134 +72,4 @@ public class Deworm extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(Long monthAge) - { - this.monthAge = monthAge; - } - - public Long getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("datetime", getDatetime()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } 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 05f9a98..05fe6ad 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 @@ -2,6 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class Diagnosis extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,11 +27,13 @@ public class Diagnosis extends BaseEntity private Long id; /** 治疗记录id */ - @Excel(name = "治疗记录id") + @Excel(name = "治疗记录") private Long treatId; /** 羊只id */ - @Excel(name = "羊只id") + @Excel(name = "羊只耳号") + private String sheepNo; + private Long sheepId; /** 时间日期 */ @@ -41,21 +49,30 @@ public class Diagnosis extends BaseEntity @Excel(name = "性别") private String gender; + /** 性别 */ + @Excel(name = "月龄") + private Long monthAge; + + /** 胎次 */ @Excel(name = "胎次") private String parity; /** 疾病类型 */ @Excel(name = "疾病类型") + private String diseasePName; + private Long diseasePid; /** 子疾病 */ @Excel(name = "子疾病") + private String diseaseName; + private Long diseaseId; /** 诊疗结果 */ @Excel(name = "诊疗结果") - private Long result; + private String result; /** 开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -72,168 +89,9 @@ public class Diagnosis extends BaseEntity private Long treatDay; /** 羊舍id */ - @Excel(name = "羊舍id") + @Excel(name = "羊舍") + private String sheepfold; + private Long sheepfoldId; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setTreatId(Long treatId) - { - this.treatId = treatId; - } - - public Long getTreatId() - { - return treatId; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setParity(String parity) - { - this.parity = parity; - } - - public String getParity() - { - return parity; - } - - public void setDiseasePid(Long diseasePid) - { - this.diseasePid = diseasePid; - } - - public Long getDiseasePid() - { - return diseasePid; - } - - public void setDiseaseId(Long diseaseId) - { - this.diseaseId = diseaseId; - } - - public Long getDiseaseId() - { - return diseaseId; - } - - public void setResult(Long result) - { - this.result = result; - } - - public Long getResult() - { - return result; - } - - public void setBegindate(Date begindate) - { - this.begindate = begindate; - } - - public Date getBegindate() - { - return begindate; - } - - public void setEnddate(Date enddate) - { - this.enddate = enddate; - } - - public Date getEnddate() - { - return enddate; - } - - public void setTreatDay(Long treatDay) - { - this.treatDay = treatDay; - } - - public Long getTreatDay() - { - return treatDay; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("treatId", getTreatId()) - .append("sheepId", getSheepId()) - .append("datetime", getDatetime()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("parity", getParity()) - .append("diseasePid", getDiseasePid()) - .append("diseaseId", getDiseaseId()) - .append("result", getResult()) - .append("begindate", getBegindate()) - .append("enddate", getEnddate()) - .append("treatDay", getTreatDay()) - .append("sheepfoldId", getSheepfoldId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java index 4b30dd3..773ec33 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java @@ -1,7 +1,12 @@ 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; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +18,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class Disinfect extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,8 +29,12 @@ public class Disinfect extends BaseEntity private Long id; /** 羊舍id */ - @Excel(name = "羊舍id") - private Long sheepfoldId; + @Excel(name = "羊舍") + private String sheepfoldName; + + private Integer sheepfoldId; + + private Integer[] sheepfoldIds; /** 消毒日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -39,7 +51,7 @@ public class Disinfect extends BaseEntity /** 药品使用记录id */ @Excel(name = "药品使用记录id") - private Long usageId; + private Integer usageId; /** 比例 */ @Excel(name = "比例") @@ -49,101 +61,7 @@ public class Disinfect extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } + // 药品使用 + private List usageDetails; - public Long getId() - { - return id; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnician(String technician) - { - this.technician = technician; - } - - public String getTechnician() - { - return technician; - } - - public void setWay(String way) - { - this.way = way; - } - - public String getWay() - { - return way; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setRatio(String ratio) - { - this.ratio = ratio; - } - - public String getRatio() - { - return ratio; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepfoldId", getSheepfoldId()) - .append("datetime", getDatetime()) - .append("technician", getTechnician()) - .append("way", getWay()) - .append("usageId", getUsageId()) - .append("ratio", getRatio()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } 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 2cd9347..05e591a 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 @@ -1,9 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; @@ -13,6 +14,7 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data public class Health extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,33 +31,29 @@ public class Health extends BaseEntity @Excel(name = "羊只id") private Long sheepId; - /** 用药记录 */ - @Excel(name = "用药记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") private String variety; - - /** 羊只类别 */ @Excel(name = "羊只类别") private String sheepType; - - /** 性别 */ - @Excel(name = "性别") + @Excel(name = "羊只性别") private String gender; - - /** 月龄 */ @Excel(name = "月龄") - private String monthAge; - + private Long monthAge; + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; - /** 羊舍id */ - @Excel(name = "羊舍id") - private Long sheepfoldId; + /** 用药记录 */ + @Excel(name = "用药记录") + private Integer usageId; + /** 技术员 */ @Excel(name = "技术员") @@ -65,145 +63,6 @@ public class Health extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(String monthAge) - { - this.monthAge = monthAge; - } - - public String getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("sheepfoldId", getSheepfoldId()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } + // 药品使用 + private List usageDetails; } 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 6dda5ac..1a77298 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 @@ -1,7 +1,12 @@ 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; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +18,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class Immunity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -24,33 +32,33 @@ public class Immunity extends BaseEntity @Excel(name = "羊只id") private Long sheepId; - /** 使用记录 */ - @Excel(name = "使用记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") + private String variety; + @Excel(name = "羊只类别") + private String sheepType; - /** 羊只类型 */ - @Excel(name = "羊只类型") - private Long sheepType; - - /** 羊只性别 */ @Excel(name = "羊只性别") private String gender; - /** 月龄 */ @Excel(name = "月龄") private Long monthAge; + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; - /** 羊舍id */ - @Excel(name = "羊舍id") - private Long sheepfoldId; + /** 使用记录 */ + @Excel(name = "使用记录") + private Integer usageId; + /** 免疫日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -65,145 +73,7 @@ public class Immunity extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } + // 药品使用 + private List usageDetails; - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(Long sheepType) - { - this.sheepType = sheepType; - } - - public Long getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(Long monthAge) - { - this.monthAge = monthAge; - } - - public Long getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("sheepfoldId", getSheepfoldId()) - .append("datetime", getDatetime()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java index eb57ab0..807962a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineItems.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class QuarantineItems extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class QuarantineItems extends BaseEntity @Excel(name = "名称") private String name; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } 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 9d3dd21..0fa8f88 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 @@ -2,7 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -16,6 +18,8 @@ import org.apache.ibatis.type.Alias; * @date 2025-07-14 */ @Data +@NoArgsConstructor +@AllArgsConstructor @Alias("QuarantineReport") public class QuarantineReport extends BaseEntity { diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java index e9e3ba3..e128a0e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineSample.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class QuarantineSample extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,31 +28,4 @@ public class QuarantineSample extends BaseEntity @Excel(name = "样品类型") private String name; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java index 5cb14ab..65ab2c1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwDisease.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.TreeEntity; * @author ruoyi * @date 2025-07-09 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwDisease extends TreeEntity { private static final long serialVersionUID = 1L; @@ -30,53 +36,5 @@ public class SwDisease extends TreeEntity @Excel(name = "") private Long pid; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - public void setPid(Long pid) - { - this.pid = pid; - } - - public Long getPid() - { - return pid; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("comment", getComment()) - .append("pid", getPid()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java index 7bfcc56..46893c5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicType.java @@ -1,5 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicType extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java index 8536c1b..247ef20 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicine.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -14,6 +16,8 @@ import com.zhyc.common.core.domain.BaseEntity; */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicine extends BaseEntity { private static final long serialVersionUID = 1L; 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 56f3997..95a6aea 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 @@ -2,7 +2,9 @@ package com.zhyc.module.biosafety.domain; import java.util.List; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -15,6 +17,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-12 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicineUsage extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java index 7a02bdc..86eb829 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-12 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwMedicineUsageDetails extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java index ba52c9e..e03540b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPresDetail.java @@ -1,6 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.math.BigDecimal; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -12,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwPresDetail extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java index b8466e1..ae22e43 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java @@ -1,6 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -12,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class SwPrescription extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java index 2942b49..9820928 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,12 +15,14 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-11 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwUnit extends BaseEntity { private static final long serialVersionUID = 1L; /** 编号 */ - private Long id; + private Integer id; /** 单位 */ @Excel(name = "单位") diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java index 91c065f..450c220 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,25 +15,18 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-11 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class SwUsage extends BaseEntity { private static final long serialVersionUID = 1L; /** 编号 */ - private Long id; + private Integer id; /** 使用方法 */ @Excel(name = "使用方法") private String name; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } } 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 85a69e0..e4217fc 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 @@ -5,7 +5,9 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -18,6 +20,8 @@ import com.zhyc.common.core.domain.BaseEntity; * @date 2025-07-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class Treatment extends BaseEntity { private static final long serialVersionUID = 1L; @@ -81,6 +85,8 @@ public class Treatment extends BaseEntity /** 父疾病 */ @Excel(name = "父疾病") + private String diseasePName; + private Long diseasePid; /** 兽医 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java index f346774..8ce542c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Deworm; +import org.apache.ibatis.annotations.Mapper; /** * 驱虫Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.Deworm; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface DewormMapper { /** @@ -34,7 +36,7 @@ public interface DewormMapper * @param deworm 驱虫 * @return 结果 */ - public int insertDeworm(Deworm deworm); + public int insertDeworm(List deworm); /** * 修改驱虫 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java index 47110b7..f9f8076 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Diagnosis; +import org.apache.ibatis.annotations.Mapper; /** * 诊疗结果Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.Diagnosis; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface DiagnosisMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java index 4092405..885bf2e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Disinfect; +import org.apache.ibatis.annotations.Mapper; /** * 消毒记录Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.Disinfect; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface DisinfectMapper { /** @@ -33,7 +35,7 @@ public interface DisinfectMapper * @param disinfect 消毒记录 * @return 结果 */ - public int insertDisinfect(Disinfect disinfect); + public int insertDisinfect(List disinfect); /** * 修改消毒记录 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java index 0fbfafc..bcdc175 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Health; +import org.apache.ibatis.annotations.Mapper; /** * 保健Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.Health; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface HealthMapper { /** @@ -33,7 +35,7 @@ public interface HealthMapper * @param health 保健 * @return 结果 */ - public int insertHealth(Health health); + public int insertHealth(List health); /** * 修改保健 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java index ea5161a..a500a9e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Immunity; +import org.apache.ibatis.annotations.Mapper; /** * 免疫Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.Immunity; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface ImmunityMapper { /** @@ -33,7 +35,7 @@ public interface ImmunityMapper * @param immunity 免疫 * @return 结果 */ - public int insertImmunity(Immunity immunity); + public int insertImmunity(List immunity); /** * 修改免疫 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineItemsMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineItemsMapper.java index 3f4dd36..30b19d7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineItemsMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineItemsMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.QuarantineItems; +import org.apache.ibatis.annotations.Mapper; /** * 检疫项目Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.QuarantineItems; * @author ruoyi * @date 2025-07-14 */ +@Mapper public interface QuarantineItemsMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java index 5987f23..bc4c181 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.QuarantineReport; +import org.apache.ibatis.annotations.Mapper; /** * 检疫记录Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.QuarantineReport; * @author ruoyi * @date 2025-07-14 */ +@Mapper public interface QuarantineReportMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineSampleMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineSampleMapper.java index 76ce1d7..5df4a8a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineSampleMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineSampleMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.QuarantineSample; +import org.apache.ibatis.annotations.Mapper; /** * 样品类型Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.QuarantineSample; * @author ruoyi * @date 2025-07-14 */ +@Mapper public interface QuarantineSampleMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwDiseaseMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwDiseaseMapper.java index 55f3351..ed5de79 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwDiseaseMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwDiseaseMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.SwDisease; +import org.apache.ibatis.annotations.Mapper; /** * 疾病Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.SwDisease; * @author ruoyi * @date 2025-07-09 */ +@Mapper public interface SwDiseaseMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicTypeMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicTypeMapper.java index 764c735..19e73c4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicTypeMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicTypeMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.SwMedicType; +import org.apache.ibatis.annotations.Mapper; /** * 药品类型Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.SwMedicType; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface SwMedicTypeMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineMapper.java index fc44d44..dd1ed67 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.SwMedicine; +import org.apache.ibatis.annotations.Mapper; /** * 药品Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.SwMedicine; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface SwMedicineMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java index 16ce066..3d60eb0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import org.apache.ibatis.annotations.Mapper; /** * 药品使用记录Mapper接口 @@ -11,6 +12,7 @@ import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; * @author ruoyi * @date 2025-07-12 */ +@Mapper public interface SwMedicineUsageMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwPrescriptionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwPrescriptionMapper.java index ee1c462..35796dc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwPrescriptionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwPrescriptionMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.SwPrescription; import com.zhyc.module.biosafety.domain.SwPresDetail; +import org.apache.ibatis.annotations.Mapper; /** * 处方Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.SwPresDetail; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface SwPrescriptionMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUnitMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUnitMapper.java index 2d3cf64..417b3aa 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUnitMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUnitMapper.java @@ -1,6 +1,7 @@ package com.zhyc.module.biosafety.mapper; import com.zhyc.module.biosafety.domain.SwUnit; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface SwUnitMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUsageMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUsageMapper.java index cb0706d..a2b591b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUsageMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwUsageMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.SwUsage; +import org.apache.ibatis.annotations.Mapper; /** * 药品使用方法Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.biosafety.domain.SwUsage; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface SwUsageMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java index d8930ba..643d9a0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.mapper; import java.util.List; import com.zhyc.module.biosafety.domain.Treatment; +import org.apache.ibatis.annotations.Mapper; /** * 治疗记录Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.biosafety.domain.Treatment; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface TreatmentMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java index d0afd0e..c6f850c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java @@ -1,12 +1,22 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.common.utils.bean.BeanUtils; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; import com.zhyc.module.biosafety.domain.Deworm; +import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.domain.Treatment; +import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.DewormMapper; import com.zhyc.module.biosafety.service.IDewormService; +import org.springframework.transaction.annotation.Transactional; /** * 驱虫Service业务层处理 @@ -19,6 +29,12 @@ public class DewormServiceImpl implements IDewormService { @Autowired private DewormMapper dewormMapper; + @Autowired + private SwMedicineUsageServiceImpl medicineUsageService; + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + @Autowired + private SheepFileMapper sheepFileMapper; /** * 查询驱虫 @@ -29,7 +45,10 @@ public class DewormServiceImpl implements IDewormService @Override public Deworm selectDewormById(Long id) { - return dewormMapper.selectDewormById(id); + Deworm deworm = dewormMapper.selectDewormById(id); + SwMedicineUsage swMedicineUsage = medicineUsageMapper.selectSwMedicineUsageById(deworm.getUsageId()); + deworm.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return deworm; } /** @@ -51,10 +70,40 @@ public class DewormServiceImpl implements IDewormService * @return 结果 */ @Override + @Transactional public int insertDeworm(Deworm deworm) { - deworm.setCreateTime(DateUtils.getNowDate()); - return dewormMapper.insertDeworm(deworm); + String username = SecurityUtils.getUsername(); + // 使用记录的文件 + SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails()); + medicineUsage.setName("羊只驱虫"); + medicineUsage.setUseType("1"); + + List deworms = new ArrayList<>(); + + deworm.setCreateBy(username); + deworm.setCreateTime(DateUtils.getNowDate()); + for (Integer sheepId : deworm.getSheepIds()) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId)); + + Deworm dew = new Deworm(); + BeanUtils.copyProperties(deworm, dew); + dew.setSheepId(Long.valueOf(sheepId)); + dew.setVariety(sheepFile.getVariety()); + dew.setSheepType(sheepFile.getName()); + dew.setMonthAge(sheepFile.getMonthAge()); + dew.setGender(String.valueOf(sheepFile.getGender())); + dew.setBreed(sheepFile.getBreed()); + dew.setParity(sheepFile.getParity()); +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + dew.setUsageId(usageId); + deworms.add(dew); + } + + + return dewormMapper.insertDeworm(deworms); } /** @@ -64,8 +113,23 @@ public class DewormServiceImpl implements IDewormService * @return 结果 */ @Override + @Transactional public int updateDeworm(Deworm deworm) { + String username = SecurityUtils.getUsername(); + for (SwMedicineUsageDetails usageDetail : deworm.getUsageDetails()) { + usageDetail.setMediUsage(deworm.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(deworm.getUsageId()); + SwMedicineUsage swMedicineUsage = new SwMedicineUsage(); + + swMedicineUsage.setId(deworm.getUsageId()); + swMedicineUsage.setUpdateBy(username); + swMedicineUsage.setUpdateTime(DateUtils.getNowDate()); + medicineUsageMapper.updateSwMedicineUsage(swMedicineUsage); + + medicineUsageMapper.batchSwMedicineUsageDetails(deworm.getUsageDetails()); + deworm.setUpdateBy(username); deworm.setUpdateTime(DateUtils.getNowDate()); return dewormMapper.updateDeworm(deworm); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java index 319a658..c17e8ec 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java @@ -1,12 +1,20 @@ package com.zhyc.module.biosafety.service.impl; import java.util.List; +import java.util.Objects; + import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.module.base.domain.BasSheep; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.BasSheepMapper; +import com.zhyc.module.base.mapper.SheepFileMapper; import com.zhyc.module.biosafety.mapper.DiagnosisMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.domain.Diagnosis; import com.zhyc.module.biosafety.service.IDiagnosisService; +import org.springframework.transaction.annotation.Transactional; /** * 诊疗结果Service业务层处理 @@ -19,6 +27,10 @@ public class DiagnosisServiceImpl implements IDiagnosisService { @Autowired private DiagnosisMapper diagnosisMapper; + @Autowired + private SheepFileMapper sheepFileMapper; + @Autowired + private BasSheepMapper sheepMapper; /** * 查询诊疗结果 @@ -51,9 +63,25 @@ public class DiagnosisServiceImpl implements IDiagnosisService * @return 结果 */ @Override + @Transactional public int insertDiagnosis(Diagnosis diagnosis) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(diagnosis.getSheepId()); + diagnosis.setSheepType(sheepFile.getName()); + diagnosis.setParity(String.valueOf(sheepFile.getParity())); + diagnosis.setGender(String.valueOf(sheepFile.getGender())); + diagnosis.setMonthAge(sheepFile.getMonthAge()); + + String username = SecurityUtils.getUsername(); + diagnosis.setCreateBy(username); diagnosis.setCreateTime(DateUtils.getNowDate()); + if (!Objects.equals(sheepFile.getSheepfoldId(), diagnosis.getSheepfoldId())){ + BasSheep basSheep = new BasSheep(); + basSheep.setId(diagnosis.getSheepId()); + basSheep.setSheepfoldId(diagnosis.getSheepfoldId()); + sheepMapper.updateBasSheep(basSheep); + } +// 转入其他羊舍 return diagnosisMapper.insertDiagnosis(diagnosis); } @@ -64,8 +92,18 @@ public class DiagnosisServiceImpl implements IDiagnosisService * @return 结果 */ @Override + @Transactional public int updateDiagnosis(Diagnosis diagnosis) { + BasSheep basSheep = new BasSheep(); + basSheep.setId(diagnosis.getSheepId()); + basSheep.setSheepfoldId(diagnosis.getSheepfoldId()); + String username = SecurityUtils.getUsername(); + basSheep.setUpdateBy(username); + basSheep.setUpdateTime(DateUtils.getNowDate()); + diagnosis.setUpdateBy(username); + diagnosis.setUpdateTime(DateUtils.getNowDate()); + sheepMapper.updateBasSheep(basSheep); return diagnosisMapper.updateDiagnosis(diagnosis); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java index 18a014e..24918ef 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java @@ -1,12 +1,22 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.common.utils.bean.BeanUtils; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Deworm; +import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.DisinfectMapper; import com.zhyc.module.biosafety.domain.Disinfect; import com.zhyc.module.biosafety.service.IDisinfectService; +import org.springframework.transaction.annotation.Transactional; /** * 消毒记录Service业务层处理 @@ -20,6 +30,15 @@ public class DisinfectServiceImpl implements IDisinfectService @Autowired private DisinfectMapper disinfectMapper; + @Autowired + private SwMedicineUsageServiceImpl medicineUsageService; + + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + + @Autowired + private SheepFileMapper sheepFileMapper; + /** * 查询消毒记录 * @@ -29,7 +48,10 @@ public class DisinfectServiceImpl implements IDisinfectService @Override public Disinfect selectDisinfectById(Long id) { - return disinfectMapper.selectDisinfectById(id); + Disinfect disinfect = disinfectMapper.selectDisinfectById(id); + SwMedicineUsage swMedicineUsage = medicineUsageService.selectSwMedicineUsageById(disinfect.getUsageId()); + disinfect.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return disinfect; } /** @@ -53,8 +75,30 @@ public class DisinfectServiceImpl implements IDisinfectService @Override public int insertDisinfect(Disinfect disinfect) { + String username = SecurityUtils.getUsername(); + // 使用记录的文件 + SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(disinfect.getUsageDetails()); + medicineUsage.setName("羊舍消毒"); + medicineUsage.setUseType("3"); + + + List disinfects = new ArrayList<>(); + + disinfect.setCreateBy(username); disinfect.setCreateTime(DateUtils.getNowDate()); - return disinfectMapper.insertDisinfect(disinfect); + + for (Integer sheepfold : disinfect.getSheepfoldIds()) { + Disinfect dis = new Disinfect(); + BeanUtils.copyProperties(disinfect,dis); + dis.setSheepfoldId(sheepfold); +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + dis.setUsageId(usageId); + disinfects.add(dis); + } + + return disinfectMapper.insertDisinfect(disinfects); } /** @@ -64,8 +108,16 @@ public class DisinfectServiceImpl implements IDisinfectService * @return 结果 */ @Override + @Transactional public int updateDisinfect(Disinfect disinfect) { + for (SwMedicineUsageDetails usageDetail : disinfect.getUsageDetails()) { + usageDetail.setMediUsage(disinfect.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(disinfect.getUsageId()); + medicineUsageMapper.batchSwMedicineUsageDetails(disinfect.getUsageDetails()); + String username = SecurityUtils.getUsername(); + disinfect.setUpdateBy(username); disinfect.setUpdateTime(DateUtils.getNowDate()); return disinfectMapper.updateDisinfect(disinfect); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java index 7986bf7..bef0199 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java @@ -1,7 +1,16 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.common.utils.bean.BeanUtils; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Health; +import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.HealthMapper; @@ -20,6 +29,15 @@ public class HealthServiceImpl implements IHealthService @Autowired private HealthMapper healthMapper; + @Autowired + private SwMedicineUsageServiceImpl medicineUsageService; + + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + + @Autowired + private SheepFileMapper sheepFileMapper; + /** * 查询保健 * @@ -29,7 +47,10 @@ public class HealthServiceImpl implements IHealthService @Override public Health selectHealthById(Long id) { - return healthMapper.selectHealthById(id); + Health health = healthMapper.selectHealthById(id); + SwMedicineUsage swMedicineUsage = medicineUsageMapper.selectSwMedicineUsageById(health.getUsageId()); + health.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return health; } /** @@ -53,8 +74,36 @@ public class HealthServiceImpl implements IHealthService @Override public int insertHealth(Health health) { + String username = SecurityUtils.getUsername(); + + // 使用记录的文件 + SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(health.getUsageDetails()); + medicineUsage.setName("羊只保健"); + medicineUsage.setUseType("2"); + + List healths = new ArrayList<>(); + health.setCreateBy(username); health.setCreateTime(DateUtils.getNowDate()); - return healthMapper.insertHealth(health); + for (Integer sheepId : health.getSheepIds()) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId)); + Health heal = new Health(); + BeanUtils.copyProperties(health, heal); + heal.setSheepId(Long.valueOf(sheepId)); + heal.setVariety(sheepFile.getVariety()); + heal.setSheepType(sheepFile.getName()); + heal.setMonthAge(sheepFile.getMonthAge()); + heal.setGender(String.valueOf(sheepFile.getGender())); + heal.setBreed(sheepFile.getBreed()); + heal.setParity(sheepFile.getParity()); + +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + + heal.setUsageId(usageId); + healths.add(heal); + } + return healthMapper.insertHealth(healths); } /** @@ -66,6 +115,13 @@ public class HealthServiceImpl implements IHealthService @Override public int updateHealth(Health health) { + for (SwMedicineUsageDetails usageDetail : health.getUsageDetails()) { + usageDetail.setMediUsage(health.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(health.getUsageId()); + medicineUsageMapper.batchSwMedicineUsageDetails(health.getUsageDetails()); + String username = SecurityUtils.getUsername(); + health.setUpdateBy(username); health.setUpdateTime(DateUtils.getNowDate()); return healthMapper.updateHealth(health); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java index 145901b..6556faf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java @@ -1,12 +1,22 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.common.utils.bean.BeanUtils; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Deworm; +import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.ImmunityMapper; import com.zhyc.module.biosafety.domain.Immunity; import com.zhyc.module.biosafety.service.IImmunityService; +import org.springframework.transaction.annotation.Transactional; /** * 免疫Service业务层处理 @@ -20,6 +30,16 @@ public class ImmunityServiceImpl implements IImmunityService @Autowired private ImmunityMapper immunityMapper; + @Autowired + private SwMedicineUsageServiceImpl medicineUsageService; + + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + + @Autowired + private SheepFileMapper sheepFileMapper; + + /** * 查询免疫 * @@ -29,7 +49,10 @@ public class ImmunityServiceImpl implements IImmunityService @Override public Immunity selectImmunityById(Long id) { - return immunityMapper.selectImmunityById(id); + Immunity immunity = immunityMapper.selectImmunityById(id); + SwMedicineUsage swMedicineUsage = medicineUsageMapper.selectSwMedicineUsageById(immunity.getUsageId()); + immunity.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return immunity; } /** @@ -53,8 +76,42 @@ public class ImmunityServiceImpl implements IImmunityService @Override public int insertImmunity(Immunity immunity) { + String username = SecurityUtils.getUsername(); + + // 使用记录的文件 + SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(immunity.getUsageDetails()); + medicineUsage.setName("羊只免疫"); + medicineUsage.setUseType("0"); + medicineUsage.setCreateBy(username); + + List immunities = new ArrayList<>(); + + immunity.setUpdateBy(username); immunity.setCreateTime(DateUtils.getNowDate()); - return immunityMapper.insertImmunity(immunity); + + for (Integer sheepId : immunity.getSheepIds()) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId)); + + Immunity imm = new Immunity(); + BeanUtils.copyProperties(immunity, imm); + imm.setSheepId(Long.valueOf(sheepId)); + imm.setVariety(sheepFile.getVariety()); + imm.setSheepType(sheepFile.getName()); + imm.setMonthAge(sheepFile.getMonthAge()); + imm.setGender(String.valueOf(sheepFile.getGender())); + imm.setBreed(sheepFile.getBreed()); + imm.setParity(sheepFile.getParity()); +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + + imm.setUsageId(usageId); + immunities.add(imm); + } + + + immunity.setCreateTime(DateUtils.getNowDate()); + return immunityMapper.insertImmunity(immunities); } /** @@ -64,8 +121,14 @@ public class ImmunityServiceImpl implements IImmunityService * @return 结果 */ @Override + @Transactional public int updateImmunity(Immunity immunity) { + for (SwMedicineUsageDetails usageDetail : immunity.getUsageDetails()) { + usageDetail.setMediUsage(immunity.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(immunity.getUsageId()); + medicineUsageMapper.batchSwMedicineUsageDetails(immunity.getUsageDetails()); immunity.setUpdateTime(DateUtils.getNowDate()); return immunityMapper.updateImmunity(immunity); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java index dec6015..4c55e78 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.StringUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; @@ -60,6 +61,8 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService @Override public int insertQuarantineReport(QuarantineReport quarantineReport) { + String username = SecurityUtils.getUsername(); + quarantineReport.setCreateBy(username); quarantineReport.setCreateTime(DateUtils.getNowDate()); if (quarantineReport.getResult()==null){ quarantineReport.setStatus(0); @@ -94,6 +97,8 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService @Override public int updateQuarantineReport(QuarantineReport quarantineReport) { + String username = SecurityUtils.getUsername(); + quarantineReport.setUpdateBy(username); quarantineReport.setUpdateTime(DateUtils.getNowDate()); return quarantineReportMapper.updateQuarantineReport(quarantineReport); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java index 9fbf96d..d5d06f9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; import com.zhyc.module.biosafety.service.ISwMedicineUsageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,6 +59,8 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService @Override public int insertSwMedicineUsage(SwMedicineUsage swMedicineUsage) { + String username = SecurityUtils.getUsername(); + swMedicineUsage.setCreateBy(username); swMedicineUsage.setCreateTime(DateUtils.getNowDate()); int rows = swMedicineUsageMapper.insertSwMedicineUsage(swMedicineUsage); insertSwMedicineUsageDetails(swMedicineUsage); @@ -74,6 +77,8 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService @Override public int updateSwMedicineUsage(SwMedicineUsage swMedicineUsage) { + String username = SecurityUtils.getUsername(); + swMedicineUsage.setUpdateBy(username); swMedicineUsage.setUpdateTime(DateUtils.getNowDate()); swMedicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(swMedicineUsage.getId()); insertSwMedicineUsageDetails(swMedicineUsage); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwPrescriptionServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwPrescriptionServiceImpl.java index 62058e8..59841b8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwPrescriptionServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwPrescriptionServiceImpl.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; import com.zhyc.module.biosafety.domain.SwPresDetail; import com.zhyc.module.biosafety.domain.SwPrescription; import com.zhyc.module.biosafety.mapper.SwPrescriptionMapper; @@ -58,6 +59,8 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService @Override public int insertSwPrescription(SwPrescription swPrescription) { + String username = SecurityUtils.getUsername(); + swPrescription.setCreateBy(username); swPrescription.setCreateTime(DateUtils.getNowDate()); int rows = swPrescriptionMapper.insertSwPrescription(swPrescription); insertSwPresDetail(swPrescription); @@ -74,6 +77,8 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService @Override public int updateSwPrescription(SwPrescription swPrescription) { + String username = SecurityUtils.getUsername(); + swPrescription.setUpdateBy(username); swPrescription.setUpdateTime(DateUtils.getNowDate()); swPrescriptionMapper.deleteSwPresDetailByPersId(swPrescription.getId()); insertSwPresDetail(swPrescription); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java index 9ab2ac5..7ecd944 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; @@ -73,12 +74,14 @@ public class TreatmentServiceImpl implements ITreatmentService @Transactional public int insertTreatment(Treatment treatment) { + String username = SecurityUtils.getUsername(); // 使用记录的文件 SwMedicineUsage medicineUsage = new SwMedicineUsage(); medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails()); medicineUsage.setName("羊只治疗"); medicineUsage.setUseType("4"); - + medicineUsage.setCreateBy(username); + medicineUsage.setCreateTime(DateUtils.getNowDate()); // 新增单挑数据 if (treatment.getSheepId()!=null){ // 药品使用记录 @@ -129,13 +132,20 @@ public class TreatmentServiceImpl implements ITreatmentService * @return 结果 */ @Override + @Transactional public int updateTreatment(Treatment treatment) { + String username = SecurityUtils.getUsername(); for (SwMedicineUsageDetails usageDetail : treatment.getUsageDetails()) { usageDetail.setMediUsage(treatment.getUsageId()); } medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(treatment.getUsageId()); + SwMedicineUsage swMedicineUsage = new SwMedicineUsage(); + swMedicineUsage.setId(treatment.getUsageId()); + swMedicineUsage.setUpdateBy(username); + medicineUsageMapper.updateSwMedicineUsage(swMedicineUsage); medicineUsageMapper.batchSwMedicineUsageDetails(treatment.getUsageDetails()); + treatment.setUpdateBy(username); treatment.setUpdateTime(DateUtils.getNowDate()); return treatmentMapper.updateTreatment(treatment); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java index 15e6314..64e71f6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpFreshMilkInsp.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-18 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpFreshMilkInsp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -81,187 +87,4 @@ public class NpFreshMilkInsp extends BaseEntity @Excel(name = "备注") private String commnet; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSource(String source) - { - this.source = source; - } - - public String getSource() - { - return source; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFat(Double fat) - { - this.fat = fat; - } - - public Double getFat() - { - return fat; - } - - public void setProtein(Double protein) - { - this.protein = protein; - } - - public Double getProtein() - { - return protein; - } - - public void setNonFat(Double nonFat) - { - this.nonFat = nonFat; - } - - public Double getNonFat() - { - return nonFat; - } - - public void setAcidity(Double acidity) - { - this.acidity = acidity; - } - - public Double getAcidity() - { - return acidity; - } - - public void setBacterialColony1(Double bacterialColony1) - { - this.bacterialColony1 = bacterialColony1; - } - - public Double getBacterialColony1() - { - return bacterialColony1; - } - - public void setBacterialColony2(Double bacterialColony2) - { - this.bacterialColony2 = bacterialColony2; - } - - public Double getBacterialColony2() - { - return bacterialColony2; - } - - public void setBacterialColony3(Double bacterialColony3) - { - this.bacterialColony3 = bacterialColony3; - } - - public Double getBacterialColony3() - { - return bacterialColony3; - } - - public void setBacterialColony4(Double bacterialColony4) - { - this.bacterialColony4 = bacterialColony4; - } - - public Double getBacterialColony4() - { - return bacterialColony4; - } - - public void setBacterialColony5(Double bacterialColony5) - { - this.bacterialColony5 = bacterialColony5; - } - - public Double getBacterialColony5() - { - return bacterialColony5; - } - - public void setColi(Double coli) - { - this.coli = coli; - } - - public Double getColi() - { - return coli; - } - - public void setLactoferrin(Double lactoferrin) - { - this.lactoferrin = lactoferrin; - } - - public Double getLactoferrin() - { - return lactoferrin; - } - - public void setIg(Double ig) - { - this.ig = ig; - } - - public Double getIg() - { - return ig; - } - - public void setCommnet(String commnet) - { - this.commnet = commnet; - } - - public String getCommnet() - { - return commnet; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("source", getSource()) - .append("datetime", getDatetime()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("acidity", getAcidity()) - .append("bacterialColony1", getBacterialColony1()) - .append("bacterialColony2", getBacterialColony2()) - .append("bacterialColony3", getBacterialColony3()) - .append("bacterialColony4", getBacterialColony4()) - .append("bacterialColony5", getBacterialColony5()) - .append("coli", getColi()) - .append("lactoferrin", getLactoferrin()) - .append("ig", getIg()) - .append("commnet", getCommnet()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java index 5b140c6..0c71d35 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpRawMilkInspe.java @@ -344,6 +344,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -355,6 +358,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpRawMilkInspe extends BaseEntity { private static final long serialVersionUID = 1L; @@ -447,201 +453,4 @@ public class NpRawMilkInspe extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - // Getters and Setters - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setDatetime(Date datetime) { - this.datetime = datetime; - } - - public Date getDatetime() { - return datetime; - } - - public void setSource(String source) { - this.source = source; - } - - public String getSource() { - return source; - } - - public void setFreeze(Double freeze) { - this.freeze = freeze; - } - - public Double getFreeze() { - return freeze; - } - - public void setDensity(Double density) { - this.density = density; - } - - public Double getDensity() { - return density; - } - - public void setFat(Double fat) { - this.fat = fat; - } - - public Double getFat() { - return fat; - } - - public void setProtein(Double protein) { - this.protein = protein; - } - - public Double getProtein() { - return protein; - } - - public void setNonFat(Double nonFat) { - this.nonFat = nonFat; - } - - public Double getNonFat() { - return nonFat; - } - - public void setDryMatter(Double dryMatter) { - this.dryMatter = dryMatter; - } - - public Double getDryMatter() { - return dryMatter; - } - - public void setImpurityDegree(Double impurityDegree) { - this.impurityDegree = impurityDegree; - } - - public Double getImpurityDegree() { - return impurityDegree; - } - - public void setLactose(Double lactose) { - this.lactose = lactose; - } - - public Double getLactose() { - return lactose; - } - - public void setAshContent(Double ashContent) { - this.ashContent = ashContent; - } - - public Double getAshContent() { - return ashContent; - } - - public void setAcidity(Double acidity) { - this.acidity = acidity; - } - - public Double getAcidity() { - return acidity; - } - - public void setPh(Double ph) { - this.ph = ph; - } - - public Double getPh() { - return ph; - } - - public void setBacterialColony(Double bacterialColony) { - this.bacterialColony = bacterialColony; - } - - public Double getBacterialColony() { - return bacterialColony; - } - - public void setLactoferrin(Double lactoferrin) { - this.lactoferrin = lactoferrin; - } - - public Double getLactoferrin() { - return lactoferrin; - } - - public void setIg(Double ig) { - this.ig = ig; - } - - public Double getIg() { - return ig; - } - - public void setSomaticCell(Double somaticCell) { - this.somaticCell = somaticCell; - } - - public Double getSomaticCell() { - return somaticCell; - } - - public void setUsea(Double usea) { - this.usea = usea; - } - - public Double getUsea() { - return usea; - } - - public void setFatRatio(Double fatRatio) { - this.fatRatio = fatRatio; - } - - public Double getFatRatio() { - return fatRatio; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getComment() { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("source", getSource()) - .append("freeze", getFreeze()) - .append("density", getDensity()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("dryMatter", getDryMatter()) - .append("impurityDegree", getImpurityDegree()) - .append("lactose", getLactose()) - .append("ashContent", getAshContent()) - .append("acidity", getAcidity()) - .append("ph", getPh()) - .append("bacterialColony", getBacterialColony()) - .append("lactoferrin", getLactoferrin()) - .append("ig", getIg()) - .append("somaticCell", getSomaticCell()) - .append("usea", getUsea()) - .append("fatRatio", getFatRatio()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java index cb57bbc..e284508 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/NpYogurtInsp.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-17 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class NpYogurtInsp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -82,187 +88,4 @@ public class NpYogurtInsp extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSource(String source) - { - this.source = source; - } - - public String getSource() - { - return source; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFat(Double fat) - { - this.fat = fat; - } - - public Double getFat() - { - return fat; - } - - public void setProtein(Double protein) - { - this.protein = protein; - } - - public Double getProtein() - { - return protein; - } - - public void setNonFat(Double nonFat) - { - this.nonFat = nonFat; - } - - public Double getNonFat() - { - return nonFat; - } - - public void setAcidity(Double acidity) - { - this.acidity = acidity; - } - - public Double getAcidity() - { - return acidity; - } - - public void setBacterialColony1(Double bacterialColony1) - { - this.bacterialColony1 = bacterialColony1; - } - - public Double getBacterialColony1() - { - return bacterialColony1; - } - - public void setBacterialClony2(Double bacterialClony2) - { - this.bacterialClony2 = bacterialClony2; - } - - public Double getBacterialClony2() - { - return bacterialClony2; - } - - public void setBacterialClony3(Double bacterialClony3) - { - this.bacterialClony3 = bacterialClony3; - } - - public Double getBacterialClony3() - { - return bacterialClony3; - } - - public void setBacterialClony4(Double bacterialClony4) - { - this.bacterialClony4 = bacterialClony4; - } - - public Double getBacterialClony4() - { - return bacterialClony4; - } - - public void setBacterialClony5(Double bacterialClony5) - { - this.bacterialClony5 = bacterialClony5; - } - - public Double getBacterialClony5() - { - return bacterialClony5; - } - - public void setYeast(Double yeast) - { - this.yeast = yeast; - } - - public Double getYeast() - { - return yeast; - } - - public void setMould(Double mould) - { - this.mould = mould; - } - - public Double getMould() - { - return mould; - } - - public void setLacto(Double lacto) - { - this.lacto = lacto; - } - - public Double getLacto() - { - return lacto; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("source", getSource()) - .append("datetime", getDatetime()) - .append("fat", getFat()) - .append("protein", getProtein()) - .append("nonFat", getNonFat()) - .append("acidity", getAcidity()) - .append("bacterialColony1", getBacterialColony1()) - .append("bacterialClony2", getBacterialClony2()) - .append("bacterialClony3", getBacterialClony3()) - .append("bacterialClony4", getBacterialClony4()) - .append("bacterialClony5", getBacterialClony5()) - .append("yeast", getYeast()) - .append("mould", getMould()) - .append("lacto", getLacto()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java index e7b1e13..a211abb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzDryMatterCorrection.java @@ -2,11 +2,17 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzDryMatterCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -28,29 +34,4 @@ public class XzDryMatterCorrection extends BaseEntity { @Excel(name = "干物质系数") private Double coefficient; - // getters and setters... - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public Date getDatetime() { return datetime; } - public void setDatetime(Date datetime) { this.datetime = datetime; } - public String getFactory() { return factory; } - public void setFactory(String factory) { this.factory = factory; } - public Double getContent() { return content; } - public void setContent(Double content) { this.content = content; } - public Double getStandard() { return standard; } - public void setStandard(Double standard) { this.standard = standard; } - public Double getCoefficient() { return coefficient; } - public void setCoefficient(Double coefficient) { this.coefficient = coefficient; } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", id) - .append("datetime", datetime) - .append("factory", factory) - .append("content", content) - .append("standard", standard) - .append("coefficient", coefficient) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java index f74f452..d1a93e6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzParityCorrection.java @@ -1,5 +1,8 @@ package com.zhyc.module.dairyProducts.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-14 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzParityCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,42 +32,4 @@ public class XzParityCorrection extends BaseEntity @Excel(name = "系数") private Double coef; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setParity(Integer parity) - { - this.parity = parity; - } - - public Integer getParity() - { - return parity; - } - - public void setCoef(Double coef) - { - this.coef = coef; - } - - public Double getCoef() - { - return coef; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("parity", getParity()) - .append("coef", getCoef()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java index a44abe3..6bba703 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/domain/XzWegihCorrection.java @@ -2,6 +2,9 @@ package com.zhyc.module.dairyProducts.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-12 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class XzWegihCorrection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -41,73 +47,5 @@ public class XzWegihCorrection extends BaseEntity @Excel(name = "称重系数") private Double coefficient; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setFactory(String factory) - { - this.factory = factory; - } - - public String getFactory() - { - return factory; - } - - public void setActual(Double actual) - { - this.actual = actual; - } - - public Double getActual() - { - return actual; - } - - public void setSystemMilk(Double systemMilk) - { - this.systemMilk = systemMilk; - } - - public Double getSystemMilk() - { - return systemMilk; - } - - public Double getCoefficient() { - return coefficient; - } - - public void setCoefficient(Double coefficient) { - this.coefficient = coefficient; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("factory", getFactory()) - .append("actual", getActual()) - .append("systemMilk", getSystemMilk()) - .append("coefficient", getCoefficient()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java index 1ec98fa..bb5ca20 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpFreshMilkInspMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; +import org.apache.ibatis.annotations.Mapper; /** * 鲜奶生产，成品检验记录Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.dairyProducts.domain.NpFreshMilkInsp; * @author ruoyi * @date 2025-07-18 */ +@Mapper public interface NpFreshMilkInspMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java index 0391549..8b455ba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpRawMilkInspeMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; +import org.apache.ibatis.annotations.Mapper; /** * 生乳检验记录Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.dairyProducts.domain.NpRawMilkInspe; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface NpRawMilkInspeMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java index eae3d67..5a736d7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/NpYogurtInspMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; +import org.apache.ibatis.annotations.Mapper; /** * 酸奶生产，成品检疫记录Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.dairyProducts.domain.NpYogurtInsp; * @author ruoyi * @date 2025-07-17 */ +@Mapper public interface NpYogurtInspMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java index 0db0aff..b84955b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzDryMatterCorrectionMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; +import org.apache.ibatis.annotations.Mapper; /** * 干物质校正Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.dairyProducts.domain.XzDryMatterCorrection; * @author ruoyi * @date 2025-07-12 */ +@Mapper public interface XzDryMatterCorrectionMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java index e19c509..d2f4654 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzParityCorrectionMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.XzParityCorrection; +import org.apache.ibatis.annotations.Mapper; /** * 胎次校正Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.dairyProducts.domain.XzParityCorrection; * @author ruoyi * @date 2025-07-14 */ +@Mapper public interface XzParityCorrectionMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java index c21fab8..b6313bd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/dairyProducts/mapper/XzWegihCorrectionMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.dairyProducts.mapper; import java.util.List; import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; +import org.apache.ibatis.annotations.Mapper; /** * 称重校正Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.dairyProducts.domain.XzWegihCorrection; * @author ruoyi * @date 2025-07-12 */ +@Mapper public interface XzWegihCorrectionMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/RawSpermRecordController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/RawSpermRecordController.java new file mode 100644 index 0000000..17e4ee4 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/RawSpermRecordController.java @@ -0,0 +1,137 @@ +package com.zhyc.module.produce.breed.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zhyc.common.annotation.Log; +import com.zhyc.common.core.controller.BaseController; +import com.zhyc.common.core.domain.AjaxResult; +import com.zhyc.common.enums.BusinessType; +import com.zhyc.common.utils.StringUtils; +import com.zhyc.module.produce.breed.domain.RawSpermRecord; +import com.zhyc.module.produce.breed.service.IRawSpermRecordService; +import com.zhyc.common.utils.poi.ExcelUtil; +import com.zhyc.common.core.page.TableDataInfo; + +/** + * 采精记录Controller + * + * @author ruoyi + * @date 2025-07-23 + */ +@RestController +@RequestMapping("/Sperm/Sperm") +public class RawSpermRecordController extends BaseController +{ + @Autowired + private IRawSpermRecordService rawSpermRecordService; + + /** + * 查询采精记录列表 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:list')") + @GetMapping("/list") + public TableDataInfo list(RawSpermRecord rawSpermRecord) + { + startPage(); + List list = rawSpermRecordService.selectRawSpermRecordList(rawSpermRecord); + return getDataTable(list); + } + + /** + * 导出采精记录列表 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:export')") + @Log(title = "采精记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RawSpermRecord rawSpermRecord) + { + List list = rawSpermRecordService.selectRawSpermRecordList(rawSpermRecord); + ExcelUtil util = new ExcelUtil(RawSpermRecord.class); + util.exportExcel(response, list, "采精记录数据"); + } + + /** + * 获取采精记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(rawSpermRecordService.selectRawSpermRecordById(id)); + } + + /** + * 新增采精记录 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:add')") + @Log(title = "采精记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RawSpermRecord rawSpermRecord) + { + // 如果传入的是耳号，需要先根据耳号查询羊只ID + if (StringUtils.isNotEmpty(rawSpermRecord.getManageTags()) && rawSpermRecord.getSheepId() == null) { + Long sheepId = rawSpermRecordService.getSheepIdByManageTags(rawSpermRecord.getManageTags()); + if (sheepId == null) { + return error("未找到对应耳号的羊只信息"); + } + rawSpermRecord.setSheepId(sheepId); + } + + return toAjax(rawSpermRecordService.insertRawSpermRecord(rawSpermRecord)); + } + + /** + * 修改采精记录 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:edit')") + @Log(title = "采精记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody RawSpermRecord rawSpermRecord) + { + // 如果传入的是耳号，需要先根据耳号查询羊只ID + if (StringUtils.isNotEmpty(rawSpermRecord.getManageTags()) && rawSpermRecord.getSheepId() == null) { + Long sheepId = rawSpermRecordService.getSheepIdByManageTags(rawSpermRecord.getManageTags()); + if (sheepId == null) { + return error("未找到对应耳号的羊只信息"); + } + rawSpermRecord.setSheepId(sheepId); + } + + return toAjax(rawSpermRecordService.updateRawSpermRecord(rawSpermRecord)); + } + + /** + * 删除采精记录 + */ + @PreAuthorize("@ss.hasPermi('Sperm:Sperm:remove')") + @Log(title = "采精记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(rawSpermRecordService.deleteRawSpermRecordByIds(ids)); + } + + /** + * 根据耳号查询羊只信息 + */ + @GetMapping("/getSheepByManageTags/{manageTags}") + public AjaxResult getSheepByManageTags(@PathVariable("manageTags") String manageTags) + { + Long sheepId = rawSpermRecordService.getSheepIdByManageTags(manageTags); + if (sheepId != null) { + return success(sheepId); + } else { + return error("未找到对应耳号的羊只信息"); + } + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedRecordController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedRecordController.java new file mode 100644 index 0000000..c80c7ae --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScBreedRecordController.java @@ -0,0 +1,158 @@ +package com.zhyc.module.produce.breed.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zhyc.common.annotation.Log; +import com.zhyc.common.core.controller.BaseController; +import com.zhyc.common.core.domain.AjaxResult; +import com.zhyc.common.enums.BusinessType; +import com.zhyc.module.produce.breed.domain.ScBreedRecord; +import com.zhyc.module.produce.breed.service.IScBreedRecordService; +import com.zhyc.common.utils.poi.ExcelUtil; +import com.zhyc.common.core.page.TableDataInfo; + +/** + * 配种记录Controller + * + * @author ruoyi + * @date 2025-07-23 + */ +@RestController +@RequestMapping("/Breeding_records/Breeding_records") +public class ScBreedRecordController extends BaseController +{ + @Autowired + private IScBreedRecordService scBreedRecordService; + + /** + * 查询配种记录列表 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:list')") + @GetMapping("/list") + public TableDataInfo list(ScBreedRecord scBreedRecord) + { + startPage(); + List list = scBreedRecordService.selectScBreedRecordList(scBreedRecord); + return getDataTable(list); + } + + /** + * 导出配种记录列表 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:export')") + @Log(title = "配种记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ScBreedRecord scBreedRecord) + { + List list = scBreedRecordService.selectScBreedRecordList(scBreedRecord); + ExcelUtil util = new ExcelUtil(ScBreedRecord.class); + util.exportExcel(response, list, "配种记录数据"); + } + + /** + * 获取配种记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(scBreedRecordService.selectScBreedRecordById(id)); + } + + /** + * 根据耳号查询羊只信息 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:query')") + @GetMapping(value = "/getSheepByTags/{manageTags}") + public AjaxResult getSheepInfoByTags(@PathVariable("manageTags") String manageTags) + { + return success(scBreedRecordService.getSheepInfoByTags(manageTags)); + } + + /** + * 根据母羊耳号获取配种计划信息 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:query')") + @GetMapping(value = "/getBreedPlan/{manageTags}") + public AjaxResult getBreedPlanByEweTags(@PathVariable("manageTags") String manageTags) + { + return success(scBreedRecordService.getBreedPlanByEweTags(manageTags)); + } + + /** + * 新增配种记录 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:add')") + @Log(title = "配种记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ScBreedRecord scBreedRecord) + { + // 如果传入的是耳号，需要转换为羊只ID + if (scBreedRecord.getEweManageTags() != null && !scBreedRecord.getEweManageTags().isEmpty()) { + Long eweId = scBreedRecordService.getSheepIdByTags(scBreedRecord.getEweManageTags()); + if (eweId == null) { + return error("未找到母羊耳号对应的羊只信息"); + } + scBreedRecord.setEweId(eweId.toString()); + } + + if (scBreedRecord.getRamManageTags() != null && !scBreedRecord.getRamManageTags().isEmpty()) { + Long ramId = scBreedRecordService.getRamIdByTags(scBreedRecord.getRamManageTags()); + if (ramId == null) { + return error("未找到公羊耳号对应的羊只信息"); + } + scBreedRecord.setRamId(ramId.toString()); + } + + return toAjax(scBreedRecordService.insertScBreedRecord(scBreedRecord)); + } + + /** + * 修改配种记录 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:edit')") + @Log(title = "配种记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ScBreedRecord scBreedRecord) + { + // 如果传入的是耳号，需要转换为羊只ID + if (scBreedRecord.getEweManageTags() != null && !scBreedRecord.getEweManageTags().isEmpty()) { + Long eweId = scBreedRecordService.getSheepIdByTags(scBreedRecord.getEweManageTags()); + if (eweId == null) { + return error("未找到母羊耳号对应的羊只信息"); + } + scBreedRecord.setEweId(eweId.toString()); + } + + if (scBreedRecord.getRamManageTags() != null && !scBreedRecord.getRamManageTags().isEmpty()) { + Long ramId = scBreedRecordService.getRamIdByTags(scBreedRecord.getRamManageTags()); + if (ramId == null) { + return error("未找到公羊耳号对应的羊只信息"); + } + scBreedRecord.setRamId(ramId.toString()); + } + + return toAjax(scBreedRecordService.updateScBreedRecord(scBreedRecord)); + } + + /** + * 删除配种记录 + */ + @PreAuthorize("@ss.hasPermi('Breeding_records:Breeding_records:remove')") + @Log(title = "配种记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(scBreedRecordService.deleteScBreedRecordByIds(ids)); + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScPregnancyRecordController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScPregnancyRecordController.java index 7dd6649..08d5cc1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScPregnancyRecordController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScPregnancyRecordController.java @@ -1,10 +1,8 @@ package com.zhyc.module.produce.breed.controller; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; - -import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; -import com.zhyc.module.produce.breed.service.IScPregnancyRecordService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -14,20 +12,22 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.enums.BusinessType; - +import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; +import com.zhyc.module.produce.breed.service.IScPregnancyRecordService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; /** * 孕检记录Controller - * - * @author ruoyi - * @date 2025-07-17 + * + * @author zhyc + * @date 2025-01-21 */ @RestController @RequestMapping("/Pregnancy_Test/Pregnancy_Test") @@ -98,9 +98,19 @@ public class ScPregnancyRecordController extends BaseController */ @PreAuthorize("@ss.hasPermi('Pregnancy_Test:Pregnancy_Test:remove')") @Log(title = "孕检记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(scPregnancyRecordService.deleteScPregnancyRecordByIds(ids)); } -} + + /** + * 根据耳号获取羊只信息 + */ + @GetMapping("/getSheepByManageTags") + public AjaxResult getSheepByManageTags(@RequestParam("manageTags") String manageTags) + { + Map sheepInfo = scPregnancyRecordService.getSheepByManageTags(manageTags); + return success(sheepInfo); + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java new file mode 100644 index 0000000..2f1c625 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/RawSpermRecord.java @@ -0,0 +1,83 @@ +package com.zhyc.module.produce.breed.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zhyc.common.annotation.Excel; +import com.zhyc.common.core.domain.BaseEntity; + +/** + * 采精记录对象 raw_sperm_record + * + * @author ruoyi + * @date 2025-07-23 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RawSpermRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 羊只ID */ + @Excel(name = "羊只ID") + private Long sheepId; + + /** 耳号 */ + @Excel(name = "耳号") + private String manageTags; + + /** 电子耳号 */ + @Excel(name = "电子耳号") + private String electronicTags; + + /** 月龄 */ + @Excel(name = "月龄") + private Long monthAge; + + /** 采精日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "采精日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date pickDate; + + /** 采精量 */ + @Excel(name = "采精量") + private Long amount; + + /** 精液密度 */ + @Excel(name = "精液密度") + private String density; + + /** 精液活力 */ + @Excel(name = "精液活力") + private String vitallity; + + /** 是否性控（0否1是） */ + @Excel(name = "是否性控", readConverterExp = "0=否,1=是") + private Long controlled; + + /** 性欲情况 */ + @Excel(name = "性欲情况") + private String sexualStatus; + + /** 诊疗信息 */ + @Excel(name = "诊疗信息") + private String info; + + /** 技术员 */ + @Excel(name = "技术员") + private String technician; + + /** 采集备注 */ + @Excel(name = "采集备注") + private String comment; + + +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java index c888a03..1989341 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlan.java @@ -1,5 +1,8 @@ package com.zhyc.module.produce.breed.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlan extends BaseEntity { private static final long serialVersionUID = 1L; @@ -30,53 +36,4 @@ public class ScBreedPlan extends BaseEntity @Excel(name = "配种类型") private Long breedType; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setRamId(String ramId) - { - this.ramId = ramId; - } - - public String getRamId() - { - return ramId; - } - - public void setEweId(String eweId) - { - this.eweId = eweId; - } - - public String getEweId() - { - return eweId; - } - - public void setBreedType(Long breedType) - { - this.breedType = breedType; - } - - public Long getBreedType() - { - return breedType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ramId", getRamId()) - .append("eweId", getEweId()) - .append("breedType", getBreedType()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java index 1622ae6..db6f059 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanGenerate.java @@ -2,6 +2,9 @@ package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlanGenerate extends BaseEntity { private static final long serialVersionUID = 1L; @@ -61,134 +67,4 @@ public class ScBreedPlanGenerate extends BaseEntity /** 审批意见 */ private String approveRemark; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setPlanName(String planName) - { - this.planName = planName; - } - - public String getPlanName() - { - return planName; - } - - public void setPlanType(Integer planType) - { - this.planType = planType; - } - - public Integer getPlanType() - { - return planType; - } - - public void setPlanDate(Date planDate) - { - this.planDate = planDate; - } - - public Date getPlanDate() - { - return planDate; - } - - public void setTotalEweCount(Integer totalEweCount) - { - this.totalEweCount = totalEweCount; - } - - public Integer getTotalEweCount() - { - return totalEweCount; - } - - public void setTotalRamCount(Integer totalRamCount) - { - this.totalRamCount = totalRamCount; - } - - public Integer getTotalRamCount() - { - return totalRamCount; - } - - public void setBreedRatio(String breedRatio) - { - this.breedRatio = breedRatio; - } - - public String getBreedRatio() - { - return breedRatio; - } - - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - public void setApprover(String approver) - { - this.approver = approver; - } - - public String getApprover() - { - return approver; - } - - public void setApproveTime(Date approveTime) - { - this.approveTime = approveTime; - } - - public Date getApproveTime() - { - return approveTime; - } - - public void setApproveRemark(String approveRemark) - { - this.approveRemark = approveRemark; - } - - public String getApproveRemark() - { - return approveRemark; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("planName", getPlanName()) - .append("planType", getPlanType()) - .append("planDate", getPlanDate()) - .append("totalEweCount", getTotalEweCount()) - .append("totalRamCount", getTotalRamCount()) - .append("breedRatio", getBreedRatio()) - .append("status", getStatus()) - .append("approver", getApprover()) - .append("approveTime", getApproveTime()) - .append("approveRemark", getApproveRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java index 132ce77..4380caf 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedPlanTemp.java @@ -1,5 +1,8 @@ package com.zhyc.module.produce.breed.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-16 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScBreedPlanTemp extends BaseEntity { private static final long serialVersionUID = 1L; @@ -63,110 +69,5 @@ public class ScBreedPlanTemp extends BaseEntity return id; } - public void setPlanGenerateId(Long planGenerateId) - { - this.planGenerateId = planGenerateId; - } - public Long getPlanGenerateId() - { - return planGenerateId; - } - - public void setRamId(String ramId) - { - this.ramId = ramId; - } - - public String getRamId() - { - return ramId; - } - - public void setEweId(String eweId) - { - this.eweId = eweId; - } - - public String getEweId() - { - return eweId; - } - - public void setBreedType(Long breedType) - { - this.breedType = breedType; - } - - public Long getBreedType() - { - return breedType; - } - - public void setRamManageTags(String ramManageTags) - { - this.ramManageTags = ramManageTags; - } - - public String getRamManageTags() - { - return ramManageTags; - } - - public void setRamVariety(String ramVariety) - { - this.ramVariety = ramVariety; - } - - public String getRamVariety() - { - return ramVariety; - } - - public void setEweManageTags(String eweManageTags) - { - this.eweManageTags = eweManageTags; - } - - public String getEweManageTags() - { - return eweManageTags; - } - - public void setEweVariety(String eweVariety) - { - this.eweVariety = eweVariety; - } - - public String getEweVariety() - { - return eweVariety; - } - - public void setEweWeight(Double eweWeight) - { - this.eweWeight = eweWeight; - } - - public Double getEweWeight() - { - return eweWeight; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("planGenerateId", getPlanGenerateId()) - .append("ramId", getRamId()) - .append("eweId", getEweId()) - .append("breedType", getBreedType()) - .append("ramManageTags", getRamManageTags()) - .append("ramVariety", getRamVariety()) - .append("eweManageTags", getEweManageTags()) - .append("eweVariety", getEweVariety()) - .append("eweWeight", getEweWeight()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java new file mode 100644 index 0000000..c5f548d --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScBreedRecord.java @@ -0,0 +1,116 @@ +package com.zhyc.module.produce.breed.domain; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zhyc.common.annotation.Excel; +import com.zhyc.common.core.domain.BaseEntity; + +/** + * 配种记录对象 sc_breed_record + * + * @author ruoyi + * @date 2025-07-23 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ScBreedRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 羊只id */ + @Excel(name = "羊只id") + private Long sheepId; + + /** 配种公羊id */ + @Excel(name = "配种公羊id") + private String ramId; + + /** 配种母羊id */ + @Excel(name = "配种母羊id") + private String eweId; + + /** 技术员 */ + @Excel(name = "技术员") + private String technician; + + /** 繁殖用药/耗精量 */ + @Excel(name = "耗精量") + private String breedDrugs; + + // ============ 显示字段 ============ + + /** 母羊耳号 */ + @Excel(name = "耳号") + private String eweManageTags; + + /** 母羊品种 */ + @Excel(name = "品种") + private String eweVariety; + + /** 公羊耳号 */ + @Excel(name = "配种公羊") + private String ramManageTags; + + /** 公羊品种 */ + @Excel(name = "配种公羊品种") + private String ramVariety; + + /** 胎次 */ + @Excel(name = "胎次") + private Integer eweParity; + + /** 月龄 */ + @Excel(name = "月龄") + private Integer eweMonthAge; + + /** 羊舍名称 */ + @Excel(name = "当前羊舍") + private String eweSheepfoldName; + + /** 繁育状态 */ + @Excel(name = "繁育状态") + private String eweBreedStatus; + + /** 是否性控 */ + @Excel(name = "是否性控", readConverterExp = "0=否,1=是") + private Integer eweControlled; + + /** 羊只备注 */ + @Excel(name = "羊只备注") + private String eweComment; + + /** 牧场名称 */ + @Excel(name = "所在牧场") + private String ranchName; + + /** 配种方式 */ + @Excel(name = "配种方式") + private String matingType; + + /** 羊只类别 */ + @Excel(name = "配种时羊只类别") + private String sheepType; + + /** 配次 */ + @Excel(name = "配次") + private Integer matingCount; + + /** 发情后配种时间 */ + @Excel(name = "发情后配种时间(小时)") + private Long timeSincePlanning; + + /** 牧场ID */ + private Long ranchId; + + +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java index 7ffa127..07f0fb8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScDryMilk.java @@ -2,6 +2,9 @@ package com.zhyc.module.produce.breed.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScDryMilk extends BaseEntity { private static final long serialVersionUID = 1L; @@ -63,127 +69,5 @@ public class ScDryMilk extends BaseEntity @Excel(name = "事件类型") private String eventType; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - public void setSheepId(String sheepId) - { - this.sheepId = sheepId; - } - - public String getSheepId() - { - return sheepId; - } - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setSheepfold(Long sheepfold) - { - this.sheepfold = sheepfold; - } - - public Long getSheepfold() - { - return sheepfold; - } - public void setTecahnician(String tecahnician) - { - this.tecahnician = tecahnician; - } - - public String getTecahnician() - { - return tecahnician; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - public void setManageTags(String manageTags) - { - this.manageTags = manageTags; - } - - public String getManageTags() - { - return manageTags; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepfoldName(String sheepfoldName) - { - this.sheepfoldName = sheepfoldName; - } - - public String getSheepfoldName() - { - return sheepfoldName; - } - - public void setEventType(String eventType) - { - this.eventType = eventType; - } - - public String getEventType() - { - return eventType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("datetime", getDatetime()) - .append("status", getStatus()) - .append("sheepfold", getSheepfold()) - .append("tecahnician", getTecahnician()) - .append("comment", getComment()) - .append("manageTags", getManageTags()) - .append("variety", getVariety()) - .append("sheepfoldName", getSheepfoldName()) - .append("eventType", getEventType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java index f2bcb3a..69044e4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambDetail.java @@ -5,6 +5,9 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -16,6 +19,9 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScLambDetail extends BaseEntity { private static final long serialVersionUID = 1L; @@ -84,159 +90,5 @@ public class ScLambDetail extends BaseEntity return id; } - public void setLambingRecordId(Long lambingRecordId) - { - this.lambingRecordId = lambingRecordId; - } - public Long getLambingRecordId() - { - return lambingRecordId; - } - - public void setLambEarNumber(String lambEarNumber) - { - this.lambEarNumber = lambEarNumber; - } - - public String getLambEarNumber() - { - return lambEarNumber; - } - - public void setLambBreed(Integer lambBreed) // 改为Integer类型 - { - this.lambBreed = lambBreed; - } - - public Integer getLambBreed() // 改为Integer类型 - { - return lambBreed; - } - - public void setGender(Integer gender) - { - this.gender = gender; - } - - public Integer getGender() - { - return gender; - } - - public void setBirthWeight(BigDecimal birthWeight) - { - this.birthWeight = birthWeight; - } - - public BigDecimal getBirthWeight() - { - return birthWeight; - } - - public void setIsRetained(Boolean isRetained) - { - this.isRetained = isRetained; - } - - public Boolean getIsRetained() - { - return isRetained; - } - - public void setLineage(String lineage) - { - this.lineage = lineage; - } - - public String getLineage() - { - return lineage; - } - - public void setBirthday(Date birthday) - { - this.birthday = birthday; - } - - public Date getBirthday() - { - return birthday; - } - - public List getLambDetails() - { - return lambDetails; - } - - public void setLambDetails(List lambDetails) - { - this.lambDetails = lambDetails; - } - - public Long getMotherId() - { - return motherId; - } - - public void setMotherId(Long motherId) - { - this.motherId = motherId; - } - - public Long getFatherId() - { - return fatherId; - } - - public void setFatherId(Long fatherId) - { - this.fatherId = fatherId; - } - - public Integer getRanchId() - { - return ranchId; - } - - public void setRanchId(Integer ranchId) - { - this.ranchId = ranchId; - } - - public Integer getSheepfoldId() - { - return sheepfoldId; - } - - public void setSheepfoldId(Integer sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Integer getParity() - { - return parity; - } - - public void setParity(Integer parity) - { - this.parity = parity; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("lambingRecordId", getLambingRecordId()) - .append("lambEarNumber", getLambEarNumber()) - .append("lambBreed", getLambBreed()) - .append("gender", getGender()) - .append("birthWeight", getBirthWeight()) - .append("isRetained", getIsRetained()) - .append("lineage", getLineage()) - .append("birthday", getBirthday()) - .append("createTime", getCreateTime()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java index 895ad55..bfb27a0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScLambingRecord.java @@ -385,17 +385,3 @@ public class ScLambingRecord extends BaseEntity } } -/** - * 羊只羔羊信息对象（用于产羔详情显示） - */ -class SheepLambInfo { - private String lambEarNumber; // 羔羊耳号 - private String lambBreed; // 羔羊品种 - private Integer gender; // 性别 - private Double birthWeight; // 出生重量 - private Boolean isRetained; // 是否留养 - private String lineage; // 家系 - private Date birthday; // 生日 - - // getter和setter方法... -} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java index 558d1a8..f02d38f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScPregnancyRecord.java @@ -1,7 +1,11 @@ package com.zhyc.module.produce.breed.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -9,17 +13,28 @@ import com.zhyc.common.core.domain.BaseEntity; /** * 孕检记录对象 sc_pregnancy_record - * - * @author ruoyi - * @date 2025-07-17 + * + * @author zhyc + * @date 2025-01-21 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScPregnancyRecord extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** 主键ID */ private Long id; + /** 羊只ID */ + @Excel(name = "羊只ID") + private Long sheepId; + + /** 耳号 */ + @Excel(name = "耳号") + private String manageTags; + /** 孕检日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "孕检日期", width = 30, dateFormat = "yyyy-MM-dd") @@ -29,89 +44,79 @@ public class ScPregnancyRecord extends BaseEntity @Excel(name = "孕检结果") private String result; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long number; + /** 胎儿数量 */ + @Excel(name = "胎儿数量") + private Integer fetusCount; /** 技术员 */ @Excel(name = "技术员") private String technician; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long way; + /** 孕检方式 */ + @Excel(name = "孕检方式") + private String way; - public void setId(Long id) - { - this.id = id; - } + /** 备注 */ + @Excel(name = "备注") + private String remark; - public Long getId() - { - return id; - } + /** 是否删除 */ + private Integer isDelete; - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } + // 关联查询字段 + /** 品种 */ + @Excel(name = "品种") + private String variety; - public Date getDatetime() - { - return datetime; - } + /** 月龄 */ + @Excel(name = "月龄") + private Long monthAge; - public void setResult(String result) - { - this.result = result; - } + /** 胎次 */ + @Excel(name = "胎次") + private Integer parity; - public String getResult() - { - return result; - } + /** 配次 */ + @Excel(name = "配次") + private Integer matingCounts; - public void setNumber(Long number) - { - this.number = number; - } + /** 当前羊舍 */ + @Excel(name = "当前羊舍") + private String sheepfoldName; - public Long getNumber() - { - return number; - } + /** 繁育状态 */ + @Excel(name = "繁育状态") + private String breedStatus; - public void setTechnician(String technician) - { - this.technician = technician; - } + /** 配种公羊耳号 */ + @Excel(name = "配种公羊") + private String fatherManageTags; - public String getTechnician() - { - return technician; - } + /** 配种公羊品种 */ + @Excel(name = "配种公羊品种") + private String fatherVariety; - public void setWay(Long way) - { - this.way = way; - } + /** 配种类型 */ + @Excel(name = "配种类型") + private String matingTypeName; - public Long getWay() - { - return way; - } + /** 配种日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "配种日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date matingDate; - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("result", getResult()) - .append("number", getNumber()) - .append("technician", getTechnician()) - .append("way", getWay()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } -} + /** 预产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "预产日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date expectedDate; + + /** 上次事件日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上次事件日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastEventDate; + + /** 所在牧场 */ + @Excel(name = "所在牧场") + private String ranchName; + +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java index 06ca783..79c70ce 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/ScWeanRecord.java @@ -5,6 +5,9 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +17,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author zhyc * @date 2024-01-01 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ScWeanRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -90,173 +96,5 @@ public class ScWeanRecord extends BaseEntity { @Excel(name = "繁育状态") private String breedingStatus; - public void setId(Long id) { - this.id = id; - } - public Long getId() { - return id; - } - - public void setSheepId(Long sheepId) { - this.sheepId = sheepId; - } - - public Long getSheepId() { - return sheepId; - } - - public void setDatetime(Date datetime) { - this.datetime = datetime; - } - - public Date getDatetime() { - return datetime; - } - - public void setWeight(BigDecimal weight) { - this.weight = weight; - } - - public BigDecimal getWeight() { - return weight; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatus() { - return status; - } - - public void setTechnician(String technician) { - this.technician = technician; - } - - public String getTechnician() { - return technician; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getComment() { - return comment; - } - - public void setElectronicTags(String electronicTags) { - this.electronicTags = electronicTags; - } - - public String getElectronicTags() { - return electronicTags; - } - - public void setEarNumber(String earNumber) { - this.earNumber = earNumber; - } - - public String getEarNumber() { - return earNumber; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public String getBreed() { - return breed; - } - - public void setEventType(String eventType) { - this.eventType = eventType; - } - - public String getEventType() { - return eventType; - } - - public void setGender(String gender) { - this.gender = gender; - } - - public String getGender() { - return gender; - } - - public void setFatherNumber(String fatherNumber) { - this.fatherNumber = fatherNumber; - } - - public String getFatherNumber() { - return fatherNumber; - } - - public void setMotherNumber(String motherNumber) { - this.motherNumber = motherNumber; - } - - public String getMotherNumber() { - return motherNumber; - } - - public void setMonthAge(Integer monthAge) { - this.monthAge = monthAge; - } - - public Integer getMonthAge() { - return monthAge; - } - - public void setBirthWeight(BigDecimal birthWeight) { - this.birthWeight = birthWeight; - } - - public BigDecimal getBirthWeight() { - return birthWeight; - } - - public void setSheepPen(String sheepPen) { - this.sheepPen = sheepPen; - } - - public String getSheepPen() { - return sheepPen; - } - - public void setBreedingStatus(String breedingStatus) { - this.breedingStatus = breedingStatus; - } - - public String getBreedingStatus() { - return breedingStatus; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("datetime", getDatetime()) - .append("weight", getWeight()) - .append("status", getStatus()) - .append("technician", getTechnician()) - .append("comment", getComment()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("electronicTags", getElectronicTags()) - .append("earNumber", getEarNumber()) - .append("breed", getBreed()) - .append("eventType", getEventType()) - .append("gender", getGender()) - .append("fatherNumber", getFatherNumber()) - .append("motherNumber", getMotherNumber()) - .append("monthAge", getMonthAge()) - .append("birthWeight", getBirthWeight()) - .append("sheepPen", getSheepPen()) - .append("breedingStatus", getBreedingStatus()) - .toString(); - } } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java new file mode 100644 index 0000000..e8b79f7 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/domain/SheepLambInfo.java @@ -0,0 +1,25 @@ +package com.zhyc.module.produce.breed.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 羊只羔羊信息对象（用于产羔详情显示） + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +class SheepLambInfo { + private String lambEarNumber; // 羔羊耳号 + private String lambBreed; // 羔羊品种 + private Integer gender; // 性别 + private Double birthWeight; // 出生重量 + private Boolean isRetained; // 是否留养 + private String lineage; // 家系 + private Date birthday; // 生日 + + +} diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/RawSpermRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/RawSpermRecordMapper.java new file mode 100644 index 0000000..a3b9ef8 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/RawSpermRecordMapper.java @@ -0,0 +1,69 @@ +package com.zhyc.module.produce.breed.mapper; + +import java.util.List; +import com.zhyc.module.produce.breed.domain.RawSpermRecord; + +/** + * 采精记录Mapper接口 + * + * @author ruoyi + * @date 2025-07-23 + */ +public interface RawSpermRecordMapper +{ + /** + * 查询采精记录 + * + * @param id 采精记录主键 + * @return 采精记录 + */ + public RawSpermRecord selectRawSpermRecordById(Long id); + + /** + * 查询采精记录列表 + * + * @param rawSpermRecord 采精记录 + * @return 采精记录集合 + */ + public List selectRawSpermRecordList(RawSpermRecord rawSpermRecord); + + /** + * 新增采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + public int insertRawSpermRecord(RawSpermRecord rawSpermRecord); + + /** + * 修改采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + public int updateRawSpermRecord(RawSpermRecord rawSpermRecord); + + /** + * 删除采精记录 + * + * @param id 采精记录主键 + * @return 结果 + */ + public int deleteRawSpermRecordById(Long id); + + /** + * 批量删除采精记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRawSpermRecordByIds(Long[] ids); + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 耳号 + * @return 羊只ID + */ + public Long selectSheepIdByManageTags(String manageTags); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java index a578784..00eaf16 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanGenerateMapper.java @@ -2,6 +2,8 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import java.util.Map; + +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhyc.module.produce.breed.domain.ScBreedPlanGenerate; import com.zhyc.module.produce.breed.domain.ScBreedPlan; @@ -12,6 +14,7 @@ import com.zhyc.module.produce.breed.domain.ScBreedPlan; * @author ruoyi * @date 2025-07-16 */ +@Mapper public interface ScBreedPlanGenerateMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java index f2a9c66..9699efb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedPlanMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import com.zhyc.module.produce.breed.domain.ScBreedPlan; +import org.apache.ibatis.annotations.Mapper; /** * 配种计划Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.produce.breed.domain.ScBreedPlan; * @author ruoyi * @date 2025-07-16 */ +@Mapper public interface ScBreedPlanMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedRecordMapper.java new file mode 100644 index 0000000..ee67b34 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScBreedRecordMapper.java @@ -0,0 +1,94 @@ +package com.zhyc.module.produce.breed.mapper; + +import java.util.List; +import java.util.Map; +import com.zhyc.module.produce.breed.domain.ScBreedRecord; + +/** + * 配种记录Mapper接口 + * + * @author ruoyi + * @date 2025-07-23 + */ +public interface ScBreedRecordMapper +{ + /** + * 查询配种记录 + * + * @param id 配种记录主键 + * @return 配种记录 + */ + public ScBreedRecord selectScBreedRecordById(Long id); + + /** + * 查询配种记录列表 + * + * @param scBreedRecord 配种记录 + * @return 配种记录集合 + */ + public List selectScBreedRecordList(ScBreedRecord scBreedRecord); + + /** + * 新增配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + public int insertScBreedRecord(ScBreedRecord scBreedRecord); + + /** + * 修改配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + public int updateScBreedRecord(ScBreedRecord scBreedRecord); + + /** + * 删除配种记录 + * + * @param id 配种记录主键 + * @return 结果 + */ + public int deleteScBreedRecordById(Long id); + + /** + * 批量删除配种记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteScBreedRecordByIds(Long[] ids); + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + public Long getSheepIdByManageTags(String manageTags); + + /** + * 根据公羊耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + public Long getRamIdByManageTags(String manageTags); + + /** + * 根据耳号查询羊只详细信息 + * + * @param manageTags 管理耳号 + * @return 羊只信息 + */ + public Map getSheepInfoByTags(String manageTags); + + /** + * 根据母羊耳号获取配种计划信息 + * + * @param manageTags 母羊管理耳号 + * @return 配种计划信息 + */ + public Map getBreedPlanByEweTags(String manageTags); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java index daba529..742dbe7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScDryMilkMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import com.zhyc.module.produce.breed.domain.ScDryMilk; +import org.apache.ibatis.annotations.Mapper; /** * 干奶记录Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.produce.breed.domain.ScDryMilk; * @author ruoyi * @date 2025-07-15 */ +@Mapper public interface ScDryMilkMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java index 7719104..85edef3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScLambingRecordMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import com.zhyc.module.produce.breed.domain.ScLambingRecord; import com.zhyc.module.produce.breed.domain.ScLambDetail; +import org.apache.ibatis.annotations.Mapper; /** * 产羔记录Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.produce.breed.domain.ScLambDetail; * @author ruoyi * @date 2025-07-11 */ +@Mapper public interface ScLambingRecordMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScPregnancyRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScPregnancyRecordMapper.java index c0562e1..4962992 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScPregnancyRecordMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScPregnancyRecordMapper.java @@ -1,20 +1,20 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; - +import java.util.Map; import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; /** * 孕检记录Mapper接口 - * - * @author ruoyi - * @date 2025-07-17 + * + * @author zhyc + * @date 2025-01-21 */ -public interface ScPregnancyRecordMapper +public interface ScPregnancyRecordMapper { /** * 查询孕检记录 - * + * * @param id 孕检记录主键 * @return 孕检记录 */ @@ -22,7 +22,7 @@ public interface ScPregnancyRecordMapper /** * 查询孕检记录列表 - * + * * @param scPregnancyRecord 孕检记录 * @return 孕检记录集合 */ @@ -30,7 +30,7 @@ public interface ScPregnancyRecordMapper /** * 新增孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @@ -38,7 +38,7 @@ public interface ScPregnancyRecordMapper /** * 修改孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @@ -46,7 +46,7 @@ public interface ScPregnancyRecordMapper /** * 删除孕检记录 - * + * * @param id 孕检记录主键 * @return 结果 */ @@ -54,9 +54,25 @@ public interface ScPregnancyRecordMapper /** * 批量删除孕检记录 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteScPregnancyRecordByIds(Long[] ids); -} + + /** + * 根据耳号查询羊只信息 + * + * @param manageTags 耳号 + * @return 羊只信息 + */ + public Map selectSheepByManageTags(String manageTags); + + /** + * 更新羊只基础表中的孕检相关字段 + * + * @param params 更新参数 + * @return 结果 + */ + public int updateSheepPregnancyInfo(Map params); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java index 599621f..cb74588 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/mapper/ScWeanRecordMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.breed.mapper; import java.util.List; import com.zhyc.module.produce.breed.domain.ScWeanRecord; +import org.apache.ibatis.annotations.Mapper; /** * 断奶记录Mapper接口 @@ -9,6 +10,7 @@ import com.zhyc.module.produce.breed.domain.ScWeanRecord; * @author zhyc * @date 2024-01-01 */ +@Mapper public interface ScWeanRecordMapper { /** * 查询断奶记录 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IRawSpermRecordService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IRawSpermRecordService.java new file mode 100644 index 0000000..a9b29f2 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IRawSpermRecordService.java @@ -0,0 +1,69 @@ +package com.zhyc.module.produce.breed.service; + +import java.util.List; +import com.zhyc.module.produce.breed.domain.RawSpermRecord; + +/** + * 采精记录Service接口 + * + * @author ruoyi + * @date 2025-07-23 + */ +public interface IRawSpermRecordService +{ + /** + * 查询采精记录 + * + * @param id 采精记录主键 + * @return 采精记录 + */ + public RawSpermRecord selectRawSpermRecordById(Long id); + + /** + * 查询采精记录列表 + * + * @param rawSpermRecord 采精记录 + * @return 采精记录集合 + */ + public List selectRawSpermRecordList(RawSpermRecord rawSpermRecord); + + /** + * 新增采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + public int insertRawSpermRecord(RawSpermRecord rawSpermRecord); + + /** + * 修改采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + public int updateRawSpermRecord(RawSpermRecord rawSpermRecord); + + /** + * 批量删除采精记录 + * + * @param ids 需要删除的采精记录主键集合 + * @return 结果 + */ + public int deleteRawSpermRecordByIds(Long[] ids); + + /** + * 删除采精记录信息 + * + * @param id 采精记录主键 + * @return 结果 + */ + public int deleteRawSpermRecordById(Long id); + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 耳号 + * @return 羊只ID + */ + public Long getSheepIdByManageTags(String manageTags); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedRecordService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedRecordService.java new file mode 100644 index 0000000..7f71704 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScBreedRecordService.java @@ -0,0 +1,94 @@ +package com.zhyc.module.produce.breed.service; + +import java.util.List; +import java.util.Map; +import com.zhyc.module.produce.breed.domain.ScBreedRecord; + +/** + * 配种记录Service接口 + * + * @author ruoyi + * @date 2025-07-23 + */ +public interface IScBreedRecordService +{ + /** + * 查询配种记录 + * + * @param id 配种记录主键 + * @return 配种记录 + */ + public ScBreedRecord selectScBreedRecordById(Long id); + + /** + * 查询配种记录列表 + * + * @param scBreedRecord 配种记录 + * @return 配种记录集合 + */ + public List selectScBreedRecordList(ScBreedRecord scBreedRecord); + + /** + * 新增配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + public int insertScBreedRecord(ScBreedRecord scBreedRecord); + + /** + * 修改配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + public int updateScBreedRecord(ScBreedRecord scBreedRecord); + + /** + * 批量删除配种记录 + * + * @param ids 需要删除的配种记录主键集合 + * @return 结果 + */ + public int deleteScBreedRecordByIds(Long[] ids); + + /** + * 删除配种记录信息 + * + * @param id 配种记录主键 + * @return 结果 + */ + public int deleteScBreedRecordById(Long id); + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + public Long getSheepIdByTags(String manageTags); + + /** + * 根据公羊耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + public Long getRamIdByTags(String manageTags); + + /** + * 根据耳号查询羊只详细信息 + * + * @param manageTags 管理耳号 + * @return 羊只信息 + */ + public Map getSheepInfoByTags(String manageTags); + + /** + * 根据母羊耳号获取配种计划信息 + * + * @param manageTags 母羊管理耳号 + * @return 配种计划信息 + */ + public Map getBreedPlanByEweTags(String manageTags); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScPregnancyRecordService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScPregnancyRecordService.java index cb34288..bc0d2e4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScPregnancyRecordService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/IScPregnancyRecordService.java @@ -1,21 +1,20 @@ package com.zhyc.module.produce.breed.service; import java.util.List; - +import java.util.Map; import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; - /** * 孕检记录Service接口 - * - * @author ruoyi - * @date 2025-07-17 + * + * @author zhyc + * @date 2025-01-21 */ -public interface IScPregnancyRecordService +public interface IScPregnancyRecordService { /** * 查询孕检记录 - * + * * @param id 孕检记录主键 * @return 孕检记录 */ @@ -23,7 +22,7 @@ public interface IScPregnancyRecordService /** * 查询孕检记录列表 - * + * * @param scPregnancyRecord 孕检记录 * @return 孕检记录集合 */ @@ -31,7 +30,7 @@ public interface IScPregnancyRecordService /** * 新增孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @@ -39,7 +38,7 @@ public interface IScPregnancyRecordService /** * 修改孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @@ -47,7 +46,7 @@ public interface IScPregnancyRecordService /** * 批量删除孕检记录 - * + * * @param ids 需要删除的孕检记录主键集合 * @return 结果 */ @@ -55,9 +54,17 @@ public interface IScPregnancyRecordService /** * 删除孕检记录信息 - * + * * @param id 孕检记录主键 * @return 结果 */ public int deleteScPregnancyRecordById(Long id); -} + + /** + * 根据耳号查询羊只信息 + * + * @param manageTags 耳号 + * @return 羊只信息 + */ + public Map getSheepByManageTags(String manageTags); +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/RawSpermRecordServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/RawSpermRecordServiceImpl.java new file mode 100644 index 0000000..f925b77 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/RawSpermRecordServiceImpl.java @@ -0,0 +1,120 @@ +package com.zhyc.module.produce.breed.service.impl; + +import java.util.List; +import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zhyc.module.produce.breed.mapper.RawSpermRecordMapper; +import com.zhyc.module.produce.breed.domain.RawSpermRecord; +import com.zhyc.module.produce.breed.service.IRawSpermRecordService; + +/** + * 采精记录Service业务层处理 + * + * @author ruoyi + * @date 2025-07-23 + */ +@Service +public class RawSpermRecordServiceImpl implements IRawSpermRecordService +{ + @Autowired + private RawSpermRecordMapper rawSpermRecordMapper; + + /** + * 查询采精记录 + * + * @param id 采精记录主键 + * @return 采精记录 + */ + @Override + public RawSpermRecord selectRawSpermRecordById(Long id) + { + return rawSpermRecordMapper.selectRawSpermRecordById(id); + } + + /** + * 查询采精记录列表 + * + * @param rawSpermRecord 采精记录 + * @return 采精记录 + */ + @Override + public List selectRawSpermRecordList(RawSpermRecord rawSpermRecord) + { + return rawSpermRecordMapper.selectRawSpermRecordList(rawSpermRecord); + } + + /** + * 新增采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + @Override + public int insertRawSpermRecord(RawSpermRecord rawSpermRecord) + { + // 如果传入的是耳号，需要先根据耳号查询羊只ID + if (StringUtils.isNotEmpty(rawSpermRecord.getManageTags()) && rawSpermRecord.getSheepId() == null) { + Long sheepId = getSheepIdByManageTags(rawSpermRecord.getManageTags()); + rawSpermRecord.setSheepId(sheepId); + } + + rawSpermRecord.setCreateTime(DateUtils.getNowDate()); + return rawSpermRecordMapper.insertRawSpermRecord(rawSpermRecord); + } + + /** + * 修改采精记录 + * + * @param rawSpermRecord 采精记录 + * @return 结果 + */ + @Override + public int updateRawSpermRecord(RawSpermRecord rawSpermRecord) + { + // 如果传入的是耳号，需要先根据耳号查询羊只ID + if (StringUtils.isNotEmpty(rawSpermRecord.getManageTags()) && rawSpermRecord.getSheepId() == null) { + Long sheepId = getSheepIdByManageTags(rawSpermRecord.getManageTags()); + rawSpermRecord.setSheepId(sheepId); + } + + return rawSpermRecordMapper.updateRawSpermRecord(rawSpermRecord); + } + + /** + * 批量删除采精记录 + * + * @param ids 需要删除的采精记录主键 + * @return 结果 + */ + @Override + public int deleteRawSpermRecordByIds(Long[] ids) + { + return rawSpermRecordMapper.deleteRawSpermRecordByIds(ids); + } + + /** + * 删除采精记录信息 + * + * @param id 采精记录主键 + * @return 结果 + */ + @Override + public int deleteRawSpermRecordById(Long id) + { + return rawSpermRecordMapper.deleteRawSpermRecordById(id); + } + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 耳号 + * @return 羊只ID + */ + @Override + public Long getSheepIdByManageTags(String manageTags) + { + return rawSpermRecordMapper.selectSheepIdByManageTags(manageTags); + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedRecordServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedRecordServiceImpl.java new file mode 100644 index 0000000..61ab012 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScBreedRecordServiceImpl.java @@ -0,0 +1,164 @@ +package com.zhyc.module.produce.breed.service.impl; + +import java.util.List; +import java.util.Map; +import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zhyc.module.produce.breed.mapper.ScBreedRecordMapper; +import com.zhyc.module.produce.breed.domain.ScBreedRecord; +import com.zhyc.module.produce.breed.service.IScBreedRecordService; + +/** + * 配种记录Service业务层处理 + * + * @author ruoyi + * @date 2025-07-23 + */ +@Service +public class ScBreedRecordServiceImpl implements IScBreedRecordService +{ + @Autowired + private ScBreedRecordMapper scBreedRecordMapper; + + /** + * 查询配种记录 + * + * @param id 配种记录主键 + * @return 配种记录 + */ + @Override + public ScBreedRecord selectScBreedRecordById(Long id) + { + return scBreedRecordMapper.selectScBreedRecordById(id); + } + + /** + * 查询配种记录列表 + * + * @param scBreedRecord 配种记录 + * @return 配种记录 + */ + @Override + public List selectScBreedRecordList(ScBreedRecord scBreedRecord) + { + // 如果查询条件中有耳号，需要先转换为ID + if (StringUtils.isNotEmpty(scBreedRecord.getEweManageTags())) + { + Long eweId = scBreedRecordMapper.getSheepIdByManageTags(scBreedRecord.getEweManageTags()); + if (eweId != null) + { + scBreedRecord.setEweId(eweId.toString()); + } + } + + if (StringUtils.isNotEmpty(scBreedRecord.getRamManageTags())) + { + Long ramId = scBreedRecordMapper.getRamIdByManageTags(scBreedRecord.getRamManageTags()); + if (ramId != null) + { + scBreedRecord.setRamId(ramId.toString()); + } + } + + return scBreedRecordMapper.selectScBreedRecordList(scBreedRecord); + } + + /** + * 新增配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + @Override + public int insertScBreedRecord(ScBreedRecord scBreedRecord) + { + scBreedRecord.setCreateTime(DateUtils.getNowDate()); + return scBreedRecordMapper.insertScBreedRecord(scBreedRecord); + } + + /** + * 修改配种记录 + * + * @param scBreedRecord 配种记录 + * @return 结果 + */ + @Override + public int updateScBreedRecord(ScBreedRecord scBreedRecord) + { + return scBreedRecordMapper.updateScBreedRecord(scBreedRecord); + } + + /** + * 批量删除配种记录 + * + * @param ids 需要删除的配种记录主键 + * @return 结果 + */ + @Override + public int deleteScBreedRecordByIds(Long[] ids) + { + return scBreedRecordMapper.deleteScBreedRecordByIds(ids); + } + + /** + * 删除配种记录信息 + * + * @param id 配种记录主键 + * @return 结果 + */ + @Override + public int deleteScBreedRecordById(Long id) + { + return scBreedRecordMapper.deleteScBreedRecordById(id); + } + + /** + * 根据耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + @Override + public Long getSheepIdByTags(String manageTags) + { + return scBreedRecordMapper.getSheepIdByManageTags(manageTags); + } + + /** + * 根据公羊耳号查询羊只ID + * + * @param manageTags 管理耳号 + * @return 羊只ID + */ + @Override + public Long getRamIdByTags(String manageTags) + { + return scBreedRecordMapper.getRamIdByManageTags(manageTags); + } + + /** + * 根据耳号查询羊只详细信息 + * + * @param manageTags 管理耳号 + * @return 羊只信息 + */ + @Override + public Map getSheepInfoByTags(String manageTags) + { + return scBreedRecordMapper.getSheepInfoByTags(manageTags); + } + + /** + * 根据母羊耳号获取配种计划信息 + * + * @param manageTags 母羊管理耳号 + * @return 配种计划信息 + */ + @Override + public Map getBreedPlanByEweTags(String manageTags) + { + return scBreedRecordMapper.getBreedPlanByEweTags(manageTags); + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java index 7f50d65..dde2c3d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/breed/service/impl/ScPregnancyRecordServiceImpl.java @@ -1,19 +1,24 @@ package com.zhyc.module.produce.breed.service.impl; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Date; +import java.util.Calendar; + import com.zhyc.common.utils.DateUtils; -import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; -import com.zhyc.module.produce.breed.mapper.ScPregnancyRecordMapper; -import com.zhyc.module.produce.breed.service.IScPregnancyRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import org.springframework.transaction.annotation.Transactional; +import com.zhyc.module.produce.breed.mapper.ScPregnancyRecordMapper; +import com.zhyc.module.produce.breed.domain.ScPregnancyRecord; +import com.zhyc.module.produce.breed.service.IScPregnancyRecordService; /** * 孕检记录Service业务层处理 - * - * @author ruoyi - * @date 2025-07-17 + * + * @author zhyc + * @date 2025-01-21 */ @Service public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService @@ -23,7 +28,7 @@ public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService /** * 查询孕检记录 - * + * * @param id 孕检记录主键 * @return 孕检记录 */ @@ -35,7 +40,7 @@ public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService /** * 查询孕检记录列表 - * + * * @param scPregnancyRecord 孕检记录 * @return 孕检记录 */ @@ -47,32 +52,68 @@ public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService /** * 新增孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @Override + @Transactional public int insertScPregnancyRecord(ScPregnancyRecord scPregnancyRecord) { scPregnancyRecord.setCreateTime(DateUtils.getNowDate()); - return scPregnancyRecordMapper.insertScPregnancyRecord(scPregnancyRecord); + scPregnancyRecord.setIsDelete(0); + + // 根据耳号获取羊只ID + if (scPregnancyRecord.getManageTags() != null) { + Map sheepInfo = scPregnancyRecordMapper.selectSheepByManageTags(scPregnancyRecord.getManageTags()); + if (sheepInfo != null && sheepInfo.get("id") != null) { + scPregnancyRecord.setSheepId(Long.valueOf(sheepInfo.get("id").toString())); + } + } + + int result = scPregnancyRecordMapper.insertScPregnancyRecord(scPregnancyRecord); + + // 如果孕检结果为怀孕，更新羊只基础表相关字段 + if ("怀孕".equals(scPregnancyRecord.getResult()) && scPregnancyRecord.getSheepId() != null) { + updateSheepPregnancyStatus(scPregnancyRecord); + } + + return result; } /** * 修改孕检记录 - * + * * @param scPregnancyRecord 孕检记录 * @return 结果 */ @Override + @Transactional public int updateScPregnancyRecord(ScPregnancyRecord scPregnancyRecord) { - return scPregnancyRecordMapper.updateScPregnancyRecord(scPregnancyRecord); + scPregnancyRecord.setUpdateTime(DateUtils.getNowDate()); + + // 根据耳号获取羊只ID + if (scPregnancyRecord.getManageTags() != null) { + Map sheepInfo = scPregnancyRecordMapper.selectSheepByManageTags(scPregnancyRecord.getManageTags()); + if (sheepInfo != null && sheepInfo.get("id") != null) { + scPregnancyRecord.setSheepId(Long.valueOf(sheepInfo.get("id").toString())); + } + } + + int result = scPregnancyRecordMapper.updateScPregnancyRecord(scPregnancyRecord); + + // 如果孕检结果为怀孕，更新羊只基础表相关字段 + if ("怀孕".equals(scPregnancyRecord.getResult()) && scPregnancyRecord.getSheepId() != null) { + updateSheepPregnancyStatus(scPregnancyRecord); + } + + return result; } /** * 批量删除孕检记录 - * + * * @param ids 需要删除的孕检记录主键 * @return 结果 */ @@ -84,7 +125,7 @@ public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService /** * 删除孕检记录信息 - * + * * @param id 孕检记录主键 * @return 结果 */ @@ -93,4 +134,46 @@ public class ScPregnancyRecordServiceImpl implements IScPregnancyRecordService { return scPregnancyRecordMapper.deleteScPregnancyRecordById(id); } -} + + /** + * 根据耳号查询羊只信息 + * + * @param manageTags 耳号 + * @return 羊只信息 + */ + @Override + public Map getSheepByManageTags(String manageTags) + { + return scPregnancyRecordMapper.selectSheepByManageTags(manageTags); + } + + /** + * 更新羊只怀孕状态 + * + * @param scPregnancyRecord 孕检记录 + */ + private void updateSheepPregnancyStatus(ScPregnancyRecord scPregnancyRecord) { + Map params = new HashMap<>(); + params.put("sheepId", scPregnancyRecord.getSheepId()); + params.put("pregDate", scPregnancyRecord.getDatetime()); + + // 设置繁育状态为怀孕状态（假设怀孕状态ID为2） + params.put("breedStatusId", 2); + + // 计算预产日期（羊的妊娠期大约150天） + if (scPregnancyRecord.getDatetime() != null) { + Calendar cal = Calendar.getInstance(); + cal.setTime(scPregnancyRecord.getDatetime()); + cal.add(Calendar.DAY_OF_YEAR, 150); + params.put("expectedDate", cal.getTime()); + } + + // 计算怀孕天数 + if (scPregnancyRecord.getDatetime() != null) { + long days = (System.currentTimeMillis() - scPregnancyRecord.getDatetime().getTime()) / (1000 * 60 * 60 * 24); + params.put("gestationDay", (int) days); + } + + scPregnancyRecordMapper.updateSheepPregnancyInfo(params); + } +} \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java index 01cb430..5746adc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; +import org.apache.ibatis.annotations.Mapper; /** * 转群记录Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; * @author ruoyi * @date 2025-07-10 */ +@Mapper public interface ScTransGroupMapper { /** * 查询转群记录 diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java index 7ea9527..8b09e94 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java @@ -3,6 +3,7 @@ package com.zhyc.module.produce.other.mapper; import java.util.List; import com.zhyc.module.produce.other.domain.ScCastrate; +import org.apache.ibatis.annotations.Mapper; /** * 去势Mapper接口 @@ -10,6 +11,7 @@ import com.zhyc.module.produce.other.domain.ScCastrate; * @author ruoyi * @date 2025-07-09 */ +@Mapper public interface ScCastrateMapper { /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java index 5462d20..490ddc4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java @@ -3,7 +3,7 @@ package com.zhyc.module.produce.other.mapper; import java.util.List; import com.zhyc.module.produce.other.domain.ScFixHoof; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; /** * 修蹄Mapper接口 @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; * @author ruoyi * @date 2025-07-10 */ +@Mapper public interface ScFixHoofMapper { /** * 查询修蹄 diff --git a/zhyc-module/src/main/resources/mapper/Breeding_records/ScBreedRecordMapper.xml b/zhyc-module/src/main/resources/mapper/Breeding_records/ScBreedRecordMapper.xml new file mode 100644 index 0000000..4128a7a --- /dev/null +++ b/zhyc-module/src/main/resources/mapper/Breeding_records/ScBreedRecordMapper.xml @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + br.id, + br.sheep_id, + br.ram_id, + br.ewe_id, + br.technician, + br.breed_drugs, + br.create_by, + br.create_time, + -- 母羊信息（从视图获取） + ewe_view.bs_manage_tags as ewe_manage_tags, + ewe_view.variety as ewe_variety, + ewe_view.parity as ewe_parity, + ewe_view.month_age as ewe_month_age, + ewe_view.sheepfold_name as ewe_sheepfold_name, + ewe_view.breed as ewe_breed_status, + ewe_view.controlled as ewe_controlled, + ewe_view.comment as ewe_comment, + ewe_view.dr_ranch as ranch_name, + ewe_view.name as sheep_type, + ewe_view.mating_total as mating_count, + -- 公羊信息（从视图获取） + ram_view.bs_manage_tags as ram_manage_tags, + ram_view.variety as ram_variety, + -- 配种方式（如果视图中没有，设为空或从其他地方获取） + '' as mating_type, + -- 发情后配种时间（小时数） + TIMESTAMPDIFF(HOUR, br.create_time, NOW()) as time_since_planning + from sc_breed_record br + left join sheep_file ewe_view on br.ewe_id = ewe_view.id + left join sheep_file ram_view on br.ram_id = ram_view.id + + + + + + + + + + + + + + + + + + + + insert into sc_breed_record + + sheep_id, + ram_id, + ewe_id, + technician, + breed_drugs, + create_by, + create_time, + + + #{sheepId}, + #{ramId}, + #{eweId}, + #{technician}, + #{breedDrugs}, + #{createBy}, + #{createTime}, + + + + + update sc_breed_record + + sheep_id = #{sheepId}, + ram_id = #{ramId}, + ewe_id = #{eweId}, + technician = #{technician}, + breed_drugs = #{breedDrugs}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from sc_breed_record where id = #{id} + + + + delete from sc_breed_record where id in + + #{id} + + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/Sperm/RawSpermRecordMapper.xml b/zhyc-module/src/main/resources/mapper/Sperm/RawSpermRecordMapper.xml new file mode 100644 index 0000000..727f32c --- /dev/null +++ b/zhyc-module/src/main/resources/mapper/Sperm/RawSpermRecordMapper.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select + rsr.id, + rsr.sheep_id, + sf.bs_manage_tags, + sf.electronic_tags, + sf.month_age, + rsr.pick_date, + rsr.amount, + rsr.density, + rsr.vitallity, + rsr.controlled, + rsr.sexual_status, + rsr.info, + rsr.technician, + rsr.comment, + rsr.create_by, + rsr.create_time + from raw_sperm_record rsr + left join sheep_file sf on rsr.sheep_id = sf.id + + + + + + + + + + + insert into raw_sperm_record + + sheep_id, + pick_date, + amount, + density, + vitallity, + controlled, + sexual_status, + info, + technician, + comment, + create_by, + create_time, + + + #{sheepId}, + #{pickDate}, + #{amount}, + #{density}, + #{vitallity}, + #{controlled}, + #{sexualStatus}, + #{info}, + #{technician}, + #{comment}, + #{createBy}, + #{createTime}, + + + + + update raw_sperm_record + + sheep_id = #{sheepId}, + pick_date = #{pickDate}, + amount = #{amount}, + density = #{density}, + vitallity = #{vitallity}, + controlled = #{controlled}, + sexual_status = #{sexualStatus}, + info = #{info}, + technician = #{technician}, + comment = #{comment}, + create_by = #{createBy}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from raw_sperm_record where id = #{id} + + + + delete from raw_sperm_record where id in + + #{id} + + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml index 3b339c1..fd67991 100644 --- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml @@ -100,4 +100,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index 91cc932..174f8f3 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -7,12 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -23,7 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, datetime, technical, comment, update_by, update_time, create_by, create_time from sw_deworm + select s.id, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity,breed, datetime, technical, s.comment, s.update_by, s.update_time, s.create_by, s.create_time, + bs.manage_tags sheep_no + from sw_deworm s + left join bas_sheep bs on s.sheep_id = bs.id - where id = #{id} + where s.id = #{id} - + insert into sw_deworm - - sheep_id, - usage_id, - variety, - sheep_type, - gender, - month_age, - parity, - datetime, - technical, - comment, - update_by, - update_time, - create_by, - create_time, - - - #{sheepId}, - #{usageId}, - #{variety}, - #{sheepType}, - #{gender}, - #{monthAge}, - #{parity}, - #{datetime}, - #{technical}, - #{comment}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - + (sheep_id, usage_id, variety, sheep_type, gender, month_age, + parity, breed,datetime, technical, comment, + update_by, update_time, create_by, create_time) + values + + (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, + #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, + #{d.technical}, #{d.comment}, + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml index 68cfea1..4063b5e 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml @@ -8,10 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -19,30 +23,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, treat_id, sheep_id, datetime, sheep_type, gender, parity, disease_pid, disease_id, result, begindate, enddate, treat_day, sheepfold_id, create_by, create_time from sw_diagnosis + select sd.id, treat_id, sheep_id, sd.datetime, sheep_type, sd.gender,sd.month_age,sd.parity, disease_pid, disease_id, + result, begindate, enddate, treat_day, sd.sheepfold_id, sd.create_by, sd.create_time, + sf.bs_manage_tags sheep_no,sf.sheepfold_name , + s2.name disease_pname,s1.name disease_name + from sw_diagnosis sd + left join sheep_file sf on sf.id = sd.sheep_id + left join sw_disease s1 on sd.disease_id = s1.id + left join sw_disease s2 on sd.disease_pid = s2.id + diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml index 175d4a7..0269e82 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,7 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, sheepfold_id, datetime, technician, way, usage_id, ratio, comment, update_by, update_time, create_by, create_time from sw_disinfect + select sd.id, sheepfold_id, datetime, technician, way, usage_id, ratio, sd.comment, update_by, update_time, create_by, create_time, + ds.sheepfold_name + from sw_disinfect sd + left join da_sheepfold ds on sd.sheepfold_id = ds.id - where id = #{id} + where sd.id = #{id} insert into sw_disinfect - - sheepfold_id, - datetime, - technician, - way, - usage_id, - ratio, - comment, - update_by, - update_time, - create_by, - create_time, - - - #{sheepfoldId}, - #{datetime}, - #{technician}, - #{way}, - #{usageId}, - #{ratio}, - #{comment}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - + (sheepfold_id, datetime, technician, way, usage_id, ratio, comment, update_by, update_time, create_by, create_time) + values + + (#{d.sheepfoldId}, #{d.datetime}, #{d.technician}, #{d.way}, + #{d.usageId}, #{d.ratio}, #{d.comment}, + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + @@ -86,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by = #{createBy}, create_time = #{createTime}, - where id = #{id} + where sd.id = #{id} diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml index 6c5610d..67c9f2d 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml @@ -8,13 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + @@ -24,7 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, datetime, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, sheepfold_id, technical, comment, update_by, update_time, create_by, create_time from sw_health + select s.id, datetime, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity, breed, technical, + s.comment, s.update_by, s.update_time, s.create_by, s.create_time, + bs.manage_tags sheep_no + from sw_health s + left join bas_sheep bs on s.sheep_id = bs.id + - where id = #{id} + where s.id = #{id} insert into sw_health - - datetime, - sheep_id, - usage_id, - variety, - sheep_type, - gender, - month_age, - parity, - sheepfold_id, - technical, - comment, - update_by, - update_time, - create_by, - create_time, - - - #{datetime}, - #{sheepId}, - #{usageId}, - #{variety}, - #{sheepType}, - #{gender}, - #{monthAge}, - #{parity}, - #{sheepfoldId}, - #{technical}, - #{comment}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - + (sheep_id, usage_id, variety, sheep_type, gender, month_age, + parity, breed,datetime, technical, comment, + update_by, update_time, create_by, create_time) + values + + (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, + #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, + #{d.technical}, #{d.comment}, + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + @@ -89,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gender = #{gender}, month_age = #{monthAge}, parity = #{parity}, - sheepfold_id = #{sheepfoldId}, + breed = #{breed}, technical = #{technical}, comment = #{comment}, update_by = #{updateBy}, diff --git a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml index c7c57a0..3a50922 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml @@ -7,24 +7,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + - - select id, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, sheepfold_id, datetime, technical, comment, update_by, update_time, create_by, create_time from sw_immunity + select s.id, datetime, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity, breed, technical, + s.comment, s.update_by, s.update_time, s.create_by, s.create_time, + bs.manage_tags sheep_no + from sw_immunity s + left join bas_sheep bs on s.sheep_id = bs.id - where id = #{id} + where s.id = #{id} insert into sw_immunity - - sheep_id, - usage_id, - variety, - sheep_type, - gender, - month_age, - parity, - sheepfold_id, - datetime, - technical, - comment, - update_by, - update_time, - create_by, - create_time, - - - #{sheepId}, - #{usageId}, - #{variety}, - #{sheepType}, - #{gender}, - #{monthAge}, - #{parity}, - #{sheepfoldId}, - #{datetime}, - #{technical}, - #{comment}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - + (sheep_id, usage_id, variety, sheep_type, gender, month_age, + parity, breed,datetime, technical, comment, + update_by, update_time, create_by, create_time) + values + + (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, + #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, + #{d.technical}, #{d.comment}, + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + @@ -90,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gender = #{gender}, month_age = #{monthAge}, parity = #{parity}, - sheepfold_id = #{sheepfoldId}, + breed = #{breed}, datetime = #{datetime}, technical = #{technical}, comment = #{comment}, diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml index 9e03b7f..ee496ad 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -33,10 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t.id, diag_id, sheep_id, variety, sheep_type, month_age, t.gender, t.parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id, t.comment, t.update_by, t.update_time, t.create_by, t.create_time, bs.manage_tags, - sd.name disease_name + sd.name disease_name, + sd2.name disease_pname from sw_treatment t left join bas_sheep bs on t.sheep_id = bs.id left join sw_disease sd on t.disease_id = sd.id + left join sw_disease sd2 on t.disease_pid = sd2.id - - and datetime = #{datetime} - and result = #{result} - and number = #{number} - and technician = #{technician} - and way = #{way} + + pr.is_delete = 0 + + + + and sf.bs_manage_tags in + + #{tag} + + + + and sf.bs_manage_tags like concat('%', #{manageTags}, '%') + + + + and pr.datetime = #{datetime} + and pr.result = #{result} + and pr.technician like concat('%', #{technician}, '%') + and pr.way = #{way} + order by pr.create_time desc - + + + + insert into sc_pregnancy_record + sheep_id, datetime, result, - number, + fetus_count, technician, way, + remark, create_by, create_time, - + is_delete + + #{sheepId}, #{datetime}, #{result}, - #{number}, + #{fetusCount}, #{technician}, #{way}, + #{remark}, #{createBy}, #{createTime}, - + 0 + @@ -62,23 +149,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" datetime = #{datetime}, result = #{result}, - number = #{number}, + fetus_count = #{fetusCount}, technician = #{technician}, way = #{way}, - create_by = #{createBy}, - create_time = #{createTime}, + remark = #{remark}, + create_by = #{updateBy}, + create_time = #{updateTime}, where id = #{id} - - delete from sc_pregnancy_record where id = #{id} - + + update sc_pregnancy_record set is_delete = 1 where id = #{id} + - - delete from sc_pregnancy_record where id in + + update sc_pregnancy_record set is_delete = 1 where id in #{id} - + + + + + update bas_sheep + + preg_date = #{pregDate}, + breed_status_id = #{breedStatusId}, + expected_date = #{expectedDate}, + gestation_day = #{gestationDay}, + create_time = now() + + where id = #{sheepId} + \ No newline at end of file