Merge remote-tracking branch 'origin/main'

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

@@ -16,89 +16,89 @@ 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.sheep_file.domain.BasSheep;
-import com.zhyc.module.sheep_file.service.IBasSheepService;
+import com.zhyc.module.sheep_file.domain.SheepFile;
+import com.zhyc.module.sheep_file.service.ISheepFileService;
 import com.zhyc.common.utils.poi.ExcelUtil;
 import com.zhyc.common.core.page.TableDataInfo;
 
 /**
- * 羊只基本信息Controller
+ * 羊只档案Controller
  * 
- * @author ruoyi
- * @date 2025-07-10
+ * @author wyt
+ * @date 2025-07-13
  */
 @RestController
 @RequestMapping("/sheep_file/sheep_file")
-public class BasSheepController extends BaseController
+public class SheepFileController extends BaseController
 {
     @Autowired
-    private IBasSheepService basSheepService;
+    private ISheepFileService sheepFileService;
 
     /**
-     * 查询羊只基本信息列表
+     * 查询羊只档案列表
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BasSheep basSheep)
+    public TableDataInfo list(SheepFile sheepFile)
     {
         startPage();
-        List<BasSheep> list = basSheepService.selectBasSheepList(basSheep);
+        List<SheepFile> list = sheepFileService.selectSheepFileList(sheepFile);
         return getDataTable(list);
     }
 
     /**
-     * 导出羊只基本信息列表
+     * 导出羊只档案列表
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:export')")
-    @Log(title = "羊只基本信息", businessType = BusinessType.EXPORT)
+    @Log(title = "羊只档案", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BasSheep basSheep)
+    public void export(HttpServletResponse response, SheepFile sheepFile)
     {
-        List<BasSheep> list = basSheepService.selectBasSheepList(basSheep);
-        ExcelUtil<BasSheep> util = new ExcelUtil<BasSheep>(BasSheep.class);
-        util.exportExcel(response, list, "羊只基本信息数据");
+        List<SheepFile> list = sheepFileService.selectSheepFileList(sheepFile);
+        ExcelUtil<SheepFile> util = new ExcelUtil<SheepFile>(SheepFile.class);
+        util.exportExcel(response, list, "羊只档案数据");
     }
 
     /**
-     * 获取羊只基本信息详细信息
+     * 获取羊只档案详细信息
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(basSheepService.selectBasSheepById(id));
+        return success(sheepFileService.selectSheepFileById(id));
     }
 
     /**
-     * 新增羊只基本信息
+     * 新增羊只档案
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:add')")
-    @Log(title = "羊只基本信息", businessType = BusinessType.INSERT)
+    @Log(title = "羊只档案", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BasSheep basSheep)
+    public AjaxResult add(@RequestBody SheepFile sheepFile)
     {
-        return toAjax(basSheepService.insertBasSheep(basSheep));
+        return toAjax(sheepFileService.insertSheepFile(sheepFile));
     }
 
     /**
-     * 修改羊只基本信息
+     * 修改羊只档案
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:edit')")
-    @Log(title = "羊只基本信息", businessType = BusinessType.UPDATE)
+    @Log(title = "羊只档案", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BasSheep basSheep)
+    public AjaxResult edit(@RequestBody SheepFile sheepFile)
     {
-        return toAjax(basSheepService.updateBasSheep(basSheep));
+        return toAjax(sheepFileService.updateSheepFile(sheepFile));
     }
 
     /**
-     * 删除羊只基本信息
+     * 删除羊只档案
      */
     @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:remove')")
-    @Log(title = "羊只基本信息", businessType = BusinessType.DELETE)
+    @Log(title = "羊只档案", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(basSheepService.deleteBasSheepByIds(ids));
+        return toAjax(sheepFileService.deleteSheepFileByIds(ids));
     }
 }

zhyc-module/src/main/java/com/zhyc/module/sheep_file/domain/SheepFile.java

@@ -8,12 +8,12 @@ import com.zhyc.common.annotation.Excel;
 import com.zhyc.common.core.domain.BaseEntity;
 
 /**
- * 羊只基本信息对象 bas_sheep
+ * 羊只档案对象 sheep_file
  * 
- * @author ruoyi
- * @date 2025-07-10
+ * @author wyt
+ * @date 2025-07-13
  */
-public class BasSheep extends BaseEntity
+public class SheepFile extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -22,16 +22,24 @@ public class BasSheep extends BaseEntity
 
     /** 管理耳号 */
     @Excel(name = "管理耳号")
-    private String manageTags;
+    private String bsManageTags;
 
     /** 牧场id */
     @Excel(name = "牧场id")
     private Long ranchId;
 
+    /** 牧场名称 */
+    @Excel(name = "牧场名称")
+    private String drRanch;
+
     /** 羊舍id */
     @Excel(name = "羊舍id")
     private Long sheepfoldId;
 
+    /** 羊舍名称 */
+    @Excel(name = "羊舍名称")
+    private String sheepfoldName;
+
     /** 电子耳号 */
     @Excel(name = "电子耳号")
     private String electronicTags;
@@ -40,13 +48,17 @@ public class BasSheep extends BaseEntity
     @Excel(name = "品种id")
     private Long varietyId;
 
+    /** 品种 */
+    @Excel(name = "品种")
+    private String variety;
+
     /** 家系 */
     @Excel(name = "家系")
     private String family;
 
-    /** 羊只类别 */
-    @Excel(name = "羊只类别")
-    private Long typeId;
+    /** 羊只类型 */
+    @Excel(name = "羊只类型")
+    private String name;
 
     /** 性别 */
     @Excel(name = "性别")
@@ -57,43 +69,103 @@ public class BasSheep extends BaseEntity
     @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date birthday;
 
-    /** 出生体重 */
-    @Excel(name = "出生体重")
-    private Long birthWeight;
+    /** 日龄 */
+    @Excel(name = "日龄")
+    private Long dayAge;
+
+    /** 月龄 */
+    @Excel(name = "月龄")
+    private Long monthAge;
 
     /** 胎次 */
     @Excel(name = "胎次")
     private Long parity;
 
-    /** 羊只状态 */
-    @Excel(name = "羊只状态")
-    private Long statusId;
+    /** 出生体重 */
+    @Excel(name = "出生体重")
+    private Long birthWeight;
 
     /** 断奶日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "断奶日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date weaningDate;
 
+    /** 羊只状态 */
+    @Excel(name = "羊只状态")
+    private Long statusId;
+
     /** 断奶体重 */
     @Excel(name = "断奶体重")
     private Long weaningWeight;
 
+    /** 当前体重 */
+    @Excel(name = "当前体重")
+    private Long currentWeight;
+
     /** 繁育状态id */
     @Excel(name = "繁育状态id")
     private Long breedStatusId;
 
+    /** 繁殖状态 */
+    @Excel(name = "繁殖状态")
+    private String breed;
+
     /** 父号id */
     @Excel(name = "父号id")
-    private Long fatherId;
+    private Long bsFatherId;
+
+    /** 父亲管理耳号 */
+    @Excel(name = "父亲管理耳号")
+    private String fatherManageTags;
 
     /** 母号id */
     @Excel(name = "母号id")
