Merge remote-tracking branch 'origin/main'

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java

@@ -1,11 +1,16 @@
 package com.zhyc.module.base.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zhyc.module.base.domain.BasSheep;
+import com.zhyc.module.base.domain.BasSheepVariety;
 import com.zhyc.module.base.mapper.BasSheepMapper;
 import com.zhyc.module.base.service.IBasSheepService;
+import com.zhyc.module.base.service.IBasSheepVarietyService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,20 +29,19 @@ import com.zhyc.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/sheep/sheep")
-public class BasSheepController extends BaseController
+public class BasSheepController extends BaseController {
-{
     @Autowired
     private IBasSheepService basSheepService;
 
     @Autowired
-    private BasSheepMapper basSheepMapper;
+    private IBasSheepVarietyService basSheepVarietyService;
+
     /**
      * 查询羊只基本信息列表
      */
     @PreAuthorize("@ss.hasPermi('sheep:sheep:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BasSheep basSheep)
+    public TableDataInfo list(BasSheep basSheep) {
-    {
         startPage();
         List<BasSheep> list = basSheepService.selectBasSheepList(basSheep);
         return getDataTable(list);
@@ -49,8 +53,7 @@ public class BasSheepController extends BaseController
     @PreAuthorize("@ss.hasPermi('sheep:sheep:export')")
     @Log(title = "羊只基本信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BasSheep basSheep)
+    public void export(HttpServletResponse response, BasSheep basSheep) {
-    {
         List<BasSheep> list = basSheepService.selectBasSheepList(basSheep);
         ExcelUtil<BasSheep> util = new ExcelUtil<BasSheep>(BasSheep.class);
         util.exportExcel(response, list, "羊只基本信息数据");
@@ -61,8 +64,7 @@ public class BasSheepController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sheep:sheep:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
-    {
         return success(basSheepService.selectBasSheepById(id));
     }
 
@@ -72,8 +74,7 @@ public class BasSheepController extends BaseController
     @PreAuthorize("@ss.hasPermi('sheep:sheep:add')")
     @Log(title = "羊只基本信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BasSheep basSheep)
+    public AjaxResult add(@RequestBody BasSheep basSheep) {
-    {
         return toAjax(basSheepService.insertBasSheep(basSheep));
     }
 
@@ -83,8 +84,7 @@ public class BasSheepController extends BaseController
     @PreAuthorize("@ss.hasPermi('sheep:sheep:edit')")
     @Log(title = "羊只基本信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BasSheep basSheep)
+    public AjaxResult edit(@RequestBody BasSheep basSheep) {
-    {
         return toAjax(basSheepService.updateBasSheep(basSheep));
     }
 
@@ -93,19 +93,112 @@ public class BasSheepController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sheep:sheep:remove')")
     @Log(title = "羊只基本信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable Long[] ids) {
-    {
         return toAjax(basSheepService.deleteBasSheepByIds(ids));
     }
 
-
+    /**
+     * 根据耳号查询
+     */
     @GetMapping("/byManageTags/{manageTags}")
-    public AjaxResult byManageTags(@PathVariable String manageTags){
+    public AjaxResult byManageTags(@PathVariable String manageTags) {
         BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags.trim());
+        if (sheep == null) {
+            return error("未找到对应的羊只");
+        }
+
+        // 补品种名称
+        BasSheepVariety variety = basSheepVarietyService.selectBasSheepVarietyById(sheep.getVarietyId());
+        sheep.setVarietyName(variety == null ? "" : variety.getVariety());
+
         return success(sheep);
     }
 
+    /**
+     * 根据羊只类型ID查询羊只列表
+     */
+    @PreAuthorize("@ss.hasPermi('sheep:sheep:query')")
+    @GetMapping("/listByTypeId")
+    public TableDataInfo listByTypeId(Integer typeId) {
+        if (typeId == null) {
+            return getDataTable(new ArrayList<>());
+        }
+        BasSheep query = new BasSheep();
+        query.setTypeId(typeId.longValue());
+        startPage();
+        List<BasSheep> list = basSheepService.selectBasSheepList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据羊舍ID和羊只类型ID组合查询羊只列表
+     */
+    @PreAuthorize("@ss.hasPermi('sheep:sheep:query')")
+    @GetMapping("/listBySheepfoldAndType")
+    public TableDataInfo listBySheepfoldAndType(Integer sheepfoldId, Integer typeId) {
+        if (sheepfoldId == null || typeId == null) {
+            return getDataTable(new ArrayList<>());
+        }
+        BasSheep query = new BasSheep();
+        query.setSheepfoldId(sheepfoldId.longValue());
+        query.setTypeId(typeId.longValue());
+        startPage();
+        List<BasSheep> list = basSheepService.selectBasSheepList(query);
+        return getDataTable(list);
+    }
 
 
+    /**
+     * 根据耳号（管理耳号或电子耳号）+ 耳号类型 查询羊只信息
+     * earType：0-电子耳号，1-管理耳号
+     */
+    @GetMapping("/byEarNumber")
+    public AjaxResult byEarNumber(@RequestParam String earNumber, @RequestParam Integer earType) {
+        BasSheep query = new BasSheep();
+        query.setManageTags(earNumber);
+        List<BasSheep> list = basSheepService.selectBasSheepList(query);
+
+        if (list.isEmpty()) {
+            query.setManageTags(null);
+            query.setElectronicTags(earNumber);
+            list = basSheepService.selectBasSheepList(query);
+        }
+
+        if (list.isEmpty()) {
+            return error("未找到对应的羊只");
+        }
+
+        BasSheep sheep = list.get(0);
+
+        String oldTag = earType == 0 ? sheep.getElectronicTags() : sheep.getManageTags();
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("sheep", sheep);
+        result.put("oldTag", oldTag);
+
+        return success(result);
+    }
+
+
+    /**
+     * 判断耳号是否存在（用于新增羊只时校验）
+     */
+    @GetMapping("/existsByManageTags/{manageTags}")
+    public AjaxResult existsByManageTags(@PathVariable String manageTags) {
+        BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags.trim());
+        if (sheep != null) {
+            return success(true);
+        }
+        return success(false);
+    }
+
+
+    @GetMapping("/existsByTag")
+    public AjaxResult existsByTag(@RequestParam String tag, @RequestParam Integer earType) {
+        boolean exists = basSheepService.existsByTag(tag, earType);
+        Map<String, Object> result = new HashMap<>();
+        result.put("exists", exists);
+        return success(result);
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java

@@ -18,6 +18,11 @@ import com.zhyc.module.base.service.IBasSheepGroupMappingService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 
+// 1. 导入
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
 /**
  * 羊只分组关联Controller
  * 
@@ -43,6 +48,10 @@ public class BasSheepGroupMappingController extends BaseController
         return getDataTable(list);
     }
 
+    // 2. 声明（放在类内部、方法外部）
+    private static final Logger log = LoggerFactory.getLogger(BasSheepGroupMappingController.class);
+
+
     @PreAuthorize("@ss.hasPermi('sheep_grouping:sheep_grouping:list')")
     @GetMapping("/listJoin")
     public TableDataInfo list(
@@ -103,7 +112,11 @@ public class BasSheepGroupMappingController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BasSheepGroupMapping basSheepGroupMapping)
     {
-        return toAjax(basSheepGroupMappingService.updateBasSheepGroupMapping(basSheepGroupMapping));
+        try {
+            return toAjax(basSheepGroupMappingService.updateBasSheepGroupMapping(basSheepGroupMapping));
+        } catch (RuntimeException e) {
+            return error(e.getMessage());
+        }
     }
 
     /**
@@ -116,4 +129,20 @@ public class BasSheepGroupMappingController extends BaseController
     {
         return toAjax(basSheepGroupMappingService.deleteBasSheepGroupMappingByIds(ids));
     }
+
+
+    @PostMapping("/addByEarTags")
+    public AjaxResult addByEarTags(@RequestBody Map<String, Object> params) {
+        List<String> earTags = (List<String>) params.get("earTags");
+        Long groupId = Long.valueOf(params.get("groupId").toString());
+
+        if (earTags == null || earTags.isEmpty()) {
+            return error("耳号列表不能为空");
+        }
+
+        return basSheepGroupMappingService.addByEarTags(earTags, groupId);
+    }
+
+
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepTypeController.java

@@ -0,0 +1,114 @@
+package com.zhyc.module.base.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.base.domain.BasSheep;
+import com.zhyc.module.base.service.IBasSheepService;
+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.base.domain.BasSheepType;
+import com.zhyc.module.base.service.IBasSheepTypeService;
+import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.common.core.page.TableDataInfo;
+
+/**
+ * 羊只类型Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/base/base")
+public class BasSheepTypeController extends BaseController
+{
+    @Autowired
+    private IBasSheepTypeService basSheepTypeService;
+
+    @Autowired
+    private IBasSheepService basSheepService;
+    /**
+     * 查询羊只类型列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BasSheepType basSheepType)
+    {
+        startPage();
+        List<BasSheepType> list = basSheepTypeService.selectBasSheepTypeList(basSheepType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出羊只类型列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:export')")
+    @Log(title = "羊只类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasSheepType basSheepType)
+    {
+        List<BasSheepType> list = basSheepTypeService.selectBasSheepTypeList(basSheepType);
+        ExcelUtil<BasSheepType> util = new ExcelUtil<BasSheepType>(BasSheepType.class);
+        util.exportExcel(response, list, "羊只类型数据");
+    }
+
+    /**
+     * 获取羊只类型详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(basSheepTypeService.selectBasSheepTypeById(id));
+    }
+
+    /**
+     * 新增羊只类型
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:add')")
+    @Log(title = "羊只类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BasSheepType basSheepType)
+    {
+        return toAjax(basSheepTypeService.insertBasSheepType(basSheepType));
+    }
+
+    /**
+     * 修改羊只类型
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:edit')")
+    @Log(title = "羊只类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BasSheepType basSheepType)
+    {
+        return toAjax(basSheepTypeService.updateBasSheepType(basSheepType));
+    }
+
+    /**
+     * 删除羊只类型
+     */
+    @PreAuthorize("@ss.hasPermi('base:base:remove')")
+    @Log(title = "羊只类型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(basSheepTypeService.deleteBasSheepTypeByIds(ids));
+    }
+
+
+}

zhyc-module/src/main/java/com/zhyc/module/base/controller/DaRanchController.java

@@ -0,0 +1,119 @@
+package com.zhyc.module.base.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.module.base.domain.BasSheep;
+import com.zhyc.module.base.service.IBasSheepService;
+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.base.domain.DaRanch;
+import com.zhyc.module.base.service.IDaRanchService;
+import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.common.core.page.TableDataInfo;
+
+/**
+ * 牧场管理Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@RestController
+@RequestMapping("/ranch/ranch")
+public class DaRanchController extends BaseController
+{
+    @Autowired
+    private IDaRanchService daRanchService;
+
+    @Autowired
+    private IBasSheepService basSheepService;
+    /**
+     * 查询牧场管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DaRanch daRanch)
+    {
+        startPage();
+        List<DaRanch> list = daRanchService.selectDaRanchList(daRanch);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出牧场管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:export')")
+    @Log(title = "牧场管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DaRanch daRanch)
+    {
+        List<DaRanch> list = daRanchService.selectDaRanchList(daRanch);
+        ExcelUtil<DaRanch> util = new ExcelUtil<DaRanch>(DaRanch.class);
+        util.exportExcel(response, list, "牧场管理数据");
+    }
+
+    /**
+     * 获取牧场管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(daRanchService.selectDaRanchById(id));
+    }
+
+    /**
+     * 获取指定牧场下的所有羊只耳号
+     */
+    @GetMapping("/getSheepByRanchId/{ranchId}")
+    public AjaxResult getSheepByRanchId(@PathVariable Long ranchId) {
+        List<BasSheep> sheepList = basSheepService.getSheepByRanchId(ranchId);
+        return AjaxResult.success(sheepList);
+    }
+
+
+    /**
+     * 新增牧场管理
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:add')")
+    @Log(title = "牧场管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DaRanch daRanch)
+    {
+        return toAjax(daRanchService.insertDaRanch(daRanch));
+    }
+
+    /**
+     * 修改牧场管理
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:edit')")
+    @Log(title = "牧场管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DaRanch daRanch)
+    {
+        return toAjax(daRanchService.updateDaRanch(daRanch));
+    }
+
+    /**
+     * 删除牧场管理
+     */
+    @PreAuthorize("@ss.hasPermi('ranch:ranch:remove')")
+    @Log(title = "牧场管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(daRanchService.deleteDaRanchByIds(ids));
+    }
+}

zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java

@@ -6,6 +6,7 @@ import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.common.core.page.TableDataInfo;
 import com.zhyc.common.enums.BusinessType;
 import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.service.ISheepFileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,36 +64,40 @@ public class SheepFileController extends BaseController
         return success(sheepFileService.selectSheepFileById(id));
     }
 
-    /**
+    /*
-     * 新增羊只档案
+    * 根据耳号查询是否存在羊舍
-     */
+    * */
-    @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:add')")
+    @GetMapping("/byNo/{manageTags}")
-    @Log(title = "羊只档案", businessType = BusinessType.INSERT)
+    public AjaxResult byManageTags(@PathVariable String manageTags){
-    @PostMapping
+        SheepFile sheep=sheepFileService.selectBasSheepByManageTags(manageTags.trim());
-    public AjaxResult add(@RequestBody SheepFile sheepFile)
+        return success(sheep);
-    {
-        return toAjax(sheepFileService.insertSheepFile(sheepFile));
     }
 
-    /**
+
-     * 修改羊只档案
+    @GetMapping("/stat/sheepType")
-     */
+    public AjaxResult statSheepType() {
-    @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:edit')")
+        return success(sheepFileService.countBySheepType());
-    @Log(title = "羊只档案", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SheepFile sheepFile)
-    {
-        return toAjax(sheepFileService.updateSheepFile(sheepFile));
     }
 
-    /**
+    @GetMapping("/stat/breedStatus")
-     * 删除羊只档案
+    public AjaxResult statBreedStatus() {
-     */
+        return success(sheepFileService.countByBreedStatus());
-    @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:remove')")
-    @Log(title = "羊只档案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(sheepFileService.deleteSheepFileByIds(ids));
     }
+
+    @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());
+    }
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java

@@ -48,6 +48,9 @@ public class BasSheep extends BaseEntity
     @Excel(name = "品种id")
     private Long varietyId;
 
+    //仅用于改品种页面的回显
+    private String varietyName;
+
     /** 家系 */
     @Excel(name = "家系")
     private String family;

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();
-    }
 }

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();
-    }
 }

zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepType.java

@@ -0,0 +1,31 @@
+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;
+import com.zhyc.common.core.domain.BaseEntity;
+
+/**
+ * 羊只类型对象 bas_sheep_type
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BasSheepType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 羊只类型 */
+    private String name;
+
+
+}

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();
-    }
 }

zhyc-module/src/main/java/com/zhyc/module/base/domain/DaRanch.java

@@ -0,0 +1,31 @@
+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;
+import com.zhyc.common.core.domain.BaseEntity;
+
+/**
+ * 牧场管理对象 da_ranch
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DaRanch extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 牧场名称 */
+    private String ranch;
+
+
+}

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();
-    }
 }

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;

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 
 {
     /**

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 
 {
     /**
@@ -76,4 +78,11 @@ public interface BasSheepGroupMappingMapper
     public int deleteBasSheepGroupMappingByIds(Long[] ids);
 
 
+    List<Map<String, Object>> selectSheepIdsByEarTags(@Param("earTags") List<String> earTags);
+
+    int batchInsert(@Param("list") List<BasSheepGroupMapping> list);
+
+
+    List<BasSheepGroupMapping> selectListByGroupId(@Param("groupId") Long groupId);
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepMapper.java

@@ -3,6 +3,7 @@ package com.zhyc.module.base.mapper;
 import java.util.List;
 
 import com.zhyc.module.base.domain.BasSheep;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 羊只基本信息Mapper接口
@@ -68,4 +69,13 @@ public interface BasSheepMapper
 
 
     List<BasSheep> selectBasSheepBySheepfold(String id);
+
+//    根据牧场ID获取羊只列表
+    List<BasSheep> getSheepByRanchId(Long ranchId);
+
+    List<BasSheep> selectBasSheepListByIds(List<Long> ids);
+
+    //用于校验改耳号部分新管理/电子耳号
+    int existsByManageTag(@Param("tag") String tag);
+    int existsByElectronicTag(@Param("tag") String tag);
 }

zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepTypeMapper.java

@@ -0,0 +1,61 @@
+package com.zhyc.module.base.mapper;
+
+import java.util.List;
+import com.zhyc.module.base.domain.BasSheepType;
+
+/**
+ * 羊只类型Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface BasSheepTypeMapper 
+{
+    /**
+     * 查询羊只类型
+     * 
+     * @param id 羊只类型主键
+     * @return 羊只类型
+     */
+    public BasSheepType selectBasSheepTypeById(Integer id);
+
+    /**
+     * 查询羊只类型列表
+     * 
+     * @param basSheepType 羊只类型
+     * @return 羊只类型集合
+     */
+    public List<BasSheepType> selectBasSheepTypeList(BasSheepType basSheepType);
+
+    /**
+     * 新增羊只类型
+     * 
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    public int insertBasSheepType(BasSheepType basSheepType);
+
+    /**
+     * 修改羊只类型
+     * 
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    public int updateBasSheepType(BasSheepType basSheepType);
+
+    /**
+     * 删除羊只类型
+     * 
+     * @param id 羊只类型主键
+     * @return 结果
+     */
+    public int deleteBasSheepTypeById(Integer id);
+
+    /**
+     * 批量删除羊只类型
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBasSheepTypeByIds(Integer[] ids);
+}

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 
 {
     /**
@@ -59,4 +61,15 @@ public interface BasSheepVarietyMapper
      * @return 结果
      */
     public int deleteBasSheepVarietyByIds(Long[] ids);
+
+
+    /**
+     * 根据品种名称查询品种 ID 用于导入羊只
+     *
+     * @param varietyName 品种名称
+     * @return 品种 ID
+     */
+    Long selectIdByName(String varietyName);
+
+    BasSheepVariety selectByVarietyName(String varietyName);
 }

zhyc-module/src/main/java/com/zhyc/module/base/mapper/DaRanchMapper.java

@@ -0,0 +1,61 @@
+package com.zhyc.module.base.mapper;
+
+import java.util.List;
+import com.zhyc.module.base.domain.DaRanch;
+
+/**
+ * 牧场管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface DaRanchMapper 
+{
+    /**
+     * 查询牧场管理
+     * 
+     * @param id 牧场管理主键
+     * @return 牧场管理
+     */
+    public DaRanch selectDaRanchById(Long id);
+
+    /**
+     * 查询牧场管理列表
+     * 
+     * @param daRanch 牧场管理
+     * @return 牧场管理集合
+     */
+    public List<DaRanch> selectDaRanchList(DaRanch daRanch);
+
+    /**
+     * 新增牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    public int insertDaRanch(DaRanch daRanch);
+
+    /**
+     * 修改牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    public int updateDaRanch(DaRanch daRanch);
+
+    /**
+     * 删除牧场管理
+     * 
+     * @param id 牧场管理主键
+     * @return 结果
+     */
+    public int deleteDaRanchById(Long id);
+
+    /**
+     * 批量删除牧场管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDaRanchByIds(Long[] ids);
+}

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 
 {
     /**

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
 {
     /**
@@ -28,36 +31,33 @@ public interface SheepFileMapper
      */
     public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
 
-    /**
-     * 新增羊只档案
-     *
-     * @param sheepFile 羊只档案
-     * @return 结果
-     */
-    public int insertSheepFile(SheepFile sheepFile);
 
     /**
-     * 修改羊只档案
+     * 根据管理耳号查询
      *
-     * @param sheepFile 羊只档案
+     * @param tags 管理耳号
      * @return 结果
      */
-    public int updateSheepFile(SheepFile sheepFile);
+    SheepFile selectSheepByManageTags(String tags);
+
+
+    // 在群羊只总数
+    Long countInGroup();
+
+
+    // 羊只类别分布（按 name 分组）
+    List<Map<String,Object>> countBySheepType();
+
+    // 繁育状态分布（按 breed 分组）
+    List<Map<String,Object>> countByBreedStatus();
+
+    // 品种分布（按 variety 分组）
+    List<Map<String,Object>> countByVariety();
+
+    // 泌乳羊胎次分布（name = '泌乳羊' 时按 parity 分组）
+    List<Map<String,Object>> countParityOfLactation();
+
 
-    /**
-     * 删除羊只档案
-     *
-     * @param id 羊只档案主键
-     * @return 结果
-     */
-    public int deleteSheepFileById(Long id);
 
-    /**
-     * 批量删除羊只档案
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSheepFileByIds(Long[] ids);
 
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java

@@ -3,6 +3,7 @@ package com.zhyc.module.base.service;
 import java.util.List;
 import java.util.Map;
 
+import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.module.base.domain.BasSheepGroupMapping;
 
 /**
@@ -67,4 +68,6 @@ public interface IBasSheepGroupMappingService
      * @return 结果
      */
     public int deleteBasSheepGroupMappingById(Long id);
+
+    public AjaxResult addByEarTags(List<String> earTags, Long groupId);
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepService.java

@@ -60,5 +60,18 @@ public interface IBasSheepService
      */
     public int deleteBasSheepById(Long id);
 
+    /**
+     * 根据羊只耳号获取羊只
+     */
     BasSheep selectBasSheepByManageTags(String trim);
+
+    /**
+     * 根据牧场ID获取羊只列表
+     */
+    List<BasSheep> getSheepByRanchId(Long ranchId);
+
+    List<BasSheep> selectBasSheepListByIds(List<Long> ids);
+
+    //校验新管理/电子耳号
+    boolean existsByTag(String tag, Integer earType);
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepTypeService.java

@@ -0,0 +1,65 @@
+package com.zhyc.module.base.service;
+
+import java.util.List;
+
+import com.zhyc.module.base.domain.BasSheep;
+import com.zhyc.module.base.domain.BasSheepType;
+
+/**
+ * 羊只类型Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface IBasSheepTypeService 
+{
+    /**
+     * 查询羊只类型
+     * 
+     * @param id 羊只类型主键
+     * @return 羊只类型
+     */
+    public BasSheepType selectBasSheepTypeById(Integer id);
+
+    /**
+     * 查询羊只类型列表
+     * 
+     * @param basSheepType 羊只类型
+     * @return 羊只类型集合
+     */
+    public List<BasSheepType> selectBasSheepTypeList(BasSheepType basSheepType);
+
+    /**
+     * 新增羊只类型
+     * 
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    public int insertBasSheepType(BasSheepType basSheepType);
+
+    /**
+     * 修改羊只类型
+     * 
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    public int updateBasSheepType(BasSheepType basSheepType);
+
+    /**
+     * 批量删除羊只类型
+     * 
+     * @param ids 需要删除的羊只类型主键集合
+     * @return 结果
+     */
+    public int deleteBasSheepTypeByIds(Integer[] ids);
+
+    /**
+     * 删除羊只类型信息
+     * 
+     * @param id 羊只类型主键
+     * @return 结果
+     */
+    public int deleteBasSheepTypeById(Integer id);
+
+
+}

zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepVarietyService.java

@@ -59,4 +59,9 @@ public interface IBasSheepVarietyService
      * @return 结果
      */
     public int deleteBasSheepVarietyById(Long id);
+
+
+    // 根据品种名称查询品种
+    public BasSheepVariety selectByVarietyName(String varietyName);
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/IDaRanchService.java

@@ -0,0 +1,61 @@
+package com.zhyc.module.base.service;
+
+import java.util.List;
+import com.zhyc.module.base.domain.DaRanch;
+
+/**
+ * 牧场管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+public interface IDaRanchService 
+{
+    /**
+     * 查询牧场管理
+     * 
+     * @param id 牧场管理主键
+     * @return 牧场管理
+     */
+    public DaRanch selectDaRanchById(Long id);
+
+    /**
+     * 查询牧场管理列表
+     * 
+     * @param daRanch 牧场管理
+     * @return 牧场管理集合
+     */
+    public List<DaRanch> selectDaRanchList(DaRanch daRanch);
+
+    /**
+     * 新增牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    public int insertDaRanch(DaRanch daRanch);
+
+    /**
+     * 修改牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    public int updateDaRanch(DaRanch daRanch);
+
+    /**
+     * 批量删除牧场管理
+     * 
+     * @param ids 需要删除的牧场管理主键集合
+     * @return 结果
+     */
+    public int deleteDaRanchByIds(Long[] ids);
+
+    /**
+     * 删除牧场管理信息
+     * 
+     * @param id 牧场管理主键
+     * @return 结果
+     */
+    public int deleteDaRanchById(Long id);
+}

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接口
@@ -28,35 +29,13 @@ public interface ISheepFileService
      */
     public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
 