-    private Long motherId;
+    private Long bsMotherId;
+
+    /** 母亲管理耳号 */
+    @Excel(name = "母亲管理耳号")
+    private String motherManageTags;
 
     /** 受体id */
     @Excel(name = "受体id")
     private Long receptorId;
 
+    /** 受体管理耳号 */
+    @Excel(name = "受体管理耳号")
+    private String receptorManageTags;
+
+    /** 祖父号id */
+    @Excel(name = "祖父号id")
+    private Long fatherFatherId;
+
+    /** 祖父管理耳号 */
+    @Excel(name = "祖父管理耳号")
+    private String grandfatherManageTags;
+
+    /** 祖母号id */
+    @Excel(name = "祖母号id")
+    private Long fatherMotherId;
+
+    /** 祖母管理耳号 */
+    @Excel(name = "祖母管理耳号")
+    private String grandmotherManageTags;
+
+    /** 外祖父号id */
+    @Excel(name = "外祖父号id")
+    private Long fatherId;
+
+    /** 外祖父管理耳号 */
+    @Excel(name = "外祖父管理耳号")
+    private String maternalGrandfatherManageTags;
+
+    /** 外祖母号id */
+    @Excel(name = "外祖母号id")
+    private Long motherId;
+
+    /** 外祖母管理耳号 */
+    @Excel(name = "外祖母管理耳号")
+    private String maternalGrandmotherManageTags;
+
     /** 配种日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "配种日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -117,27 +189,51 @@ public class BasSheep extends BaseEntity
     @Excel(name = "产羔时怀孕天数")
     private Long lambingDay;
 
+    /** 配后天数 */
+    @Excel(name = "配后天数")
+    private Long matingDay;
+
+    /** 怀孕天数 */
+    @Excel(name = "怀孕天数")
+    private Long gestationDay;
+
     /** 预产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "预产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedDate;
 
-    /** 是否性控 */
-    @Excel(name = "是否性控")
-    private Long controlled;
+    /** 产后天数 */
+    @Excel(name = "产后天数")
+    private Long postLambingDay;
+
+    /** 泌乳天数 */
+    @Excel(name = "泌乳天数")
+    private Long lactationDay;
+
+    /** 空怀天数 */
+    @Excel(name = "空怀天数")
+    private Long anestrousDay;
 
     /** 配种次数 */
     @Excel(name = "配种次数")
     private Long matingCounts;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 累计配种次数 */
+    @Excel(name = "累计配种次数")
     private Long matingTotal;
 
     /** 累计流产次数 */
     @Excel(name = "累计流产次数")
     private Long miscarriageCounts;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String comment;
+
+    /** 是否性控 */
+    @Excel(name = "是否性控")
+    private Long controlled;
+
     /** 体况评分 */
     @Excel(name = "体况评分")
     private Long body;
@@ -153,18 +249,17 @@ public class BasSheep extends BaseEntity
     /** 入群日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "入群日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date soureDate;
+    private Date sourceDate;
 
     /** 来源牧场id */
     @Excel(name = "来源牧场id")
     private Long sourceRanchId;
 
-    /** 备注 */
-    @Excel(name = "备注")
-    private String comment;
+    /** 来源牧场 */
+    @Excel(name = "来源牧场")
+    private String sourceRanch;
 
     /** 是否删除 */
-    @Excel(name = "是否删除")
     private Long isDelete;
 
     public void setId(Long id) 
@@ -177,14 +272,14 @@ public class BasSheep extends BaseEntity
         return id;
     }
 
-    public void setManageTags(String manageTags) 
+    public void setBsManageTags(String bsManageTags) 
     {
-        this.manageTags = manageTags;
+        this.bsManageTags = bsManageTags;
     }
 
-    public String getManageTags() 
+    public String getBsManageTags() 
     {
-        return manageTags;
+        return bsManageTags;
     }
 
     public void setRanchId(Long ranchId) 
@@ -197,6 +292,16 @@ public class BasSheep extends BaseEntity
         return ranchId;
     }
 
+    public void setDrRanch(String drRanch) 
+    {
+        this.drRanch = drRanch;
+    }
+
+    public String getDrRanch() 
+    {
+        return drRanch;
+    }
+
     public void setSheepfoldId(Long sheepfoldId) 
     {
         this.sheepfoldId = sheepfoldId;
@@ -207,6 +312,16 @@ public class BasSheep extends BaseEntity
         return sheepfoldId;
     }
 
+    public void setSheepfoldName(String sheepfoldName) 
+    {
+        this.sheepfoldName = sheepfoldName;
+    }
+
+    public String getSheepfoldName() 
+    {
+        return sheepfoldName;
+    }
+
     public void setElectronicTags(String electronicTags) 
     {
         this.electronicTags = electronicTags;
@@ -227,6 +342,16 @@ public class BasSheep extends BaseEntity
         return varietyId;
     }
 
+    public void setVariety(String variety) 
+    {
+        this.variety = variety;
+    }
+
+    public String getVariety() 
+    {
+        return variety;
+    }
+
     public void setFamily(String family) 
     {
         this.family = family;
@@ -237,14 +362,14 @@ public class BasSheep extends BaseEntity
         return family;
     }
 
-    public void setTypeId(Long typeId) 
+    public void setName(String name) 
     {
-        this.typeId = typeId;
+        this.name = name;
     }
 
-    public Long getTypeId() 
+    public String getName() 
     {
-        return typeId;
+        return name;
     }
 
     public void setGender(Long gender) 
@@ -267,14 +392,24 @@ public class BasSheep extends BaseEntity
         return birthday;
     }
 
-    public void setBirthWeight(Long birthWeight) 
+    public void setDayAge(Long dayAge) 
     {
-        this.birthWeight = birthWeight;
+        this.dayAge = dayAge;
     }
 
-    public Long getBirthWeight() 
+    public Long getDayAge() 
     {
-        return birthWeight;
+        return dayAge;
+    }
+
+    public void setMonthAge(Long monthAge) 
+    {
+        this.monthAge = monthAge;
+    }
+
+    public Long getMonthAge() 
+    {
+        return monthAge;
     }
 
     public void setParity(Long parity) 
@@ -287,14 +422,14 @@ public class BasSheep extends BaseEntity
         return parity;
     }
 
-    public void setStatusId(Long statusId) 
+    public void setBirthWeight(Long birthWeight) 
     {
-        this.statusId = statusId;
+        this.birthWeight = birthWeight;
     }
 
-    public Long getStatusId() 
+    public Long getBirthWeight() 
     {
-        return statusId;
+        return birthWeight;
     }
 
     public void setWeaningDate(Date weaningDate) 
@@ -307,6 +442,16 @@ public class BasSheep extends BaseEntity
         return weaningDate;
     }
 
+    public void setStatusId(Long statusId) 
+    {
+        this.statusId = statusId;
+    }
+
+    public Long getStatusId() 
+    {
+        return statusId;
+    }
+
     public void setWeaningWeight(Long weaningWeight) 
     {
         this.weaningWeight = weaningWeight;
@@ -317,6 +462,16 @@ public class BasSheep extends BaseEntity
         return weaningWeight;
     }
 