-    /**
-     * 新增羊只档案
-     * 
-     * @param sheepFile 羊只档案
-     * @return 结果
-     */
-    public int insertSheepFile(SheepFile sheepFile);
 
-    /**
+    SheepFile selectBasSheepByManageTags(String trim);
-     * 修改羊只档案
-     * 
-     * @param sheepFile 羊只档案
-     * @return 结果
-     */
-    public int updateSheepFile(SheepFile sheepFile);
 
-    /**
+    Long countInGroup();
-     * 批量删除羊只档案
-     * 
-     * @param ids 需要删除的羊只档案主键集合
-     * @return 结果
-     */
-    public int deleteSheepFileByIds(Long[] ids);
 
-    /**
+    List<Map<String,Object>> countBySheepType();
-     * 删除羊只档案信息
+    List<Map<String,Object>> countByBreedStatus();
-     * 
+    List<Map<String,Object>> countByVariety();
-     * @param id 羊只档案主键
+    List<Map<String,Object>> countParityOfLactation();
-     * @return 结果
-     */
-    public int deleteSheepFileById(Long id);
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java

@@ -1,8 +1,9 @@
 package com.zhyc.module.base.service.impl;
 
-import java.util.List;
+import java.util.*;
-import java.util.Map;
+import java.util.stream.Collectors;
 