+    public void setCurrentWeight(Long currentWeight) 
+    {
+        this.currentWeight = currentWeight;
+    }
+
+    public Long getCurrentWeight() 
+    {
+        return currentWeight;
+    }
+
     public void setBreedStatusId(Long breedStatusId) 
     {
         this.breedStatusId = breedStatusId;
@@ -327,6 +482,116 @@ public class BasSheep extends BaseEntity
         return breedStatusId;
     }
 
+    public void setBreed(String breed) 
+    {
+        this.breed = breed;
+    }
+
+    public String getBreed() 
+    {
+        return breed;
+    }
+
+    public void setBsFatherId(Long bsFatherId) 
+    {
+        this.bsFatherId = bsFatherId;
+    }
+
+    public Long getBsFatherId() 
+    {
+        return bsFatherId;
+    }
+
+    public void setFatherManageTags(String fatherManageTags) 
+    {
+        this.fatherManageTags = fatherManageTags;
+    }
+
+    public String getFatherManageTags() 
+    {
+        return fatherManageTags;
+    }
+
+    public void setBsMotherId(Long bsMotherId) 
+    {
+        this.bsMotherId = bsMotherId;
+    }
+
+    public Long getBsMotherId() 
+    {
+        return bsMotherId;
+    }
+
+    public void setMotherManageTags(String motherManageTags) 
+    {
+        this.motherManageTags = motherManageTags;
+    }
+
+    public String getMotherManageTags() 
+    {
+        return motherManageTags;
+    }
+
+    public void setReceptorId(Long receptorId) 
+    {
+        this.receptorId = receptorId;
+    }
+
+    public Long getReceptorId() 
+    {
+        return receptorId;
+    }
+
+    public void setReceptorManageTags(String receptorManageTags) 
+    {
+        this.receptorManageTags = receptorManageTags;
+    }
+
+    public String getReceptorManageTags() 
+    {
+        return receptorManageTags;
+    }
+
+    public void setFatherFatherId(Long fatherFatherId) 
+    {
+        this.fatherFatherId = fatherFatherId;
+    }
+
+    public Long getFatherFatherId() 
+    {
+        return fatherFatherId;
+    }
+
+    public void setGrandfatherManageTags(String grandfatherManageTags) 
+    {
+        this.grandfatherManageTags = grandfatherManageTags;
+    }
+
+    public String getGrandfatherManageTags() 
+    {
+        return grandfatherManageTags;
+    }
+
+    public void setFatherMotherId(Long fatherMotherId) 
+    {
+        this.fatherMotherId = fatherMotherId;
+    }
+
+    public Long getFatherMotherId() 
+    {
+        return fatherMotherId;
+    }
+
+    public void setGrandmotherManageTags(String grandmotherManageTags) 
+    {
+        this.grandmotherManageTags = grandmotherManageTags;
+    }
+
+    public String getGrandmotherManageTags() 
+    {
+        return grandmotherManageTags;
+    }
+
     public void setFatherId(Long fatherId) 
     {
         this.fatherId = fatherId;
@@ -337,6 +602,16 @@ public class BasSheep extends BaseEntity
         return fatherId;
     }
 
+    public void setMaternalGrandfatherManageTags(String maternalGrandfatherManageTags) 
+    {
+        this.maternalGrandfatherManageTags = maternalGrandfatherManageTags;
+    }
+
+    public String getMaternalGrandfatherManageTags() 
+    {
+        return maternalGrandfatherManageTags;
+    }
+
     public void setMotherId(Long motherId) 
     {
         this.motherId = motherId;
@@ -347,14 +622,14 @@ public class BasSheep extends BaseEntity
         return motherId;
     }
 
-    public void setReceptorId(Long receptorId) 
+    public void setMaternalGrandmotherManageTags(String maternalGrandmotherManageTags) 
     {
-        this.receptorId = receptorId;
+        this.maternalGrandmotherManageTags = maternalGrandmotherManageTags;
     }
 
-    public Long getReceptorId() 
+    public String getMaternalGrandmotherManageTags() 
     {
-        return receptorId;
+        return maternalGrandmotherManageTags;
     }
 
     public void setMatingDate(Date matingDate) 
@@ -407,6 +682,26 @@ public class BasSheep extends BaseEntity
         return lambingDay;
     }
 
+    public void setMatingDay(Long matingDay) 
+    {
+        this.matingDay = matingDay;
+    }
+
+    public Long getMatingDay() 
+    {
+        return matingDay;
+    }
+
+    public void setGestationDay(Long gestationDay) 
+    {
+        this.gestationDay = gestationDay;
+    }
+
+    public Long getGestationDay() 
+    {
+        return gestationDay;
+    }
+
     public void setExpectedDate(Date expectedDate) 
     {
         this.expectedDate = expectedDate;
@@ -417,14 +712,34 @@ public class BasSheep extends BaseEntity
         return expectedDate;
     }
 
-    public void setControlled(Long controlled) 
+    public void setPostLambingDay(Long postLambingDay) 
     {
-        this.controlled = controlled;
+        this.postLambingDay = postLambingDay;
     }
 
-    public Long getControlled() 
+    public Long getPostLambingDay() 
     {
-        return controlled;
+        return postLambingDay;
+    }
+
+    public void setLactationDay(Long lactationDay) 
+    {
+        this.lactationDay = lactationDay;
+    }
+
+    public Long getLactationDay() 
+    {
+        return lactationDay;
+    }
+
+    public void setAnestrousDay(Long anestrousDay) 
+    {
+        this.anestrousDay = anestrousDay;
+    }
+
+    public Long getAnestrousDay() 
+    {
+        return anestrousDay;
     }
 
     public void setMatingCounts(Long matingCounts) 
@@ -457,6 +772,26 @@ public class BasSheep extends BaseEntity
         return miscarriageCounts;
     }
 
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+
+    public void setControlled(Long controlled) 
+    {
+        this.controlled = controlled;
+    }
+
+    public Long getControlled() 
+    {
+        return controlled;
+    }
+
     public void setBody(Long body) 
     {
         this.body = body;
@@ -487,14 +822,14 @@ public class BasSheep extends BaseEntity
         return source;
     }
 
-    public void setSoureDate(Date soureDate) 
+    public void setSourceDate(Date sourceDate) 
     {
-        this.soureDate = soureDate;
+        this.sourceDate = sourceDate;
     }
 
-    public Date getSoureDate() 
+    public Date getSourceDate() 
     {
-        return soureDate;
+        return sourceDate;
     }
 
     public void setSourceRanchId(Long sourceRanchId) 
@@ -507,14 +842,14 @@ public class BasSheep extends BaseEntity
         return sourceRanchId;
     }
 
-    public void setComment(String comment) 
+    public void setSourceRanch(String sourceRanch) 
     {
-        this.comment = comment;
+        this.sourceRanch = sourceRanch;
     }
 
-    public String getComment() 
+    public String getSourceRanch() 
     {
-        return comment;
+        return sourceRanch;
     }
 
     public void setIsDelete(Long isDelete) 
@@ -531,40 +866,64 @@ public class BasSheep extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("manageTags", getManageTags())
+            .append("bsManageTags", getBsManageTags())
             .append("ranchId", getRanchId())
+            .append("drRanch", getDrRanch())
             .append("sheepfoldId", getSheepfoldId())
+            .append("sheepfoldName", getSheepfoldName())
             .append("electronicTags", getElectronicTags())
             .append("varietyId", getVarietyId())