+import com.zhyc.common.core.domain.AjaxResult;
 import com.zhyc.module.base.domain.BasSheepGroupMapping;
 import com.zhyc.module.base.mapper.BasSheepGroupMappingMapper;
 import com.zhyc.module.base.service.IBasSheepGroupMappingService;
@@ -70,9 +71,21 @@ public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingSer
      * @param basSheepGroupMapping 羊只分组关联
      * @return 结果
      */
+//    @Override
+//    public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping)
+//    {
+//        return basSheepGroupMappingMapper.updateBasSheepGroupMapping(basSheepGroupMapping);
+//    }
     @Override
-    public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping)
+    public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping) {
-    {
+
+        Long SheepId = basSheepGroupMapping.getSheepId();
+        Long GroupId = basSheepGroupMapping.getGroupId();
+        existsInGroup(SheepId,GroupId);
+
+        if (existsInGroup(basSheepGroupMapping.getSheepId(), basSheepGroupMapping.getGroupId())) {
+            throw new RuntimeException("该羊已在此分组，无需修改");
+        }
         return basSheepGroupMappingMapper.updateBasSheepGroupMapping(basSheepGroupMapping);
     }
 
@@ -100,4 +113,77 @@ public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingSer
         return basSheepGroupMappingMapper.deleteBasSheepGroupMappingById(id);
     }
 
+
+
+    @Override
+    public AjaxResult addByEarTags(List<String> earTags, Long groupId) {
+        // 1. 参数判空
+        if (earTags == null || earTags.isEmpty()) {
+            return AjaxResult.error("耳号列表不能为空");
+        }
+
+        // 2. 根据耳号查询羊只（manage_tags -> id）
+        List<Map<String, Object>> sheepList = basSheepGroupMappingMapper.selectSheepIdsByEarTags(earTags);
+        Map<String, Long> tagToId = new HashMap<>();
+        for (Map<String, Object> s : sheepList) {
+            tagToId.put((String) s.get("manage_tags"), ((Number) s.get("id")).longValue());
+        }
+
+        // 3. 不存在的耳号
+        List<String> missing = new ArrayList<>();
+        for (String tag : earTags) {
+            if (!tagToId.containsKey(tag)) {
+                missing.add(tag);
+            }
+        }
+        if (!missing.isEmpty()) {
+            Map<String, Object> res = new HashMap<>();
+            res.put("success", false);
+            res.put("missing", missing);
+            return AjaxResult.success(res);
+        }
+
+        // 4. 查询该分组下已存在的羊只ID
+        List<BasSheepGroupMapping> existingRows = basSheepGroupMappingMapper.selectListByGroupId(groupId);
+        System.out.println("🔍 existingRows 类型 = " + existingRows.getClass());
+
+        Set<Long> existingIds = existingRows.stream()
+                .map(BasSheepGroupMapping::getSheepId)
+                .collect(Collectors.toSet());
+
+        System.out.println("🔍 existingIds = " + existingIds);
+
+        // 5. 过滤出未在该分组的羊只
+        List<BasSheepGroupMapping> toInsert = new ArrayList<>();
+        for (Map.Entry<String, Long> e : tagToId.entrySet()) {
+            Long sheepId = e.getValue();
+            if (!existingIds.contains(sheepId)) {
+                BasSheepGroupMapping m = new BasSheepGroupMapping();
+                m.setSheepId(sheepId);
+                m.setGroupId(groupId);
+                toInsert.add(m);
+            }
+        }
+
+        if (toInsert.isEmpty()) {
+            return AjaxResult.success("所选羊只已全部在该分组中");
+        }
+
+        // 6. 批量插入
+        int rows = basSheepGroupMappingMapper.batchInsert(toInsert);
+        Map<String, Object> res = new HashMap<>();
+        res.put("success", true);
+        res.put("inserted", rows);
+        return AjaxResult.success(res);
+    }
+
+    private boolean existsInGroup(Long sheepId, Long groupId) {
+        BasSheepGroupMapping param = new BasSheepGroupMapping();
+        List<Map<String, Object>> list = basSheepGroupMappingMapper
+                .selectBasSheepGroupMappingList(sheepId, groupId, null);
+        return !list.isEmpty();
+    }
+
+
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java

@@ -99,4 +99,27 @@ public class BasSheepServiceImpl implements IBasSheepService
     public BasSheep selectBasSheepByManageTags(String manageTags){
         return basSheepMapper.selectBasSheepByManageTags(manageTags);
     }
+
+    @Override
+    public List<BasSheep> getSheepByRanchId(Long ranchId) {
+        return basSheepMapper.getSheepByRanchId(ranchId);
+    }
+
+    @Override
+    public List<BasSheep> selectBasSheepListByIds(List<Long> ids) {
+        return basSheepMapper.selectBasSheepListByIds(ids);
+    }
+
+    //校验新管理/电子耳号
+    @Override
+    public boolean existsByTag(String tag, Integer earType) {
+        if (earType == 0) {
+            return basSheepMapper.existsByElectronicTag(tag) > 0;
+        } else if (earType == 1) {
+            return basSheepMapper.existsByManageTag(tag) > 0;
+        }
+        return false;
+    }
+
+
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepTypeServiceImpl.java