+            .append("variety", getVariety())
             .append("family", getFamily())
-            .append("typeId", getTypeId())
+            .append("name", getName())
             .append("gender", getGender())
             .append("birthday", getBirthday())
-            .append("birthWeight", getBirthWeight())
+            .append("dayAge", getDayAge())
+            .append("monthAge", getMonthAge())
             .append("parity", getParity())
-            .append("statusId", getStatusId())
+            .append("birthWeight", getBirthWeight())
             .append("weaningDate", getWeaningDate())
+            .append("statusId", getStatusId())
             .append("weaningWeight", getWeaningWeight())
+            .append("currentWeight", getCurrentWeight())
             .append("breedStatusId", getBreedStatusId())
-            .append("fatherId", getFatherId())
-            .append("motherId", getMotherId())
+            .append("breed", getBreed())
+            .append("bsFatherId", getBsFatherId())
+            .append("fatherManageTags", getFatherManageTags())
+            .append("bsMotherId", getBsMotherId())
+            .append("motherManageTags", getMotherManageTags())
             .append("receptorId", getReceptorId())
+            .append("receptorManageTags", getReceptorManageTags())
+            .append("fatherFatherId", getFatherFatherId())
+            .append("grandfatherManageTags", getGrandfatherManageTags())
+            .append("fatherMotherId", getFatherMotherId())
+            .append("grandmotherManageTags", getGrandmotherManageTags())
+            .append("fatherId", getFatherId())
+            .append("maternalGrandfatherManageTags", getMaternalGrandfatherManageTags())
+            .append("motherId", getMotherId())
+            .append("maternalGrandmotherManageTags", getMaternalGrandmotherManageTags())
             .append("matingDate", getMatingDate())
             .append("matingTypeId", getMatingTypeId())
             .append("pregDate", getPregDate())
             .append("lambingDate", getLambingDate())
             .append("lambingDay", getLambingDay())
+            .append("matingDay", getMatingDay())
+            .append("gestationDay", getGestationDay())
             .append("expectedDate", getExpectedDate())
-            .append("controlled", getControlled())
+            .append("postLambingDay", getPostLambingDay())
+            .append("lactationDay", getLactationDay())
+            .append("anestrousDay", getAnestrousDay())
             .append("matingCounts", getMatingCounts())
             .append("matingTotal", getMatingTotal())
             .append("miscarriageCounts", getMiscarriageCounts())
+            .append("comment", getComment())
+            .append("controlled", getControlled())
             .append("body", getBody())
             .append("breast", getBreast())
             .append("source", getSource())
-            .append("soureDate", getSoureDate())
+            .append("sourceDate", getSourceDate())
             .append("sourceRanchId", getSourceRanchId())
-            .append("comment", getComment())
+            .append("sourceRanch", getSourceRanch())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("createBy", getCreateBy())

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