@@ -0,0 +1,89 @@
+package com.zhyc.module.base.service.impl;
+
+import java.util.List;
+
+import com.zhyc.module.base.domain.BasSheep;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhyc.module.base.mapper.BasSheepTypeMapper;
+import com.zhyc.module.base.domain.BasSheepType;
+import com.zhyc.module.base.service.IBasSheepTypeService;
+
+/**
+ * 羊只类型Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@Service
+public class BasSheepTypeServiceImpl implements IBasSheepTypeService {
+    @Autowired
+    private BasSheepTypeMapper basSheepTypeMapper;
+
+    /**
+     * 查询羊只类型
+     *
+     * @param id 羊只类型主键
+     * @return 羊只类型
+     */
+    @Override
+    public BasSheepType selectBasSheepTypeById(Integer id) {
+        return basSheepTypeMapper.selectBasSheepTypeById(id);
+    }
+
+    /**
+     * 查询羊只类型列表
+     *
+     * @param basSheepType 羊只类型
+     * @return 羊只类型
+     */
+    @Override
+    public List<BasSheepType> selectBasSheepTypeList(BasSheepType basSheepType) {
+        return basSheepTypeMapper.selectBasSheepTypeList(basSheepType);
+    }
+
+    /**
+     * 新增羊只类型
+     *
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    @Override
+    public int insertBasSheepType(BasSheepType basSheepType) {
+        return basSheepTypeMapper.insertBasSheepType(basSheepType);
+    }
+
+    /**
+     * 修改羊只类型
+     *
+     * @param basSheepType 羊只类型
+     * @return 结果
+     */
+    @Override
+    public int updateBasSheepType(BasSheepType basSheepType) {
+        return basSheepTypeMapper.updateBasSheepType(basSheepType);
+    }
+
+    /**
+     * 批量删除羊只类型
+     *
+     * @param ids 需要删除的羊只类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasSheepTypeByIds(Integer[] ids) {
+        return basSheepTypeMapper.deleteBasSheepTypeByIds(ids);
+    }
+
+    /**
+     * 删除羊只类型信息
+     *
+     * @param id 羊只类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasSheepTypeById(Integer id) {
+        return basSheepTypeMapper.deleteBasSheepTypeById(id);
+    }
+
+}

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepVarietyServiceImpl.java

@@ -91,4 +91,9 @@ public class BasSheepVarietyServiceImpl implements IBasSheepVarietyService
     {
         return basSheepVarietyMapper.deleteBasSheepVarietyById(id);
     }
+
+    @Override
+    public BasSheepVariety selectByVarietyName(String varietyName) {
+        return basSheepVarietyMapper.selectByVarietyName(varietyName);
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaRanchServiceImpl.java

@@ -0,0 +1,93 @@
+package com.zhyc.module.base.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhyc.module.base.mapper.DaRanchMapper;
+import com.zhyc.module.base.domain.DaRanch;
+import com.zhyc.module.base.service.IDaRanchService;
+
+/**
+ * 牧场管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-07-22
+ */
+@Service
+public class DaRanchServiceImpl implements IDaRanchService 
+{
+    @Autowired
+    private DaRanchMapper daRanchMapper;
+
+    /**
+     * 查询牧场管理
+     * 
+     * @param id 牧场管理主键
+     * @return 牧场管理
+     */
+    @Override
+    public DaRanch selectDaRanchById(Long id)
+    {
+        return daRanchMapper.selectDaRanchById(id);
+    }
+
+    /**
+     * 查询牧场管理列表
+     * 
+     * @param daRanch 牧场管理
+     * @return 牧场管理
+     */
+    @Override
+    public List<DaRanch> selectDaRanchList(DaRanch daRanch)
+    {
+        return daRanchMapper.selectDaRanchList(daRanch);
+    }
+
+    /**
+     * 新增牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    @Override
+    public int insertDaRanch(DaRanch daRanch)
+    {
+        return daRanchMapper.insertDaRanch(daRanch);
+    }
+
+    /**
+     * 修改牧场管理
+     * 
+     * @param daRanch 牧场管理
+     * @return 结果
+     */
+    @Override
+    public int updateDaRanch(DaRanch daRanch)
+    {
+        return daRanchMapper.updateDaRanch(daRanch);
+    }
+
+    /**
+     * 批量删除牧场管理
+     * 
+     * @param ids 需要删除的牧场管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDaRanchByIds(Long[] ids)
+    {
+        return daRanchMapper.deleteDaRanchByIds(ids);
+    }
+
+    /**
+     * 删除牧场管理信息
+     * 
+     * @param id 牧场管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDaRanchById(Long id)
+    {
+        return daRanchMapper.deleteDaRanchById(id);
+    }
+}

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业务层处理
@@ -16,8 +16,7 @@ import java.util.List;
  * @date 2025-07-13
  */
 @Service
-public class SheepFileServiceImpl implements ISheepFileService
+public class SheepFileServiceImpl implements ISheepFileService {
-{
     @Autowired
     private SheepFileMapper sheepFileMapper;
 
@@ -28,8 +27,7 @@ public class SheepFileServiceImpl implements ISheepFileService
      * @return 羊只档案
      */
     @Override
-    public SheepFile selectSheepFileById(Long id)
+    public SheepFile selectSheepFileById(Long id) {
-    {
         return sheepFileMapper.selectSheepFileById(id);
     }
 
@@ -40,58 +38,37 @@ public class SheepFileServiceImpl implements ISheepFileService
      * @return 羊只档案
      */
     @Override
-    public List<SheepFile> selectSheepFileList(SheepFile sheepFile)
+    public List<SheepFile> selectSheepFileList(SheepFile sheepFile) {
-    {
         return sheepFileMapper.selectSheepFileList(sheepFile);
     }
 
-    /**
-     * 新增羊只档案
-     * 
-     * @param sheepFile 羊只档案
-     * @return 结果
-     */
     @Override
-    public int insertSheepFile(SheepFile sheepFile)
+    public SheepFile selectBasSheepByManageTags(String tags) {
-    {
+        return sheepFileMapper.selectSheepByManageTags(tags);
-        sheepFile.setCreateTime(DateUtils.getNowDate());
-        return sheepFileMapper.insertSheepFile(sheepFile);
     }
 
-    /**
+
-     * 修改羊只档案
-     * 
-     * @param sheepFile 羊只档案
-     * @return 结果
-     */
     @Override
-    public int updateSheepFile(SheepFile sheepFile)
+    public List<Map<String, Object>> countBySheepType() {
-    {
+        return sheepFileMapper.countBySheepType();
-        sheepFile.setUpdateTime(DateUtils.getNowDate());
-        return sheepFileMapper.updateSheepFile(sheepFile);
     }
 
-    /**
-     * 批量删除羊只档案
-     * 
-     * @param ids 需要删除的羊只档案主键
-     * @return 结果
-     */
     @Override
-    public int deleteSheepFileByIds(Long[] ids)
+    public List<Map<String, Object>> countByBreedStatus() {
-    {
+        return sheepFileMapper.countByBreedStatus();
-        return sheepFileMapper.deleteSheepFileByIds(ids);
     }
 
-    /**
-     * 删除羊只档案信息
-     * 
-     * @param id 羊只档案主键
-     * @return 结果
-     */
     @Override
-    public int deleteSheepFileById(Long id)
+    public List<Map<String, Object>> countByVariety() {
-    {
+        return sheepFileMapper.countByVariety();
-        return sheepFileMapper.deleteSheepFileById(id);
     }
+
+    @Override
+    public List<Map<String, Object>> countParityOfLactation() {
+        return sheepFileMapper.countParityOfLactation();
+    }
+    @Override
+    public Long countInGroup() { return sheepFileMapper.countInGroup(); }
+
+
 }

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));

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));

zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java

@@ -29,7 +29,7 @@ import com.zhyc.common.core.page.TableDataInfo;
  * @date 2025-07-14
  */
 @RestController
-@RequestMapping("/bisosafety/quarantine")
+@RequestMapping("/biosafety/quarantine")
 public class QuarantineReportController extends BaseController
 {
     @Autowired
@@ -38,7 +38,7 @@ public class QuarantineReportController extends BaseController
     /**
      * 查询检疫记录列表
      */
-    @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:list')")
+    @PreAuthorize("@ss.hasPermi('biosafety:quarantine:list')")
     @GetMapping("/list")
     public TableDataInfo list(QuarantineReport quarantineReport)
     {
@@ -50,7 +50,7 @@ public class QuarantineReportController extends BaseController
     /**
      * 导出检疫记录列表
      */
-    @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:export')")
+    @PreAuthorize("@ss.hasPermi('biosafety:quarantine:export')")
     @Log(title = "检疫记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, QuarantineReport quarantineReport)
@@ -73,7 +73,7 @@ public class QuarantineReportController extends BaseController
     /**
      * 新增检疫记录
      */
-    @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:add')")
+    @PreAuthorize("@ss.hasPermi('biosafety:quarantine:add')")
     @Log(title = "检疫记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody QuarantineReport quarantineReport)
@@ -84,7 +84,7 @@ public class QuarantineReportController extends BaseController
     /**
      * 修改检疫记录
      */
-    @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:edit')")
+    @PreAuthorize("@ss.hasPermi('biosafety:quarantine:edit')")
     @Log(title = "检疫记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody QuarantineReport quarantineReport)
@@ -95,7 +95,7 @@ public class QuarantineReportController extends BaseController
     /**
      * 删除检疫记录
      */
-    @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:remove')")
+    @PreAuthorize("@ss.hasPermi('biosafety:quarantine:remove')")
     @Log(title = "检疫记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java

@@ -65,7 +65,7 @@ public class SwMedicineUsageController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('biosafety:usageInfo:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
         return success(swMedicineUsageService.selectSwMedicineUsageById(id));
     }

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;
 
-    /** 药品使用记录 */
+    private Integer[] sheepIds;
-    @Excel(name = "药品使用记录")
-    private Long usageId;
 
-    /** 品种 */
+    /** 羊只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<SwMedicineUsageDetails> 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();
-    }
 }

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();
-    }
 }

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")
+    @Excel(name = "羊舍")
-    private Long sheepfoldId;
+    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) 
+    //    药品使用
-    {
+    private List<SwMedicineUsageDetails> usageDetails;
-        this.id = id;
-    }
 
-    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();
-    }
 }

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 lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
 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;
 
-    /** 用药记录 */
+    private Integer[] sheepIds;
-    @Excel(name = "用药记录")
-    private Long usageId;
 
-    /** 品种 */
+    /** 羊只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")
+    @Excel(name = "用药记录")
-    private Long sheepfoldId;
+    private Integer usageId;
+
 
     /** 技术员 */
     @Excel(name = "技术员")
@@ -65,145 +63,6 @@ public class Health extends BaseEntity
     @Excel(name = "备注")
     private String comment;
 
-    public void setId(Long id) 
+    //    药品使用
-    {
+    private List<SwMedicineUsageDetails> usageDetails;
-        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();
-    }
 }

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;
 
-    /** 使用记录 */
+    private Integer[] sheepIds;
-    @Excel(name = "使用记录")
-    private Long usageId;
 
-    /** 品种 */
+    /** 羊只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")
+    @Excel(name = "使用记录")
-    private Long sheepfoldId;
+    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) 
+    //    药品使用
-    {
+    private List<SwMedicineUsageDetails> usageDetails;
-        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(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();
-    }
 }

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();
-    }
 }

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
 {

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();
-    }
 }

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();
-    }
 }

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;

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;

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.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,12 +16,15 @@ import com.zhyc.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-07-12
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SwMedicineUsage extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id */
-    private Long id;
+    private Integer id;
 
     /** 使用名称 */
     @Excel(name = "使用名称")
@@ -30,57 +37,5 @@ public class SwMedicineUsage extends BaseEntity
     /** 药品使用记录详情信息 */
     private List<SwMedicineUsageDetails> swMedicineUsageDetailsList;
 
-    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 setUseType(String useType) 
-    {
-        this.useType = useType;
-    }
-
-    public String getUseType() 
-    {
-        return useType;
-    }
-
-    public List<SwMedicineUsageDetails> getSwMedicineUsageDetailsList()
-    {
-        return swMedicineUsageDetailsList;
-    }
-
-    public void setSwMedicineUsageDetailsList(List<SwMedicineUsageDetails> swMedicineUsageDetailsList)
-    {
-        this.swMedicineUsageDetailsList = swMedicineUsageDetailsList;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("useType", getUseType())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("swMedicineUsageDetailsList", getSwMedicineUsageDetailsList())
-            .toString();
-    }
 }

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;
@@ -22,7 +26,7 @@ public class SwMedicineUsageDetails extends BaseEntity
 
     /** 药品使用记录id */
     @Excel(name = "药品使用记录id")
-    private Long mediUsage;
+    private Integer mediUsage;
 
     /** 药品id */
     @Excel(name = "药品id")

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;

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;

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 = "单位")

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;
-    }
 
 }

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,11 +20,12 @@ 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;
 
-    /** $column.columnComment */
     private Long id;
 
     /** 诊疗记录id */
@@ -30,7 +33,11 @@ public class Treatment extends BaseEntity
 
     /** 羊只耳号 */
     @Excel(name = "羊只耳号")
+    private String sheepNo;
+
     private Long sheepId;
+//    用于批量新增
+    private List<String> sheepIds;
 
     /** 品种 */
     @Excel(name = "品种")
@@ -71,11 +78,16 @@ public class Treatment extends BaseEntity
 
     /** 疾病类型 */
     @Excel(name = "疾病类型")
+    private String diseaseName;
+
     private Long diseaseId;
 
+
     /** 父疾病 */
     @Excel(name = "父疾病")
-    private String diseasePid;
+    private String diseasePName;
+
+    private Long diseasePid;
 
     /** 兽医 */
     @Excel(name = "兽医")
@@ -83,7 +95,7 @@ public class Treatment extends BaseEntity
 
     /** 药品使用记录id */
     @Excel(name = "药品使用记录id")
-    private Long usageId;
+    private Integer usageId;
 
 //    药品使用
     private List<SwMedicineUsageDetails> usageDetails;

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> deworm);
 
     /**
      * 修改驱虫

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 
 {
     /**

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> disinfect);
 
     /**
      * 修改消毒记录

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> health);
 
     /**
      * 修改保健

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> immunity);
 
     /**
      * 修改免疫

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**
@@ -19,7 +21,7 @@ public interface SwMedicineUsageMapper
      * @param id 药品使用记录主键
      * @return 药品使用记录
      */
-    public SwMedicineUsage selectSwMedicineUsageById(Long id);
+    public SwMedicineUsage selectSwMedicineUsageById(Integer id);
 
     /**
      * 查询药品使用记录列表
@@ -51,7 +53,7 @@ public interface SwMedicineUsageMapper
      * @param id 药品使用记录主键
      * @return 结果
      */
-    public int deleteSwMedicineUsageById(Long id);
+    public int deleteSwMedicineUsageById(Integer id);
 
     /**
      * 批量删除药品使用记录
@@ -84,5 +86,5 @@ public interface SwMedicineUsageMapper
      * @param id 药品使用记录ID
      * @return 结果
      */
-    public int deleteSwMedicineUsageDetailsByMediUsage(Long id);
+    public int deleteSwMedicineUsageDetailsByMediUsage(Integer id);
 }

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**
@@ -59,4 +61,6 @@ public interface TreatmentMapper
      * @return 结果
      */
     public int deleteTreatmentByIds(Long[] ids);
+
+    int insertTreatmentList(List<Treatment> treatments);
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java

@@ -17,7 +17,7 @@ public interface ISwMedicineUsageService
      * @param id 药品使用记录主键
      * @return 药品使用记录
      */
-    public SwMedicineUsage selectSwMedicineUsageById(Long id);
+    public SwMedicineUsage selectSwMedicineUsageById(Integer id);
 
     /**
      * 查询药品使用记录列表
@@ -57,5 +57,5 @@ public interface ISwMedicineUsageService
      * @param id 药品使用记录主键
      * @return 结果
      */
-    public int deleteSwMedicineUsageById(Long id);
+    public int deleteSwMedicineUsageById(Integer id);
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java

@@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service;
 import java.util.List;
 
 import com.zhyc.module.biosafety.domain.Treatment;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 治疗记录Service接口
@@ -36,6 +37,7 @@ public interface ITreatmentService
      */
     public int insertTreatment(Treatment treatment);
 
+
     /**
      * 修改治疗记录
      * 

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());
+        String username = SecurityUtils.getUsername();
-        return dewormMapper.insertDeworm(deworm);
+        //        使用记录的文件
+        SwMedicineUsage medicineUsage = new SwMedicineUsage();
+        medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails());
+        medicineUsage.setName("羊只驱虫");
+        medicineUsage.setUseType("1");
+
+            List<Deworm> 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);
     }

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);
     }
 

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<Disinfect> 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);
     }

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<Health> 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);
     }

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<Immunity> 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);
     }

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);
     }

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;
@@ -31,7 +32,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
      * @return 药品使用记录
      */
     @Override
-    public SwMedicineUsage selectSwMedicineUsageById(Long id)
+    public SwMedicineUsage selectSwMedicineUsageById(Integer id)
     {
         return swMedicineUsageMapper.selectSwMedicineUsageById(id);
     }
@@ -58,10 +59,12 @@ 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);
-        return rows;
+        return swMedicineUsage.getId();
     }
 
     /**
@@ -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);
@@ -102,7 +107,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
      */
     @Transactional
     @Override
-    public int deleteSwMedicineUsageById(Long id)
+    public int deleteSwMedicineUsageById(Integer id)
     {
         swMedicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(id);
         return swMedicineUsageMapper.deleteSwMedicineUsageById(id);
@@ -116,7 +121,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
     public void insertSwMedicineUsageDetails(SwMedicineUsage swMedicineUsage)
     {
         List<SwMedicineUsageDetails> swMedicineUsageDetailsList = swMedicineUsage.getSwMedicineUsageDetailsList();
-        Long id = swMedicineUsage.getId();
+        Integer id = swMedicineUsage.getId();
         if (StringUtils.isNotNull(swMedicineUsageDetailsList))
         {
             List<SwMedicineUsageDetails> list = new ArrayList<SwMedicineUsageDetails>();

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);

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java

@@ -1,9 +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.base.service.impl.SheepFileServiceImpl;
 import com.zhyc.module.biosafety.domain.SwMedicineUsage;
-import com.zhyc.module.biosafety.domain.SwPrescription;
+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.TreatmentMapper;
@@ -24,6 +31,10 @@ public class TreatmentServiceImpl implements ITreatmentService
     private TreatmentMapper treatmentMapper;
     @Autowired
     private SwMedicineUsageServiceImpl medicineUsageService;
+    @Autowired
+    private SwMedicineUsageMapper medicineUsageMapper;
+    @Autowired
+    private SheepFileMapper sheepFileMapper;
 
     /**
      * 查询治疗记录
@@ -34,7 +45,11 @@ public class TreatmentServiceImpl implements ITreatmentService
     @Override
     public Treatment selectTreatmentById(Long id)
     {
-        return treatmentMapper.selectTreatmentById(id);
+        Treatment treatment = treatmentMapper.selectTreatmentById(id);
+//        获取药品使用记录
+        SwMedicineUsage swMedicineUsage = medicineUsageService.selectSwMedicineUsageById(treatment.getUsageId());
+        treatment.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList());
+        return treatment;
     }
 
     /**
@@ -59,14 +74,55 @@ 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){
 //        药品使用记录
-        medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails());
+            Integer  id=medicineUsageService.insertSwMedicineUsage(medicineUsage);
-        medicineUsageService.insertSwMedicineUsage(medicineUsage);
+//        药品使用记录id
-        treatment.setCreateTime(DateUtils.getNowDate());
+            treatment.setUsageId(id);
-        return treatmentMapper.insertTreatment(treatment);
+            treatment.setCreateTime(DateUtils.getNowDate());
+            return treatmentMapper.insertTreatment(treatment);
+
+//            批量新增
+        }else {
+
+            List<Treatment> treatments = new ArrayList<>();
+            treatment.setCreateTime(DateUtils.getNowDate());
+            for (String sheepId : treatment.getSheepIds()) {
+                SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId));
+                Treatment treat = new Treatment();
+                BeanUtils.copyProperties(treatment, treat);
+                treat.setSheepId(Long.valueOf(sheepId));
+                treat.setVariety(sheepFile.getVariety());
+                treat.setSheepType(sheepFile.getName());
+                treat.setMonthAge(sheepFile.getMonthAge());
+                treat.setGender(String.valueOf(sheepFile.getGender()));
+                treat.setBreed(sheepFile.getBreed());
+                treat.setParity(sheepFile.getParity());
+                treat.setLactDay(sheepFile.getLactationDay());
+                treat.setGestDay(sheepFile.getGestationDay());
+//                获取药品使用记录的id
+                Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage);
+                System.out.println(medicineUsage);
+                System.out.println(usageId);
+                treat.setUsageId(usageId);
+                treatments.add(treat);
+            }
+//        药品使用记录
+            medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails());
+
+
+            return treatmentMapper.insertTreatmentList(treatments);
+        }
+
     }
 
     /**
@@ -76,8 +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);
     }

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();
-    }
 }

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();
-    }
 }

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();
-    }
 }

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();
-    }
 }

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();
-    }
 }

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();
-    }
 }

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 
 {
     /**

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 
 {
     /**

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 
 {
     /**

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
 {
     /**

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 
 {
     /**

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 
 {
     /**

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java

@@ -0,0 +1,107 @@
+package com.zhyc.module.produce.bodyManage.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zhyc.common.utils.SecurityUtils;
+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.bodyManage.domain.ScBodyMeasure;
+import com.zhyc.module.produce.bodyManage.service.IScBodyMeasureService;
+import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.common.core.page.TableDataInfo;
+
+/**
+ * 体尺测量Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@RestController
+@RequestMapping("/body_measure/body_measure")
+public class ScBodyMeasureController extends BaseController
+{
+    @Autowired
+    private IScBodyMeasureService scBodyMeasureService;
+
+
+    /**
+     * 查询体尺测量列表
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScBodyMeasure scBodyMeasure)
+    {
+        startPage();
+        List<ScBodyMeasure> list = scBodyMeasureService.selectScBodyMeasureList(scBodyMeasure);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出体尺测量列表
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:export')")
+    @Log(title = "体尺测量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScBodyMeasure scBodyMeasure)
+    {
+        List<ScBodyMeasure> list = scBodyMeasureService.selectScBodyMeasureList(scBodyMeasure);
+        ExcelUtil<ScBodyMeasure> util = new ExcelUtil<ScBodyMeasure>(ScBodyMeasure.class);
+        util.exportExcel(response, list, "体尺测量数据");
+    }
+
+    /**
+     * 获取体尺测量详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(scBodyMeasureService.selectScBodyMeasureById(id));
+    }
+
+    /**
+     * 新增体尺测量
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:add')")
+    @Log(title = "体尺测量", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScBodyMeasure scBodyMeasure)
+    {
+        return toAjax(scBodyMeasureService.insertScBodyMeasure(scBodyMeasure));
+    }
+
+    /**
+     * 修改体尺测量
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:edit')")
+    @Log(title = "体尺测量", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScBodyMeasure scBodyMeasure)
+    {
+        return toAjax(scBodyMeasureService.updateScBodyMeasure(scBodyMeasure));
+    }
+
+    /**
+     * 删除体尺测量
+     */
+    @PreAuthorize("@ss.hasPermi('body_measure:body_measure:remove')")
+    @Log(title = "体尺测量", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(scBodyMeasureService.deleteScBodyMeasureByIds(ids));
+    }
+}

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.java

@@ -0,0 +1,104 @@
+package com.zhyc.module.produce.bodyManage.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.bodyManage.domain.ScBodyScore;
+import com.zhyc.module.produce.bodyManage.service.IScBodyScoreService;
+import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.common.core.page.TableDataInfo;
+
+/**
+ * 体况评分Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@RestController
+@RequestMapping("/body_score/body_score")
+public class ScBodyScoreController extends BaseController
+{
+    @Autowired
+    private IScBodyScoreService scBodyScoreService;
+
+    /**
+     * 查询体况评分列表
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScBodyScore scBodyScore)
+    {
+        startPage();
+        List<ScBodyScore> list = scBodyScoreService.selectScBodyScoreList(scBodyScore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出体况评分列表
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:export')")
+    @Log(title = "体况评分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScBodyScore scBodyScore)
+    {
+        List<ScBodyScore> list = scBodyScoreService.selectScBodyScoreList(scBodyScore);
+        ExcelUtil<ScBodyScore> util = new ExcelUtil<ScBodyScore>(ScBodyScore.class);
+        util.exportExcel(response, list, "体况评分数据");
+    }
+
+    /**
+     * 获取体况评分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(scBodyScoreService.selectScBodyScoreById(id));
+    }
+
+    /**
+     * 新增体况评分
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:add')")
+    @Log(title = "体况评分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScBodyScore scBodyScore)
+    {
+        return toAjax(scBodyScoreService.insertScBodyScore(scBodyScore));
+    }
+
+    /**
+     * 修改体况评分
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:edit')")
+    @Log(title = "体况评分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScBodyScore scBodyScore)
+    {
+        return toAjax(scBodyScoreService.updateScBodyScore(scBodyScore));
+    }
+
+    /**
+     * 删除体况评分
+     */
+    @PreAuthorize("@ss.hasPermi('body_score:body_score:remove')")
+    @Log(title = "体况评分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(scBodyScoreService.deleteScBodyScoreByIds(ids));
+    }
+}

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.java

@@ -0,0 +1,104 @@
+package com.zhyc.module.produce.bodyManage.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.bodyManage.domain.ScBreastRating;
+import com.zhyc.module.produce.bodyManage.service.IScBreastRatingService;
+import com.zhyc.common.utils.poi.ExcelUtil;
+import com.zhyc.common.core.page.TableDataInfo;
+
+/**
+ * 乳房评分Controller
+ * 
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@RestController
+@RequestMapping("/breast_rating/breast_rating")
+public class ScBreastRatingController extends BaseController
+{
+    @Autowired
+    private IScBreastRatingService scBreastRatingService;
+
+    /**
+     * 查询乳房评分列表
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScBreastRating scBreastRating)
+    {
+        startPage();
+        List<ScBreastRating> list = scBreastRatingService.selectScBreastRatingList(scBreastRating);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出乳房评分列表
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:export')")
+    @Log(title = "乳房评分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScBreastRating scBreastRating)
+    {
+        List<ScBreastRating> list = scBreastRatingService.selectScBreastRatingList(scBreastRating);
+        ExcelUtil<ScBreastRating> util = new ExcelUtil<ScBreastRating>(ScBreastRating.class);
+        util.exportExcel(response, list, "乳房评分数据");
+    }
+
+    /**
+     * 获取乳房评分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(scBreastRatingService.selectScBreastRatingById(id));
+    }
+
+    /**
+     * 新增乳房评分
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:add')")
+    @Log(title = "乳房评分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScBreastRating scBreastRating)
+    {
+        return toAjax(scBreastRatingService.insertScBreastRating(scBreastRating));
+    }
+
+    /**
+     * 修改乳房评分
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:edit')")
+    @Log(title = "乳房评分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScBreastRating scBreastRating)
+    {
+        return toAjax(scBreastRatingService.updateScBreastRating(scBreastRating));
+    }
+
+    /**
+     * 删除乳房评分
+     */
+    @PreAuthorize("@ss.hasPermi('breast_rating:breast_rating:remove')")
+    @Log(title = "乳房评分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(scBreastRatingService.deleteScBreastRatingByIds(ids));
+    }
+}

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java