@@ -1,61 +0,0 @@
-package com.zhyc.module.sheep_file.mapper;
-
-import java.util.List;
-import com.zhyc.module.sheep_file.domain.BasSheep;
-
-/**
- * 羊只基本信息Mapper接口
- * 
- * @author ruoyi
- * @date 2025-07-10
- */
-public interface BasSheepMapper 
-{
-    /**
-     * 查询羊只基本信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 羊只基本信息
-     */
-    public BasSheep selectBasSheepById(Long id);
-
-    /**
-     * 查询羊只基本信息列表
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 羊只基本信息集合
-     */
-    public List<BasSheep> selectBasSheepList(BasSheep basSheep);
-
-    /**
-     * 新增羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    public int insertBasSheep(BasSheep basSheep);
-
-    /**
-     * 修改羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    public int updateBasSheep(BasSheep basSheep);
-
-    /**
-     * 删除羊只基本信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 结果
-     */
-    public int deleteBasSheepById(Long id);
-
-    /**
-     * 批量删除羊只基本信息
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBasSheepByIds(Long[] ids);
-}

zhyc-module/src/main/java/com/zhyc/module/sheep_file/mapper/SheepFileMapper.java

@@ -0,0 +1,61 @@
+package com.zhyc.module.sheep_file.mapper;
+
+import java.util.List;
+import com.zhyc.module.sheep_file.domain.SheepFile;
+
+/**
+ * 羊只档案Mapper接口
+ * 
+ * @author wyt
+ * @date 2025-07-13
+ */
+public interface SheepFileMapper 
+{
+    /**
+     * 查询羊只档案
+     * 
+     * @param id 羊只档案主键
+     * @return 羊只档案
+     */
+    public SheepFile selectSheepFileById(Long id);
+
+    /**
+     * 查询羊只档案列表
+     * 
+     * @param sheepFile 羊只档案
+     * @return 羊只档案集合
+     */
+    public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
+
+    /**
+     * 新增羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    public int insertSheepFile(SheepFile sheepFile);
+
+    /**
+     * 修改羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    public int updateSheepFile(SheepFile sheepFile);
+
+    /**
+     * 删除羊只档案
+     * 
+     * @param id 羊只档案主键
+     * @return 结果
+     */
+    public int deleteSheepFileById(Long id);
+
+    /**
+     * 批量删除羊只档案
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSheepFileByIds(Long[] ids);
+}

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

@@ -1,61 +0,0 @@
-package com.zhyc.module.sheep_file.service;
-
-import java.util.List;
-import com.zhyc.module.sheep_file.domain.BasSheep;
-
-/**
- * 羊只基本信息Service接口
- * 
- * @author ruoyi
- * @date 2025-07-10
- */
-public interface IBasSheepService 
-{
-    /**
-     * 查询羊只基本信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 羊只基本信息
-     */
-    public BasSheep selectBasSheepById(Long id);
-
-    /**
-     * 查询羊只基本信息列表
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 羊只基本信息集合
-     */
-    public List<BasSheep> selectBasSheepList(BasSheep basSheep);
-
-    /**
-     * 新增羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    public int insertBasSheep(BasSheep basSheep);
-
-    /**
-     * 修改羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    public int updateBasSheep(BasSheep basSheep);
-
-    /**
-     * 批量删除羊只基本信息
-     * 
-     * @param ids 需要删除的羊只基本信息主键集合
-     * @return 结果
-     */
-    public int deleteBasSheepByIds(Long[] ids);
-
-    /**
-     * 删除羊只基本信息信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 结果
-     */
-    public int deleteBasSheepById(Long id);
-}

zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/ISheepFileService.java

@@ -0,0 +1,61 @@
+package com.zhyc.module.sheep_file.service;
+
+import java.util.List;
+import com.zhyc.module.sheep_file.domain.SheepFile;
+
+/**
+ * 羊只档案Service接口
+ * 
+ * @author wyt
+ * @date 2025-07-13
+ */
+public interface ISheepFileService 
+{
+    /**
+     * 查询羊只档案
+     * 
+     * @param id 羊只档案主键
+     * @return 羊只档案
+     */
+    public SheepFile selectSheepFileById(Long id);
+
+    /**
+     * 查询羊只档案列表
+     * 
+     * @param sheepFile 羊只档案
+     * @return 羊只档案集合
+     */
+    public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
+
+    /**
+     * 新增羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    public int insertSheepFile(SheepFile sheepFile);
+
+    /**
+     * 修改羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    public int updateSheepFile(SheepFile sheepFile);
+
+    /**
+     * 批量删除羊只档案
+     * 
+     * @param ids 需要删除的羊只档案主键集合
+     * @return 结果
+     */
+    public int deleteSheepFileByIds(Long[] ids);
+
+    /**
+     * 删除羊只档案信息
+     * 
+     * @param id 羊只档案主键
+     * @return 结果
+     */
+    public int deleteSheepFileById(Long id);
+}

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

@@ -1,96 +0,0 @@
-package com.zhyc.module.sheep_file.service.impl;
-
-import java.util.List;
-import com.zhyc.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zhyc.module.sheep_file.mapper.BasSheepMapper;
-import com.zhyc.module.sheep_file.domain.BasSheep;
-import com.zhyc.module.sheep_file.service.IBasSheepService;
-
-/**
- * 羊只基本信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2025-07-10
- */
-@Service
-public class BasSheepServiceImpl implements IBasSheepService 
-{
-    @Autowired
-    private BasSheepMapper basSheepMapper;
-
-    /**
-     * 查询羊只基本信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 羊只基本信息
-     */
-    @Override
-    public BasSheep selectBasSheepById(Long id)
-    {
-        return basSheepMapper.selectBasSheepById(id);
-    }
-
-    /**
-     * 查询羊只基本信息列表
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 羊只基本信息
-     */
-    @Override
-    public List<BasSheep> selectBasSheepList(BasSheep basSheep)
-    {
-        return basSheepMapper.selectBasSheepList(basSheep);
-    }
-
-    /**
-     * 新增羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    @Override
-    public int insertBasSheep(BasSheep basSheep)
-    {
-        basSheep.setCreateTime(DateUtils.getNowDate());
-        return basSheepMapper.insertBasSheep(basSheep);
-    }
-
-    /**
-     * 修改羊只基本信息
-     * 
-     * @param basSheep 羊只基本信息
-     * @return 结果
-     */
-    @Override
-    public int updateBasSheep(BasSheep basSheep)
-    {
-        basSheep.setUpdateTime(DateUtils.getNowDate());
-        return basSheepMapper.updateBasSheep(basSheep);
-    }
-
-    /**
-     * 批量删除羊只基本信息
-     * 
-     * @param ids 需要删除的羊只基本信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBasSheepByIds(Long[] ids)
-    {
-        return basSheepMapper.deleteBasSheepByIds(ids);
-    }
-
-    /**
-     * 删除羊只基本信息信息
-     * 
-     * @param id 羊只基本信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBasSheepById(Long id)
-    {
-        return basSheepMapper.deleteBasSheepById(id);
-    }
-}

zhyc-module/src/main/java/com/zhyc/module/sheep_file/service/impl/SheepFileServiceImpl.java

@@ -0,0 +1,96 @@
+package com.zhyc.module.sheep_file.service.impl;
+
+import java.util.List;
+import com.zhyc.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhyc.module.sheep_file.mapper.SheepFileMapper;
+import com.zhyc.module.sheep_file.domain.SheepFile;
+import com.zhyc.module.sheep_file.service.ISheepFileService;
+
+/**
+ * 羊只档案Service业务层处理
+ * 
+ * @author wyt
+ * @date 2025-07-13
+ */
+@Service
+public class SheepFileServiceImpl implements ISheepFileService 
+{
+    @Autowired
+    private SheepFileMapper sheepFileMapper;
+
+    /**
+     * 查询羊只档案
+     * 
+     * @param id 羊只档案主键
+     * @return 羊只档案
+     */
+    @Override
+    public SheepFile selectSheepFileById(Long id)
+    {
+        return sheepFileMapper.selectSheepFileById(id);
+    }
+
+    /**
+     * 查询羊只档案列表
+     * 
+     * @param sheepFile 羊只档案
+     * @return 羊只档案
+     */
+    @Override
+    public List<SheepFile> selectSheepFileList(SheepFile sheepFile)
+    {
+        return sheepFileMapper.selectSheepFileList(sheepFile);
+    }
+
+    /**
+     * 新增羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    @Override
+    public int insertSheepFile(SheepFile sheepFile)
+    {
+        sheepFile.setCreateTime(DateUtils.getNowDate());
+        return sheepFileMapper.insertSheepFile(sheepFile);
+    }
+
+    /**
+     * 修改羊只档案
+     * 
+     * @param sheepFile 羊只档案
+     * @return 结果
+     */
+    @Override
+    public int updateSheepFile(SheepFile sheepFile)
+    {
+        sheepFile.setUpdateTime(DateUtils.getNowDate());
+        return sheepFileMapper.updateSheepFile(sheepFile);
+    }
+
+    /**
+     * 批量删除羊只档案
+     * 
+     * @param ids 需要删除的羊只档案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSheepFileByIds(Long[] ids)
+    {
+        return sheepFileMapper.deleteSheepFileByIds(ids);
+    }
+
+    /**
+     * 删除羊只档案信息
+     * 
+     * @param id 羊只档案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSheepFileById(Long id)
+    {
+        return sheepFileMapper.deleteSheepFileById(id);
+    }
+}

zhyc-module/src/main/resources/mapper/sheep_file/SheepFileMapper.xml

@@ -2,44 +2,68 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhyc.module.sheep_file.mapper.BasSheepMapper">
+<mapper namespace="com.zhyc.module.sheep_file.mapper.SheepFileMapper">
     
-    <resultMap type="BasSheep" id="BasSheepResult">
+    <resultMap type="SheepFile" id="SheepFileResult">
         <result property="id"    column="id"    />
-        <result property="manageTags"    column="manage_tags"    />
+        <result property="bsManageTags"    column="bs_manage_tags"    />
         <result property="ranchId"    column="ranch_id"    />
+        <result property="drRanch"    column="dr_ranch"    />
         <result property="sheepfoldId"    column="sheepfold_id"    />
+        <result property="sheepfoldName"    column="sheepfold_name"    />
         <result property="electronicTags"    column="electronic_tags"    />
         <result property="varietyId"    column="variety_id"    />
+        <result property="variety"    column="variety"    />
         <result property="family"    column="family"    />
-        <result property="typeId"    column="type_id"    />
+        <result property="name"    column="name"    />
         <result property="gender"    column="gender"    />
         <result property="birthday"    column="birthday"    />
-        <result property="birthWeight"    column="birth_weight"    />
+        <result property="dayAge"    column="day_age"    />
+        <result property="monthAge"    column="month_age"    />
         <result property="parity"    column="parity"    />
-        <result property="statusId"    column="status_id"    />
+        <result property="birthWeight"    column="birth_weight"    />
         <result property="weaningDate"    column="weaning_date"    />
+        <result property="statusId"    column="status_id"    />
         <result property="weaningWeight"    column="weaning_weight"    />
+        <result property="currentWeight"    column="current_weight"    />
         <result property="breedStatusId"    column="breed_status_id"    />
-        <result property="fatherId"    column="father_id"    />
-        <result property="motherId"    column="mother_id"    />
+        <result property="breed"    column="breed"    />
+        <result property="bsFatherId"    column="bs_father_id"    />
+        <result property="fatherManageTags"    column="father_manage_tags"    />
+        <result property="bsMotherId"    column="bs_mother_id"    />
+        <result property="motherManageTags"    column="mother_manage_tags"    />
         <result property="receptorId"    column="receptor_id"    />
+        <result property="receptorManageTags"    column="receptor_manage_tags"    />
+        <result property="fatherFatherId"    column="father_father_id"    />
+        <result property="grandfatherManageTags"    column="grandfather_manage_tags"    />
+        <result property="fatherMotherId"    column="father_mother_id"    />
+        <result property="grandmotherManageTags"    column="grandmother_manage_tags"    />
+        <result property="fatherId"    column="father_id"    />
+        <result property="maternalGrandfatherManageTags"    column="maternal_grandfather_manage_tags"    />
+        <result property="motherId"    column="mother_id"    />
+        <result property="maternalGrandmotherManageTags"    column="maternal_grandmother_manage_tags"    />
         <result property="matingDate"    column="mating_date"    />
         <result property="matingTypeId"    column="mating_type_id"    />
         <result property="pregDate"    column="preg_date"    />
         <result property="lambingDate"    column="lambing_date"    />
         <result property="lambingDay"    column="lambing_day"    />
+        <result property="matingDay"    column="mating_day"    />
+        <result property="gestationDay"    column="gestation_day"    />
         <result property="expectedDate"    column="expected_date"    />
-        <result property="controlled"    column="controlled"    />
+        <result property="postLambingDay"    column="post_lambing_day"    />
+        <result property="lactationDay"    column="lactation_day"    />
+        <result property="anestrousDay"    column="anestrous_day"    />
         <result property="matingCounts"    column="mating_counts"    />
         <result property="matingTotal"    column="mating_total"    />
         <result property="miscarriageCounts"    column="miscarriage_counts"    />
+        <result property="comment"    column="comment"    />
+        <result property="controlled"    column="controlled"    />
         <result property="body"    column="body"    />
         <result property="breast"    column="breast"    />
         <result property="source"    column="source"    />
-        <result property="soureDate"    column="soure_date"    />
+        <result property="sourceDate"    column="source_date"    />
         <result property="sourceRanchId"    column="source_ranch_id"    />
-        <result property="comment"    column="comment"    />
+        <result property="sourceRanch"    column="source_ranch"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
@@ -47,93 +71,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDelete"    column="is_delete"    />
     </resultMap>
 
-    <sql id="selectBasSheepVo">
-        select id, manage_tags, ranch_id, sheepfold_id, electronic_tags, variety_id, family, type_id, gender, birthday, birth_weight, parity, status_id, weaning_date, weaning_weight, breed_status_id, father_id, mother_id, receptor_id, mating_date, mating_type_id, preg_date, lambing_date, lambing_day, expected_date, controlled, mating_counts, mating_total, miscarriage_counts, body, breast, source, soure_date, source_ranch_id, comment, update_by, update_time, create_by, create_time, is_delete from bas_sheep
+    <sql id="selectSheepFileVo">
+        select id, bs_manage_tags, ranch_id, dr_ranch, sheepfold_id, sheepfold_name, electronic_tags, variety_id, variety, family, name, gender, birthday, day_age, month_age, parity, birth_weight, weaning_date, status_id, weaning_weight, current_weight, breed_status_id, breed, bs_father_id, father_manage_tags, bs_mother_id, mother_manage_tags, receptor_id, receptor_manage_tags, father_father_id, grandfather_manage_tags, father_mother_id, grandmother_manage_tags, father_id, maternal_grandfather_manage_tags, mother_id, maternal_grandmother_manage_tags, mating_date, mating_type_id, preg_date, lambing_date, lambing_day, mating_day, gestation_day, expected_date, post_lambing_day, lactation_day, anestrous_day, mating_counts, mating_total, miscarriage_counts, comment, controlled, body, breast, source, source_date, source_ranch_id, source_ranch, update_by, update_time, create_by, create_time, is_delete from sheep_file
     </sql>
 
-    <select id="selectBasSheepList" parameterType="BasSheep" resultMap="BasSheepResult">
-        <include refid="selectBasSheepVo"/>
+    <select id="selectSheepFileList" parameterType="SheepFile" resultMap="SheepFileResult">
+        <include refid="selectSheepFileVo"/>
         <where>  
-            <if test="manageTags != null  and manageTags != ''"> and manage_tags = #{manageTags}</if>
-            <if test="ranchId != null "> and ranch_id = #{ranchId}</if>
-            <if test="sheepfoldId != null "> and sheepfold_id = #{sheepfoldId}</if>
+            <if test="id != null "> and id = #{id}</if>
+            <if test="bsManageTags != null  and bsManageTags != ''"> and bs_manage_tags = #{bsManageTags}</if>
+            <if test="drRanch != null  and drRanch != ''"> and dr_ranch = #{drRanch}</if>
             <if test="electronicTags != null  and electronicTags != ''"> and electronic_tags = #{electronicTags}</if>
-            <if test="varietyId != null "> and variety_id = #{varietyId}</if>
-            <if test="family != null  and family != ''"> and family = #{family}</if>
-            <if test="typeId != null "> and type_id = #{typeId}</if>
+            <if test="variety != null  and variety != ''"> and variety = #{variety}</if>
+            <if test="name != null  and name != ''"> and name = #{name}</if>
             <if test="gender != null "> and gender = #{gender}</if>
-            <if test="birthday != null "> and birthday = #{birthday}</if>
-            <if test="birthWeight != null "> and birth_weight = #{birthWeight}</if>
-            <if test="parity != null "> and parity = #{parity}</if>
             <if test="statusId != null "> and status_id = #{statusId}</if>
-            <if test="weaningDate != null "> and weaning_date = #{weaningDate}</if>
-            <if test="weaningWeight != null "> and weaning_weight = #{weaningWeight}</if>
-            <if test="breedStatusId != null "> and breed_status_id = #{breedStatusId}</if>
-            <if test="fatherId != null "> and father_id = #{fatherId}</if>
-            <if test="motherId != null "> and mother_id = #{motherId}</if>
-            <if test="receptorId != null "> and receptor_id = #{receptorId}</if>
-            <if test="matingDate != null "> and mating_date = #{matingDate}</if>
-            <if test="matingTypeId != null "> and mating_type_id = #{matingTypeId}</if>
-            <if test="pregDate != null "> and preg_date = #{pregDate}</if>
-            <if test="lambingDate != null "> and lambing_date = #{lambingDate}</if>
-            <if test="lambingDay != null "> and lambing_day = #{lambingDay}</if>
-            <if test="expectedDate != null "> and expected_date = #{expectedDate}</if>
-            <if test="controlled != null "> and controlled = #{controlled}</if>
-            <if test="matingCounts != null "> and mating_counts = #{matingCounts}</if>
-            <if test="matingTotal != null "> and mating_total = #{matingTotal}</if>
-            <if test="miscarriageCounts != null "> and miscarriage_counts = #{miscarriageCounts}</if>
-            <if test="body != null "> and body = #{body}</if>
-            <if test="breast != null "> and breast = #{breast}</if>
-            <if test="source != null  and source != ''"> and source = #{source}</if>
-            <if test="soureDate != null "> and soure_date = #{soureDate}</if>
-            <if test="sourceRanchId != null "> and source_ranch_id = #{sourceRanchId}</if>
-            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+            <if test="breed != null  and breed != ''"> and breed = #{breed}</if>
         </where>
     </select>
     
-    <select id="selectBasSheepById" parameterType="Long" resultMap="BasSheepResult">
-        <include refid="selectBasSheepVo"/>
+    <select id="selectSheepFileById" parameterType="Long" resultMap="SheepFileResult">
+        <include refid="selectSheepFileVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertBasSheep" parameterType="BasSheep" useGeneratedKeys="true" keyProperty="id">
-        insert into bas_sheep
+    <insert id="insertSheepFile" parameterType="SheepFile">
+        insert into sheep_file
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="manageTags != null">manage_tags,</if>
+            <if test="id != null">id,</if>
+            <if test="bsManageTags != null">bs_manage_tags,</if>
             <if test="ranchId != null">ranch_id,</if>
+            <if test="drRanch != null">dr_ranch,</if>
             <if test="sheepfoldId != null">sheepfold_id,</if>
+            <if test="sheepfoldName != null">sheepfold_name,</if>
             <if test="electronicTags != null">electronic_tags,</if>
             <if test="varietyId != null">variety_id,</if>
+            <if test="variety != null">variety,</if>
             <if test="family != null">family,</if>
-            <if test="typeId != null">type_id,</if>
+            <if test="name != null">name,</if>
             <if test="gender != null">gender,</if>
             <if test="birthday != null">birthday,</if>
-            <if test="birthWeight != null">birth_weight,</if>
+            <if test="dayAge != null">day_age,</if>
+            <if test="monthAge != null">month_age,</if>
             <if test="parity != null">parity,</if>
-            <if test="statusId != null">status_id,</if>
+            <if test="birthWeight != null">birth_weight,</if>
             <if test="weaningDate != null">weaning_date,</if>
+            <if test="statusId != null">status_id,</if>
             <if test="weaningWeight != null">weaning_weight,</if>
+            <if test="currentWeight != null">current_weight,</if>
             <if test="breedStatusId != null">breed_status_id,</if>
-            <if test="fatherId != null">father_id,</if>
-            <if test="motherId != null">mother_id,</if>
+            <if test="breed != null">breed,</if>
+            <if test="bsFatherId != null">bs_father_id,</if>
+            <if test="fatherManageTags != null">father_manage_tags,</if>
+            <if test="bsMotherId != null">bs_mother_id,</if>
+            <if test="motherManageTags != null">mother_manage_tags,</if>
             <if test="receptorId != null">receptor_id,</if>
+            <if test="receptorManageTags != null">receptor_manage_tags,</if>
+            <if test="fatherFatherId != null">father_father_id,</if>
+            <if test="grandfatherManageTags != null">grandfather_manage_tags,</if>
+            <if test="fatherMotherId != null">father_mother_id,</if>
+            <if test="grandmotherManageTags != null">grandmother_manage_tags,</if>
+            <if test="fatherId != null">father_id,</if>
+            <if test="maternalGrandfatherManageTags != null">maternal_grandfather_manage_tags,</if>
+            <if test="motherId != null">mother_id,</if>
+            <if test="maternalGrandmotherManageTags != null">maternal_grandmother_manage_tags,</if>
             <if test="matingDate != null">mating_date,</if>
             <if test="matingTypeId != null">mating_type_id,</if>
             <if test="pregDate != null">preg_date,</if>
             <if test="lambingDate != null">lambing_date,</if>
             <if test="lambingDay != null">lambing_day,</if>
+            <if test="matingDay != null">mating_day,</if>
+            <if test="gestationDay != null">gestation_day,</if>
             <if test="expectedDate != null">expected_date,</if>
-            <if test="controlled != null">controlled,</if>
+            <if test="postLambingDay != null">post_lambing_day,</if>
+            <if test="lactationDay != null">lactation_day,</if>
+            <if test="anestrousDay != null">anestrous_day,</if>
             <if test="matingCounts != null">mating_counts,</if>
             <if test="matingTotal != null">mating_total,</if>
             <if test="miscarriageCounts != null">miscarriage_counts,</if>
+            <if test="comment != null">comment,</if>
+            <if test="controlled != null">controlled,</if>
             <if test="body != null">body,</if>
             <if test="breast != null">breast,</if>
             <if test="source != null">source,</if>
-            <if test="soureDate != null">soure_date,</if>
+            <if test="sourceDate != null">source_date,</if>
             <if test="sourceRanchId != null">source_ranch_id,</if>
-            <if test="comment != null">comment,</if>
+            <if test="sourceRanch != null">source_ranch,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
@@ -141,40 +164,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDelete != null">is_delete,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="manageTags != null">#{manageTags},</if>
+            <if test="id != null">#{id},</if>
+            <if test="bsManageTags != null">#{bsManageTags},</if>
             <if test="ranchId != null">#{ranchId},</if>
+            <if test="drRanch != null">#{drRanch},</if>
             <if test="sheepfoldId != null">#{sheepfoldId},</if>
+            <if test="sheepfoldName != null">#{sheepfoldName},</if>
             <if test="electronicTags != null">#{electronicTags},</if>
             <if test="varietyId != null">#{varietyId},</if>
+            <if test="variety != null">#{variety},</if>
             <if test="family != null">#{family},</if>
-            <if test="typeId != null">#{typeId},</if>
+            <if test="name != null">#{name},</if>
             <if test="gender != null">#{gender},</if>
             <if test="birthday != null">#{birthday},</if>
-            <if test="birthWeight != null">#{birthWeight},</if>
+            <if test="dayAge != null">#{dayAge},</if>
+            <if test="monthAge != null">#{monthAge},</if>
             <if test="parity != null">#{parity},</if>
-            <if test="statusId != null">#{statusId},</if>
+            <if test="birthWeight != null">#{birthWeight},</if>
             <if test="weaningDate != null">#{weaningDate},</if>
+            <if test="statusId != null">#{statusId},</if>
             <if test="weaningWeight != null">#{weaningWeight},</if>
+            <if test="currentWeight != null">#{currentWeight},</if>
             <if test="breedStatusId != null">#{breedStatusId},</if>
-            <if test="fatherId != null">#{fatherId},</if>
-            <if test="motherId != null">#{motherId},</if>
+            <if test="breed != null">#{breed},</if>
+            <if test="bsFatherId != null">#{bsFatherId},</if>
+            <if test="fatherManageTags != null">#{fatherManageTags},</if>
+            <if test="bsMotherId != null">#{bsMotherId},</if>
+            <if test="motherManageTags != null">#{motherManageTags},</if>
             <if test="receptorId != null">#{receptorId},</if>
+            <if test="receptorManageTags != null">#{receptorManageTags},</if>
+            <if test="fatherFatherId != null">#{fatherFatherId},</if>
+            <if test="grandfatherManageTags != null">#{grandfatherManageTags},</if>
+            <if test="fatherMotherId != null">#{fatherMotherId},</if>
+            <if test="grandmotherManageTags != null">#{grandmotherManageTags},</if>
+            <if test="fatherId != null">#{fatherId},</if>
+            <if test="maternalGrandfatherManageTags != null">#{maternalGrandfatherManageTags},</if>
+            <if test="motherId != null">#{motherId},</if>
+            <if test="maternalGrandmotherManageTags != null">#{maternalGrandmotherManageTags},</if>
             <if test="matingDate != null">#{matingDate},</if>
             <if test="matingTypeId != null">#{matingTypeId},</if>
             <if test="pregDate != null">#{pregDate},</if>
             <if test="lambingDate != null">#{lambingDate},</if>
             <if test="lambingDay != null">#{lambingDay},</if>
+            <if test="matingDay != null">#{matingDay},</if>
+            <if test="gestationDay != null">#{gestationDay},</if>
             <if test="expectedDate != null">#{expectedDate},</if>
-            <if test="controlled != null">#{controlled},</if>
+            <if test="postLambingDay != null">#{postLambingDay},</if>
+            <if test="lactationDay != null">#{lactationDay},</if>
+            <if test="anestrousDay != null">#{anestrousDay},</if>
             <if test="matingCounts != null">#{matingCounts},</if>
             <if test="matingTotal != null">#{matingTotal},</if>
             <if test="miscarriageCounts != null">#{miscarriageCounts},</if>
+            <if test="comment != null">#{comment},</if>
+            <if test="controlled != null">#{controlled},</if>
             <if test="body != null">#{body},</if>
             <if test="breast != null">#{breast},</if>
             <if test="source != null">#{source},</if>
-            <if test="soureDate != null">#{soureDate},</if>
+            <if test="sourceDate != null">#{sourceDate},</if>
             <if test="sourceRanchId != null">#{sourceRanchId},</if>
-            <if test="comment != null">#{comment},</if>
+            <if test="sourceRanch != null">#{sourceRanch},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -183,43 +231,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateBasSheep" parameterType="BasSheep">
-        update bas_sheep
+    <update id="updateSheepFile" parameterType="SheepFile">
+        update sheep_file
         <trim prefix="SET" suffixOverrides=",">
-            <if test="manageTags != null">manage_tags = #{manageTags},</if>
+            <if test="bsManageTags != null">bs_manage_tags = #{bsManageTags},</if>
             <if test="ranchId != null">ranch_id = #{ranchId},</if>
+            <if test="drRanch != null">dr_ranch = #{drRanch},</if>
             <if test="sheepfoldId != null">sheepfold_id = #{sheepfoldId},</if>
+            <if test="sheepfoldName != null">sheepfold_name = #{sheepfoldName},</if>
             <if test="electronicTags != null">electronic_tags = #{electronicTags},</if>
             <if test="varietyId != null">variety_id = #{varietyId},</if>
+            <if test="variety != null">variety = #{variety},</if>
             <if test="family != null">family = #{family},</if>
-            <if test="typeId != null">type_id = #{typeId},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="gender != null">gender = #{gender},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
-            <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
+            <if test="dayAge != null">day_age = #{dayAge},</if>
+            <if test="monthAge != null">month_age = #{monthAge},</if>
             <if test="parity != null">parity = #{parity},</if>
-            <if test="statusId != null">status_id = #{statusId},</if>
+            <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
             <if test="weaningDate != null">weaning_date = #{weaningDate},</if>
+            <if test="statusId != null">status_id = #{statusId},</if>
             <if test="weaningWeight != null">weaning_weight = #{weaningWeight},</if>
+            <if test="currentWeight != null">current_weight = #{currentWeight},</if>
             <if test="breedStatusId != null">breed_status_id = #{breedStatusId},</if>
-            <if test="fatherId != null">father_id = #{fatherId},</if>
-            <if test="motherId != null">mother_id = #{motherId},</if>
+            <if test="breed != null">breed = #{breed},</if>
+            <if test="bsFatherId != null">bs_father_id = #{bsFatherId},</if>
+            <if test="fatherManageTags != null">father_manage_tags = #{fatherManageTags},</if>
+            <if test="bsMotherId != null">bs_mother_id = #{bsMotherId},</if>
+            <if test="motherManageTags != null">mother_manage_tags = #{motherManageTags},</if>
             <if test="receptorId != null">receptor_id = #{receptorId},</if>
+            <if test="receptorManageTags != null">receptor_manage_tags = #{receptorManageTags},</if>
+            <if test="fatherFatherId != null">father_father_id = #{fatherFatherId},</if>
+            <if test="grandfatherManageTags != null">grandfather_manage_tags = #{grandfatherManageTags},</if>
+            <if test="fatherMotherId != null">father_mother_id = #{fatherMotherId},</if>
+            <if test="grandmotherManageTags != null">grandmother_manage_tags = #{grandmotherManageTags},</if>
+            <if test="fatherId != null">father_id = #{fatherId},</if>
+            <if test="maternalGrandfatherManageTags != null">maternal_grandfather_manage_tags = #{maternalGrandfatherManageTags},</if>
+            <if test="motherId != null">mother_id = #{motherId},</if>
+            <if test="maternalGrandmotherManageTags != null">maternal_grandmother_manage_tags = #{maternalGrandmotherManageTags},</if>
             <if test="matingDate != null">mating_date = #{matingDate},</if>
             <if test="matingTypeId != null">mating_type_id = #{matingTypeId},</if>
             <if test="pregDate != null">preg_date = #{pregDate},</if>
             <if test="lambingDate != null">lambing_date = #{lambingDate},</if>
             <if test="lambingDay != null">lambing_day = #{lambingDay},</if>
+            <if test="matingDay != null">mating_day = #{matingDay},</if>
+            <if test="gestationDay != null">gestation_day = #{gestationDay},</if>
             <if test="expectedDate != null">expected_date = #{expectedDate},</if>
-            <if test="controlled != null">controlled = #{controlled},</if>
+            <if test="postLambingDay != null">post_lambing_day = #{postLambingDay},</if>
+            <if test="lactationDay != null">lactation_day = #{lactationDay},</if>
+            <if test="anestrousDay != null">anestrous_day = #{anestrousDay},</if>
             <if test="matingCounts != null">mating_counts = #{matingCounts},</if>
             <if test="matingTotal != null">mating_total = #{matingTotal},</if>
             <if test="miscarriageCounts != null">miscarriage_counts = #{miscarriageCounts},</if>
+            <if test="comment != null">comment = #{comment},</if>
+            <if test="controlled != null">controlled = #{controlled},</if>
             <if test="body != null">body = #{body},</if>
             <if test="breast != null">breast = #{breast},</if>
             <if test="source != null">source = #{source},</if>
-            <if test="soureDate != null">soure_date = #{soureDate},</if>
+            <if test="sourceDate != null">source_date = #{sourceDate},</if>
             <if test="sourceRanchId != null">source_ranch_id = #{sourceRanchId},</if>
-            <if test="comment != null">comment = #{comment},</if>
+            <if test="sourceRanch != null">source_ranch = #{sourceRanch},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -229,12 +301,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteBasSheepById" parameterType="Long">
-        delete from bas_sheep where id = #{id}
+    <delete id="deleteSheepFileById" parameterType="Long">
+        delete from sheep_file where id = #{id}
     </delete>
 
-    <delete id="deleteBasSheepByIds" parameterType="String">
-        delete from bas_sheep where id in 
+    <delete id="deleteSheepFileByIds" parameterType="String">
+        delete from sheep_file where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>