@@ -0,0 +1,81 @@
+package com.zhyc.module.produce.bodyManage.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;
+import com.zhyc.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.AccessType;
+
+/**
+ * 体尺测量对象 sc_body_measure
+ * 
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScBodyMeasure extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 耳号 */
+    private Long sheepId;
+    @Excel(name = "耳号")
+    private String manageTags;
+
+    /** 体高 */
+    @Excel(name = "体高")
+    private Long height;
+
+    /** 胸围 */
+    @Excel(name = "胸围")
+    private Long bust;
+
+    /** 体斜长 */
+    @Excel(name = "体斜长")
+    private Long bodyLength;
+
+    /** 管围 */
+    @Excel(name = "管围")
+    private Long pipeLength;
+
+    /** 胸深 */
+    @Excel(name = "胸深")
+    private Long chestDepth;
+
+    /** 臀高 */
+    @Excel(name = "臀高")
+    private Long hipHeight;
+
+    /** 尻宽 */
+    @Excel(name = "尻宽")
+    private Long rumpWidth;
+
+    /** 尻高 */
+    @Excel(name = "尻高")
+    private Long rumpHeignt;
+
+    /** 腰角宽 */
+    @Excel(name = "腰角宽")
+    private Long hipWidth;
+
+    /** 十字部高 */
+    @Excel(name = "十字部高")
+    private Long hipCrossHeight;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String comment;
+
+    /** 技术员 */
+    @Excel(name = "技术员")
+    private String technician;
+
+}

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java

@@ -0,0 +1,68 @@
+package com.zhyc.module.produce.bodyManage.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;
+
+/**
+ * 体况评分对象 sc_body_score
+ *
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScBodyScore extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 羊只id
+     */
+    private String sheepId;
+    @Excel(name = "管理耳号")
+    private String manageTags;
+    /**
+     * 事件日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "事件日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date datetime;
+
+    /**
+     * 体况评分
+     */
+    @Excel(name = "体况评分")
+    private Long score;
+
+    /**
+     * 羊舍id
+     */
+    private Long sheepfold;
+    @Excel(name = "羊舍名称")
+    private String sheepfoldName;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String comment;
+
+    /**
+     * 技术员
+     */
+    @Excel(name = "技术员")
+    private String technician;
+
+}

zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java

@@ -0,0 +1,84 @@
+package com.zhyc.module.produce.bodyManage.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;
+import com.zhyc.common.core.domain.BaseEntity;
+
+/**
+ * 乳房评分对象 sc_breast_rating
+ *
+ * @author ruoyi
+ * @date 2025-07-27
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScBreastRating extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 羊只id
+     */
+
+    private String sheepId;
+    @Excel(name = "羊只id")
+    private String manageTags;
+    /**
+     * 乳房深度
+     */
+    @Excel(name = "乳房深度")
+    private Long depth;
+
+    /**
+     * 乳房长度
+     */
+    @Excel(name = "乳房长度")
+    private Long length;
+
+    /**
+     * 乳房位置
+     */
+    @Excel(name = "乳房位置")
+    private String position;
+
+    /**
+     * 乳房附着
+     */
+    @Excel(name = "乳房附着")
+    private String adbere;
+
+    /**
+     * 乳房间隔度
+     */
+    @Excel(name = "乳房间隔度")
+    private String spacing;
+
+    /**
+     * 乳房评分
+     */
+    @Excel(name = "乳房评分")
+    private Long score;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String comment;
+
+    /**
+     * 技术员
+     */
+    @Excel(name = "技术员")
+    private String technician;
+
+
+}