Merge remote-tracking branch 'origin/main'
# Conflicts: # zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java
This commit is contained in:
@@ -10,23 +10,18 @@ import com.zhyc.common.enums.BusinessType;
|
||||
import com.zhyc.common.utils.poi.ExcelUtil;
|
||||
import com.zhyc.module.base.domain.SheepFile;
|
||||
import com.zhyc.module.base.service.ISheepFileService;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 羊只档案Controller
|
||||
*
|
||||
* @author wyt
|
||||
* * @author wyt
|
||||
* @date 2025-07-13
|
||||
*/
|
||||
@RestController
|
||||
@@ -52,7 +47,7 @@ public class SheepFileController extends BaseController
|
||||
Integer pageSize = 10;
|
||||
|
||||
if (queryParams != null && !queryParams.isEmpty()) {
|
||||
// 提取分页参数
|
||||
// ------------------ 1. 处理分页参数 ------------------
|
||||
if (queryParams.containsKey("pageNum") && queryParams.get("pageNum") != null) {
|
||||
try {
|
||||
pageNum = Integer.parseInt(queryParams.get("pageNum").toString());
|
||||
@@ -60,7 +55,6 @@ public class SheepFileController extends BaseController
|
||||
// 使用默认值
|
||||
}
|
||||
} else if (queryParams.containsKey("page") && queryParams.get("page") != null) {
|
||||
// 如果 pageNum 不存在，则尝试使用 page
|
||||
try {
|
||||
pageNum = Integer.parseInt(queryParams.get("page").toString());
|
||||
} catch (NumberFormatException e) {
|
||||
@@ -68,15 +62,13 @@ public class SheepFileController extends BaseController
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (queryParams.containsKey("pageSize") && queryParams.get("pageSize") != null) {
|
||||
try {
|
||||
pageSize = Integer.parseInt(queryParams.get("pageSize").toString());
|
||||
} catch (NumberFormatException e) {
|
||||
// 使用默认值
|
||||
}
|
||||
}else if (queryParams.containsKey("limit") && queryParams.get("limit") != null) {
|
||||
// 如果 pageSize 不存在，则尝试使用 limit
|
||||
} else if (queryParams.containsKey("limit") && queryParams.get("limit") != null) {
|
||||
try {
|
||||
pageSize = Integer.parseInt(queryParams.get("limit").toString());
|
||||
} catch (NumberFormatException e) {
|
||||
@@ -84,7 +76,25 @@ public class SheepFileController extends BaseController
|
||||
}
|
||||
}
|
||||
|
||||
// 提取常规查询参数到 SheepFile 对象
|
||||
// ------------------ 2. 核心修复：处理 List 多选参数 ------------------
|
||||
// 使用 parseList 方法兼容处理 List、Array、逗号分隔字符串
|
||||
sheepFile.setAllEarNumbers(parseList(queryParams.get("allEarNumbers")));
|
||||
sheepFile.setAllEleEarNumbers(parseList(queryParams.get("allEleEarNumbers")));
|
||||
sheepFile.setAllBreedingStatus(parseList(queryParams.get("allBreedingStatus")));
|
||||
sheepFile.setAllSheepTypes(parseList(queryParams.get("allSheepTypes")));
|
||||
|
||||
// 性别处理 (需要将 String/Integer 转为 Long)
|
||||
List<String> genderStrs = parseList(queryParams.get("allGenders"));
|
||||
if (genderStrs != null && !genderStrs.isEmpty()) {
|
||||
List<Long> genderLongs = new ArrayList<>();
|
||||
for (String s : genderStrs) {
|
||||
Long v = convertToLong(s);
|
||||
if(v != null) genderLongs.add(v);
|
||||
}
|
||||
sheepFile.setAllGenders(genderLongs);
|
||||
}
|
||||
|
||||
// ------------------ 3. 处理常规单值参数 ------------------
|
||||
if (queryParams.containsKey("bsManageTags") && queryParams.get("bsManageTags") != null) {
|
||||
sheepFile.setBsManageTags(queryParams.get("bsManageTags").toString());
|
||||
}
|
||||
@@ -110,23 +120,17 @@ public class SheepFileController extends BaseController
|
||||
sheepFile.setBreed(queryParams.get("breed").toString());
|
||||
}
|
||||
|
||||
// 移除已经处理的参数，剩下的作为自定义筛选参数
|
||||
// ------------------ 4. 提取自定义参数 (排除已处理的键) ------------------
|
||||
// 定义需要跳过的key，防止重复处理
|
||||
Set<String> processedKeys = new HashSet<>(Arrays.asList(
|
||||
"pageNum", "pageSize", "page", "limit",
|
||||
"bsManageTags", "electronicTags", "drRanch", "variety", "name", "gender", "statusId", "breed",
|
||||
"allEarNumbers", "allEleEarNumbers", "allGenders", "allBreedingStatus", "allSheepTypes"
|
||||
));
|
||||
|
||||
for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
|
||||
String key = entry.getKey();
|
||||
Object value = entry.getValue();
|
||||
|
||||
// 跳过常规参数和分页参数
|
||||
if ("bsManageTags".equals(key) || "electronicTags".equals(key) ||
|
||||
"drRanch".equals(key) || "variety".equals(key) ||
|
||||
"name".equals(key) || "gender".equals(key) ||
|
||||
"statusId".equals(key) || "breed".equals(key) ||
|
||||
"pageNum".equals(key) || "pageSize".equals(key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 添加到自定义参数中
|
||||
if (value != null) {
|
||||
customParams.put(key, value);
|
||||
if (!processedKeys.contains(entry.getKey()) && entry.getValue() != null) {
|
||||
customParams.put(entry.getKey(), entry.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -139,6 +143,41 @@ public class SheepFileController extends BaseController
|
||||
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 辅助方法：统一解析各种格式的数组参数
|
||||
* 支持：List, String[] (数组), Object[] (数组), "A,B" (逗号分隔字符串)
|
||||
*/
|
||||
private List<String> parseList(Object obj) {
|
||||
if (obj == null) return null;
|
||||
List<String> result = new ArrayList<>();
|
||||
|
||||
if (obj instanceof List) {
|
||||
// JSON 传来的通常是 List
|
||||
for (Object o : (List<?>) obj) {
|
||||
if (o != null) result.add(o.toString());
|
||||
}
|
||||
} else if (obj.getClass().isArray()) {
|
||||
// 如果是数组
|
||||
if (obj instanceof Object[]) {
|
||||
for (Object o : (Object[]) obj) {
|
||||
if (o != null) result.add(o.toString());
|
||||
}
|
||||
} else if (obj instanceof String[]) {
|
||||
Collections.addAll(result, (String[]) obj);
|
||||
}
|
||||
} else if (obj instanceof String) {
|
||||
// 如果是逗号分隔字符串
|
||||
String s = (String) obj;
|
||||
if (StringUtils.isNotBlank(s)) {
|
||||
String[] split = s.split(",");
|
||||
Collections.addAll(result, split);
|
||||
}
|
||||
}
|
||||
|
||||
return result.isEmpty() ? null : result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换对象为Long类型
|
||||
*/
|
||||
@@ -186,6 +225,7 @@ public class SheepFileController extends BaseController
|
||||
|
||||
// 使用若依框架的工具方法处理参数
|
||||
switch (key) {
|
||||
// --- 单值参数 ---
|
||||
case "bsManageTags":
|
||||
sheepFile.setBsManageTags(convertToString(value));
|
||||
break;
|
||||
@@ -210,6 +250,30 @@ public class SheepFileController extends BaseController
|
||||
case "breed":
|
||||
sheepFile.setBreed(convertToString(value));
|
||||
break;
|
||||
|
||||
// --- 新增：处理多选数组参数 ---
|
||||
// request.getParameterMap 中的值本身就是 String[]，可以直接使用
|
||||
case "allEarNumbers":
|
||||
sheepFile.setAllEarNumbers(new ArrayList<>(Arrays.asList(values)));
|
||||
break;
|
||||
case "allEleEarNumbers":
|
||||
sheepFile.setAllEleEarNumbers(new ArrayList<>(Arrays.asList(values)));
|
||||
break;
|
||||
case "allBreedingStatus":
|
||||
sheepFile.setAllBreedingStatus(new ArrayList<>(Arrays.asList(values)));
|
||||
break;
|
||||
case "allSheepTypes":
|
||||
sheepFile.setAllSheepTypes(new ArrayList<>(Arrays.asList(values)));
|
||||
break;
|
||||
case "allGenders":
|
||||
List<Long> genderList = new ArrayList<>();
|
||||
for(String v : values){
|
||||
Long l = Convert.toLong(v);
|
||||
if(l != null) genderList.add(l);
|
||||
}
|
||||
sheepFile.setAllGenders(genderList);
|
||||
break;
|
||||
|
||||
case "pageNum":
|
||||
case "pageSize":
|
||||
// 忽略分页参数
|
||||
@@ -230,6 +294,14 @@ public class SheepFileController extends BaseController
|
||||
util.exportExcel(response, list, "羊只档案数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增：模糊搜索耳号接口 (用于前端下拉框远程搜索)
|
||||
*/
|
||||
@GetMapping("/searchEarNumbers")
|
||||
public AjaxResult searchEarNumbers(@RequestParam("query") String query)
|
||||
{
|
||||
return success(sheepFileService.searchEarNumbers(query));
|
||||
}
|
||||
|
||||
/**
|
||||
* 字符串转换工具方法
|
||||
@@ -252,15 +324,14 @@ public class SheepFileController extends BaseController
|
||||
}
|
||||
|
||||
/*
|
||||
* 根据耳号查询是否存在羊舍
|
||||
* */
|
||||
* 根据耳号查询是否存在羊舍
|
||||
* */
|
||||
@GetMapping("/byNo/{manageTags}")
|
||||
public AjaxResult byManageTags(@PathVariable String manageTags){
|
||||
SheepFile sheep=sheepFileService.selectBasSheepByManageTags(manageTags.trim());
|
||||
return success(sheep);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/stat/sheepType")
|
||||
public AjaxResult statSheepType() {
|
||||
return success(sheepFileService.countBySheepType());
|
||||
@@ -289,43 +360,18 @@ public class SheepFileController extends BaseController
|
||||
|
||||
/**
|
||||
* 新增API：获取字段的唯一值列表
|
||||
*
|
||||
* 这个API为前端自定义筛选功能提供数据支持
|
||||
* 当用户选择某个字段进行筛选时，前端调用此接口获取该字段的所有可能值
|
||||
*
|
||||
* @param fieldName 字段名（数据库列名）
|
||||
* @return AjaxResult 包含字段值列表的响应结果
|
||||
*
|
||||
* 接口地址：GET /sheep_file/sheep_file/field/{fieldName}
|
||||
*
|
||||
* 使用示例：
|
||||
* 前端请求：GET /sheep_file/sheep_file/field/bs_manage_tags
|
||||
* 后端返回：{ "code": 200, "msg": "操作成功", "data": ["AF00001", "AF00002", "AF00003"] }
|
||||
*
|
||||
* 安全说明：
|
||||
* - 使用白名单机制防止SQL注入
|
||||
* - 只有预定义的字段名可以被查询
|
||||
*/
|
||||
@GetMapping("/field/{fieldName}")
|
||||
public AjaxResult getFieldValues(@PathVariable String fieldName) {
|
||||
try {
|
||||
// 调用Service层获取字段唯一值
|
||||
List<String> fieldValues = sheepFileService.getFieldValues(fieldName);
|
||||
|
||||
// 返回成功响应，包含字段值列表
|
||||
return AjaxResult.success("获取字段值成功", fieldValues);
|
||||
|
||||
} catch (IllegalArgumentException e) {
|
||||
// 处理字段名不合法的异常
|
||||
// 这种情况通常是因为前端传入了不在白名单中的字段名
|
||||
return AjaxResult.error("请求的字段名不合法: " + e.getMessage());
|
||||
|
||||
} catch (Exception e) {
|
||||
// 处理其他未知异常
|
||||
// 记录日志并返回友好的错误信息
|
||||
logger.error("获取字段值失败，字段名: " + fieldName, e);
|
||||
return AjaxResult.error("系统错误，获取字段值失败");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
package com.zhyc.module.base.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.zhyc.module.base.util.SheepPedigreeExcelUtils;
|
||||
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.SheepPedigree;
|
||||
import com.zhyc.module.base.service.ISheepPedigreeService;
|
||||
import com.zhyc.common.utils.poi.ExcelUtil;
|
||||
import com.zhyc.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* VIEWController
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-02-04
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/system/pedigree")
|
||||
public class SheepPedigreeController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ISheepPedigreeService sheepPedigreeService;
|
||||
|
||||
|
||||
/**
|
||||
* 查询VIEW列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(SheepPedigree sheepPedigree)
|
||||
{
|
||||
startPage();
|
||||
List<SheepPedigree> list = sheepPedigreeService.selectSheepPedigreeList(sheepPedigree);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出VIEW列表
|
||||
*/
|
||||
|
||||
// 在Controller/Service中注入工具类
|
||||
@Autowired
|
||||
private SheepPedigreeExcelUtils sheepPedigreeExcelUtils;
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:export')")
|
||||
@Log(title = "VIEW", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, SheepPedigree sheepPedigree) throws Exception {
|
||||
List<SheepPedigree> dataList = sheepPedigreeService.selectSheepPedigreeList(sheepPedigree);
|
||||
// 调用实例方法（而非静态方法）
|
||||
sheepPedigreeExcelUtils.export(response, dataList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取VIEW详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return success(sheepPedigreeService.selectSheepPedigreeById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增VIEW
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:add')")
|
||||
@Log(title = "VIEW", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SheepPedigree sheepPedigree)
|
||||
{
|
||||
return toAjax(sheepPedigreeService.insertSheepPedigree(sheepPedigree));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改VIEW
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:edit')")
|
||||
@Log(title = "VIEW", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SheepPedigree sheepPedigree)
|
||||
{
|
||||
return toAjax(sheepPedigreeService.updateSheepPedigree(sheepPedigree));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除VIEW
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:pedigree:remove')")
|
||||
@Log(title = "VIEW", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(sheepPedigreeService.deleteSheepPedigreeByIds(ids));
|
||||
}
|
||||
}
|
||||
@@ -8,11 +8,11 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 羊只档案对象 sheep_file
|
||||
*
|
||||
* @author wyt
|
||||
* * @author wyt
|
||||
* @date 2025-07-13
|
||||
*/
|
||||
@Data
|
||||
@@ -29,6 +29,10 @@ public class SheepFile extends BaseEntity
|
||||
@Excel(name = "管理耳号")
|
||||
private String bsManageTags;
|
||||
|
||||
/** ================= 新增：多选查询字段 ================= */
|
||||
/** 耳号集合（多选/模糊查询用） */
|
||||
private List<String> allEarNumbers;
|
||||
|
||||
/** 牧场id */
|
||||
// @Excel(name = "牧场id")
|
||||
private Long ranchId;
|
||||
@@ -49,6 +53,10 @@ public class SheepFile extends BaseEntity
|
||||
@Excel(name = "电子耳号")
|
||||
private String electronicTags;
|
||||
|
||||
/** ================= 新增：多选查询字段 ================= */
|
||||
/** 电子耳号集合（多选查询用） */
|
||||
private List<String> allEleEarNumbers;
|
||||
|
||||
/** 品种id */
|
||||
// @Excel(name = "品种id")
|
||||
private Long varietyId;
|
||||
@@ -65,14 +73,22 @@ public class SheepFile extends BaseEntity
|
||||
@Excel(name = "羊只类型")
|
||||
private String name;
|
||||
|
||||
/** ================= 新增：多选查询字段 ================= */
|
||||
/** 羊只类型集合（多选查询用） */
|
||||
private List<String> allSheepTypes;
|
||||
|
||||
// /** 性别 */
|
||||
//// @Excel(name = "性别")
|
||||
// private Long gender;
|
||||
|
||||
/** 性别 - 使用字典转换 */
|
||||
@Excel(name = "性别", dictType = "sheep_gender") // 添加 dictType
|
||||
@Excel(name = "性别", dictType = "sheep_gender")
|
||||
private Long gender;
|
||||
|
||||
/** ================= 新增：多选查询字段 ================= */
|
||||
/** 性别集合（多选查询用） */
|
||||
private List<Long> allGenders;
|
||||
|
||||
/** 出生日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
@@ -103,7 +119,6 @@ public class SheepFile extends BaseEntity
|
||||
@Excel(name = "羊只状态", dictType = "sheep_status")
|
||||
private Long statusId;
|
||||
|
||||
|
||||
/** 断奶体重 */
|
||||
@Excel(name = "断奶体重")
|
||||
private Double weaningWeight;
|
||||
@@ -129,6 +144,10 @@ public class SheepFile extends BaseEntity
|
||||
@Excel(name = "繁殖状态")
|
||||
private String breed;
|
||||
|
||||
/** ================= 新增：多选查询字段 ================= */
|
||||
/** 繁殖状态集合（多选查询用） */
|
||||
private List<String> allBreedingStatus;
|
||||
|
||||
/** 父号id */
|
||||
// @Excel(name = "父号id")
|
||||
private Long bsFatherId;
|
||||
@@ -300,6 +319,4 @@ public class SheepFile extends BaseEntity
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,996 @@
|
||||
package com.zhyc.module.base.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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;
|
||||
|
||||
/**
|
||||
* VIEW对象 sheep_pedigree
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-02-04
|
||||
*/
|
||||
public class SheepPedigree extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private Long id;
|
||||
|
||||
/** 管理耳号 */
|
||||
@Excel(name = "管理耳号")
|
||||
private String bsManageTags;
|
||||
|
||||
/** 牧场id */
|
||||
@Excel(name = "牧场id")
|
||||
private Long ranchId;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String drRanch;
|
||||
|
||||
/** 羊舍id */
|
||||
@Excel(name = "羊舍id")
|
||||
private Long sheepfoldId;
|
||||
|
||||
/** 羊舍名称 */
|
||||
@Excel(name = "羊舍名称")
|
||||
private String sheepfoldName;
|
||||
|
||||
/** 电子耳号 */
|
||||
@Excel(name = "电子耳号")
|
||||
private String electronicTags;
|
||||
|
||||
/** 品种id */
|
||||
@Excel(name = "品种id")
|
||||
private Long varietyId;
|
||||
|
||||
/** 品种 */
|
||||
@Excel(name = "品种")
|
||||
private String variety;
|
||||
|
||||
/** 家系 */
|
||||
@Excel(name = "家系")
|
||||
private String family;
|
||||
|
||||
/** 羊只类型 */
|
||||
@Excel(name = "羊只类型")
|
||||
private String name;
|
||||
|
||||
/** 性别 */
|
||||
@Excel(name = "性别")
|
||||
private Long gender;
|
||||
|
||||
/** 出生日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date birthday;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long dayAge;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long monthAge;
|
||||
|
||||
/** 胎次 */
|
||||
@Excel(name = "胎次")
|
||||
private Long parity;
|
||||
|
||||
/** 出生体重 */
|
||||
@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;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long weaningDayAge;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private BigDecimal weaningDailyGain;
|
||||
|
||||
/** 当前体重 */
|
||||
@Excel(name = "当前体重")
|
||||
private Long currentWeight;
|
||||
|
||||
/** 繁育状态id */
|
||||
@Excel(name = "繁育状态id")
|
||||
private Long breedStatusId;
|
||||
|
||||
/** 繁殖状态 */
|
||||
@Excel(name = "繁殖状态")
|
||||
private String breed;
|
||||
|
||||
/** 父号id */
|
||||
@Excel(name = "父号id")
|
||||
private Long bsFatherId;
|
||||
|
||||
/** 管理耳号 */
|
||||
@Excel(name = "管理耳号")
|
||||
private String fatherManageTags;
|
||||
|
||||
/** 母号id */
|
||||
@Excel(name = "母号id")
|
||||
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")
|
||||
private Date matingDate;
|
||||
|
||||
/** 配种类型 */
|
||||
@Excel(name = "配种类型")
|
||||
private Long matingTypeId;
|
||||
|
||||
/** 孕检日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "孕检日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date pregDate;
|
||||
|
||||
/** 产羔日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "产羔日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date lambingDate;
|
||||
|
||||
/** 产羔时怀孕天数 */
|
||||
@Excel(name = "产羔时怀孕天数")
|
||||
private Long lambingDay;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
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 postLambingDay;
|
||||
|
||||
/** 泌乳天数 */
|
||||
@Excel(name = "泌乳天数")
|
||||
private Long lactationDay;
|
||||
|
||||
/** 空怀天数 */
|
||||
@Excel(name = "空怀天数")
|
||||
private Long anestrousDay;
|
||||
|
||||
/** 配种次数 */
|
||||
@Excel(name = "配种次数")
|
||||
private Long matingCounts;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long matingTotal;
|
||||
|
||||
/** 累计流产次数 */
|
||||
@Excel(name = "累计流产次数")
|
||||
private Long miscarriageCounts;
|
||||
|
||||
/** 备注 */
|
||||
@Excel(name = "备注")
|
||||
private String comment;
|
||||
|
||||
/** 是否性控 */
|
||||
@Excel(name = "是否性控")
|
||||
private Long controlled;
|
||||
|
||||
/** 体况评分 */
|
||||
@Excel(name = "体况评分")
|
||||
private Long body;
|
||||
|
||||
/** 乳房评分 */
|
||||
@Excel(name = "乳房评分")
|
||||
private Long breast;
|
||||
|
||||
/** 入群来源 */
|
||||
@Excel(name = "入群来源")
|
||||
private String source;
|
||||
|
||||
/** 入群日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "入群日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date sourceDate;
|
||||
|
||||
/** 来源牧场id */
|
||||
@Excel(name = "来源牧场id")
|
||||
private Long sourceRanchId;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "来源牧场", readConverterExp = "$column.readConverterExp()")
|
||||
private String sourceRanch;
|
||||
|
||||
/** 是否删除 */
|
||||
@Excel(name = "是否删除")
|
||||
private Long isDelete;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "毛色", readConverterExp = "$column.readConverterExp()")
|
||||
private String sheepColor;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "等级", readConverterExp = "$column.readConverterExp()")
|
||||
private String groupName;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setBsManageTags(String bsManageTags)
|
||||
{
|
||||
this.bsManageTags = bsManageTags;
|
||||
}
|
||||
|
||||
public String getBsManageTags()
|
||||
{
|
||||
return bsManageTags;
|
||||
}
|
||||
|
||||
public void setRanchId(Long ranchId)
|
||||
{
|
||||
this.ranchId = ranchId;
|
||||
}
|
||||
|
||||
public Long getRanchId()
|
||||
{
|
||||
return ranchId;
|
||||
}
|
||||
|
||||
public void setDrRanch(String drRanch)
|
||||
{
|
||||
this.drRanch = drRanch;
|
||||
}
|
||||
|
||||
public String getDrRanch()
|
||||
{
|
||||
return drRanch;
|
||||
}
|
||||
|
||||
public void setSheepfoldId(Long sheepfoldId)
|
||||
{
|
||||
this.sheepfoldId = sheepfoldId;
|
||||
}
|
||||
|
||||
public Long getSheepfoldId()
|
||||
{
|
||||
return sheepfoldId;
|
||||
}
|
||||
|
||||
public void setSheepfoldName(String sheepfoldName)
|
||||
{
|
||||
this.sheepfoldName = sheepfoldName;
|
||||
}
|
||||
|
||||
public String getSheepfoldName()
|
||||
{
|
||||
return sheepfoldName;
|
||||
}
|
||||
|
||||
public void setElectronicTags(String electronicTags)
|
||||
{
|
||||
this.electronicTags = electronicTags;
|
||||
}
|
||||
|
||||
public String getElectronicTags()
|
||||
{
|
||||
return electronicTags;
|
||||
}
|
||||
|
||||
public void setVarietyId(Long varietyId)
|
||||
{
|
||||
this.varietyId = varietyId;
|
||||
}
|
||||
|
||||
public Long getVarietyId()
|
||||
{
|
||||
return varietyId;
|
||||
}
|
||||
|
||||
public void setVariety(String variety)
|
||||
{
|
||||
this.variety = variety;
|
||||
}
|
||||
|
||||
public String getVariety()
|
||||
{
|
||||
return variety;
|
||||
}
|
||||
|
||||
public void setFamily(String family)
|
||||
{
|
||||
this.family = family;
|
||||
}
|
||||
|
||||
public String getFamily()
|
||||
{
|
||||
return family;
|
||||
}
|
||||
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setGender(Long gender)
|
||||
{
|
||||
this.gender = gender;
|
||||
}
|
||||
|
||||
public Long getGender()
|
||||
{
|
||||
return gender;
|
||||
}
|
||||
|
||||
public void setBirthday(Date birthday)
|
||||
{
|
||||
this.birthday = birthday;
|
||||
}
|
||||
|
||||
public Date getBirthday()
|
||||
{
|
||||
return birthday;
|
||||
}
|
||||
|
||||
public void setDayAge(Long dayAge)
|
||||
{
|
||||
this.dayAge = dayAge;
|
||||
}
|
||||
|
||||
public Long getDayAge()
|
||||
{
|
||||
return dayAge;
|
||||
}
|
||||
|
||||
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 setBirthWeight(Long birthWeight)
|
||||
{
|
||||
this.birthWeight = birthWeight;
|
||||
}
|
||||
|
||||
public Long getBirthWeight()
|
||||
{
|
||||
return birthWeight;
|
||||
}
|
||||
|
||||
public void setWeaningDate(Date weaningDate)
|
||||
{
|
||||
this.weaningDate = weaningDate;
|
||||
}
|
||||
|
||||
public Date getWeaningDate()
|
||||
{
|
||||
return weaningDate;
|
||||
}
|
||||
|
||||
public void setStatusId(Long statusId)
|
||||
{
|
||||
this.statusId = statusId;
|
||||
}
|
||||
|
||||
public Long getStatusId()
|
||||
{
|
||||
return statusId;
|
||||
}
|
||||
|
||||
public void setWeaningWeight(Long weaningWeight)
|
||||
{
|
||||
this.weaningWeight = weaningWeight;
|
||||
}
|
||||
|
||||
public Long getWeaningWeight()
|
||||
{
|
||||
return weaningWeight;
|
||||
}
|
||||
|
||||
public void setWeaningDayAge(Long weaningDayAge)
|
||||
{
|
||||
this.weaningDayAge = weaningDayAge;
|
||||
}
|
||||
|
||||
public Long getWeaningDayAge()
|
||||
{
|
||||
return weaningDayAge;
|
||||
}
|
||||
|
||||
public void setWeaningDailyGain(BigDecimal weaningDailyGain)
|
||||
{
|
||||
this.weaningDailyGain = weaningDailyGain;
|
||||
}
|
||||
|
||||
public BigDecimal getWeaningDailyGain()
|
||||
{
|
||||
return weaningDailyGain;
|
||||
}
|
||||
|
||||
public void setCurrentWeight(Long currentWeight)
|
||||
{
|
||||
this.currentWeight = currentWeight;
|
||||
}
|
||||
|
||||
public Long getCurrentWeight()
|
||||
{
|
||||
return currentWeight;
|
||||
}
|
||||
|
||||
public void setBreedStatusId(Long breedStatusId)
|
||||
{
|
||||
this.breedStatusId = breedStatusId;
|
||||
}
|
||||
|
||||
public Long getBreedStatusId()
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
public Long getFatherId()
|
||||
{
|
||||
return fatherId;
|
||||
}
|
||||
|
||||
public void setMaternalGrandfatherManageTags(String maternalGrandfatherManageTags)
|
||||
{
|
||||
this.maternalGrandfatherManageTags = maternalGrandfatherManageTags;
|
||||
}
|
||||
|
||||
public String getMaternalGrandfatherManageTags()
|
||||
{
|
||||
return maternalGrandfatherManageTags;
|
||||
}
|
||||
|
||||
public void setMotherId(Long motherId)
|
||||
{
|
||||
this.motherId = motherId;
|
||||
}
|
||||
|
||||
public Long getMotherId()
|
||||
{
|
||||
return motherId;
|
||||
}
|
||||
|
||||
public void setMaternalGrandmotherManageTags(String maternalGrandmotherManageTags)
|
||||
{
|
||||
this.maternalGrandmotherManageTags = maternalGrandmotherManageTags;
|
||||
}
|
||||
|
||||
public String getMaternalGrandmotherManageTags()
|
||||
{
|
||||
return maternalGrandmotherManageTags;
|
||||
}
|
||||
|
||||
public void setMatingDate(Date matingDate)
|
||||
{
|
||||
this.matingDate = matingDate;
|
||||
}
|
||||
|
||||
public Date getMatingDate()
|
||||
{
|
||||
return matingDate;
|
||||
}
|
||||
|
||||
public void setMatingTypeId(Long matingTypeId)
|
||||
{
|
||||
this.matingTypeId = matingTypeId;
|
||||
}
|
||||
|
||||
public Long getMatingTypeId()
|
||||
{
|
||||
return matingTypeId;
|
||||
}
|
||||
|
||||
public void setPregDate(Date pregDate)
|
||||
{
|
||||
this.pregDate = pregDate;
|
||||
}
|
||||
|
||||
public Date getPregDate()
|
||||
{
|
||||
return pregDate;
|
||||
}
|
||||
|
||||
public void setLambingDate(Date lambingDate)
|
||||
{
|
||||
this.lambingDate = lambingDate;
|
||||
}
|
||||
|
||||
public Date getLambingDate()
|
||||
{
|
||||
return lambingDate;
|
||||
}
|
||||
|
||||
public void setLambingDay(Long lambingDay)
|
||||
{
|
||||
this.lambingDay = lambingDay;
|
||||
}
|
||||
|
||||
public Long getLambingDay()
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
public Date getExpectedDate()
|
||||
{
|
||||
return expectedDate;
|
||||
}
|
||||
|
||||
public void setPostLambingDay(Long postLambingDay)
|
||||
{
|
||||
this.postLambingDay = postLambingDay;
|
||||
}
|
||||
|
||||
public Long getPostLambingDay()
|
||||
{
|
||||
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)
|
||||
{
|
||||
this.matingCounts = matingCounts;
|
||||
}
|
||||
|
||||
public Long getMatingCounts()
|
||||
{
|
||||
return matingCounts;
|
||||
}
|
||||
|
||||
public void setMatingTotal(Long matingTotal)
|
||||
{
|
||||
this.matingTotal = matingTotal;
|
||||
}
|
||||
|
||||
public Long getMatingTotal()
|
||||
{
|
||||
return matingTotal;
|
||||
}
|
||||
|
||||
public void setMiscarriageCounts(Long miscarriageCounts)
|
||||
{
|
||||
this.miscarriageCounts = miscarriageCounts;
|
||||
}
|
||||
|
||||
public Long getMiscarriageCounts()
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
public Long getBody()
|
||||
{
|
||||
return body;
|
||||
}
|
||||
|
||||
public void setBreast(Long breast)
|
||||
{
|
||||
this.breast = breast;
|
||||
}
|
||||
|
||||
public Long getBreast()
|
||||
{
|
||||
return breast;
|
||||
}
|
||||
|
||||
public void setSource(String source)
|
||||
{
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
public String getSource()
|
||||
{
|
||||
return source;
|
||||
}
|
||||
|
||||
public void setSourceDate(Date sourceDate)
|
||||
{
|
||||
this.sourceDate = sourceDate;
|
||||
}
|
||||
|
||||
public Date getSourceDate()
|
||||
{
|
||||
return sourceDate;
|
||||
}
|
||||
|
||||
public void setSourceRanchId(Long sourceRanchId)
|
||||
{
|
||||
this.sourceRanchId = sourceRanchId;
|
||||
}
|
||||
|
||||
public Long getSourceRanchId()
|
||||
{
|
||||
return sourceRanchId;
|
||||
}
|
||||
|
||||
public void setSourceRanch(String sourceRanch)
|
||||
{
|
||||
this.sourceRanch = sourceRanch;
|
||||
}
|
||||
|
||||
public String getSourceRanch()
|
||||
{
|
||||
return sourceRanch;
|
||||
}
|
||||
|
||||
public void setIsDelete(Long isDelete)
|
||||
{
|
||||
this.isDelete = isDelete;
|
||||
}
|
||||
|
||||
public Long getIsDelete()
|
||||
{
|
||||
return isDelete;
|
||||
}
|
||||
|
||||
public void setSheepColor(String sheepColor)
|
||||
{
|
||||
this.sheepColor = sheepColor;
|
||||
}
|
||||
|
||||
public String getSheepColor()
|
||||
{
|
||||
return sheepColor;
|
||||
}
|
||||
|
||||
public void setGroupName(String groupName)
|
||||
{
|
||||
this.groupName = groupName;
|
||||
}
|
||||
|
||||
public String getGroupName()
|
||||
{
|
||||
return groupName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.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("name", getName())
|
||||
.append("gender", getGender())
|
||||
.append("birthday", getBirthday())
|
||||
.append("dayAge", getDayAge())
|
||||
.append("monthAge", getMonthAge())
|
||||
.append("parity", getParity())
|
||||
.append("birthWeight", getBirthWeight())
|
||||
.append("weaningDate", getWeaningDate())
|
||||
.append("statusId", getStatusId())
|
||||
.append("weaningWeight", getWeaningWeight())
|
||||
.append("weaningDayAge", getWeaningDayAge())
|
||||
.append("weaningDailyGain", getWeaningDailyGain())
|
||||
.append("currentWeight", getCurrentWeight())
|
||||
.append("breedStatusId", getBreedStatusId())
|
||||
.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("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("sourceDate", getSourceDate())
|
||||
.append("sourceRanchId", getSourceRanchId())
|
||||
.append("sourceRanch", getSourceRanch())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("isDelete", getIsDelete())
|
||||
.append("sheepColor", getSheepColor())
|
||||
.append("groupName", getGroupName())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -27,13 +27,19 @@ public interface SheepFileMapper
|
||||
public SheepFile selectSheepFileById(Long id);
|
||||
|
||||
/**
|
||||
* 查询羊只档案列表
|
||||
* 查询羊只档案列表 (基础查询)
|
||||
*
|
||||
* @param sheepFile 羊只档案
|
||||
* @return 羊只档案集合
|
||||
*/
|
||||
public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
|
||||
|
||||
/**
|
||||
* 新增：模糊查询耳号列表（用于下拉框远程搜索）
|
||||
* @param query 搜索关键字
|
||||
* @return 匹配的耳号列表
|
||||
*/
|
||||
List<String> searchEarNumbers(@Param("query") String query);
|
||||
|
||||
/**
|
||||
* 根据管理耳号查询
|
||||
@@ -43,11 +49,9 @@ public interface SheepFileMapper
|
||||
*/
|
||||
SheepFile selectSheepByManageTags(String tags);
|
||||
|
||||
|
||||
// 在群羊只总数
|
||||
Long countInGroup();
|
||||
|
||||
|
||||
// 羊只类别分布（按 name 分组）
|
||||
List<Map<String,Object>> countBySheepType();
|
||||
|
||||
@@ -60,52 +64,34 @@ public interface SheepFileMapper
|
||||
// 泌乳羊胎次分布（name = '泌乳羊' 时按 parity 分组）
|
||||
List<Map<String,Object>> countParityOfLactation();
|
||||
|
||||
|
||||
/**
|
||||
* 新增方法：获取指定字段的唯一值列表
|
||||
*
|
||||
* 这个方法用于查询数据库中某个字段的所有不重复的值
|
||||
* 主要用于前端筛选条件中的下拉选项数据
|
||||
*
|
||||
* @param fieldName 字段名（数据库表中的列名）
|
||||
* @return 该字段的所有唯一值列表，按字母顺序排序
|
||||
*
|
||||
* 使用场景示例：
|
||||
* - 用户选择"耳号"字段时，返回所有不重复的耳号
|
||||
* - 用户选择"品种"字段时，返回所有不重复的品种名称
|
||||
* 获取指定字段的唯一值列表 (配合 XML 中的 selectFieldValues)
|
||||
*/
|
||||
List<String> selectFieldValues(String fieldName);
|
||||
List<String> selectFieldValues(@Param("fieldName") String fieldName);
|
||||
|
||||
/**
|
||||
* 根据复杂条件查询羊只档案列表
|
||||
*
|
||||
* @param params 查询参数映射
|
||||
* @param sheepFile 原有的查询条件（保持兼容）
|
||||
* @return 羊只档案列表
|
||||
* 核心修复：根据复杂条件查询羊只档案列表
|
||||
* 对应 XML 中的 <select id="selectSheepFileListByCondition">
|
||||
* 必须使用 @Param 注解以便 XML 能正确识别两个参数
|
||||
*/
|
||||
List<SheepFile> selectSheepFileListByCondition(
|
||||
@Param("params") Map<String, Object> params,
|
||||
@Param("sheepFile") SheepFile sheepFile
|
||||
);
|
||||
|
||||
// 修改：使用 @SelectProvider 并指定 ResultMap
|
||||
/**
|
||||
* 保留原有 Provider 方法 (若项目其他地方有用到)
|
||||
*/
|
||||
@SelectProvider(type = SheepFileSqlProvider.class, method = "selectByCondition")
|
||||
@ResultMap("SheepFileResult") // 重要：指定使用 XML 中定义的 ResultMap
|
||||
@ResultMap("SheepFileResult")
|
||||
List<SheepFile> selectByCondition(
|
||||
@Param("sheepFile") SheepFile sheepFile,
|
||||
@Param("conditions") Map<String, Object> conditions
|
||||
);
|
||||
|
||||
// 修改：获取字段值的方法
|
||||
@SelectProvider(type = SheepFileSqlProvider.class, method = "selectFieldValues")
|
||||
List<String> selectFieldValuesByProvider(@Param("fieldName") String fieldName);
|
||||
|
||||
|
||||
/**
|
||||
* 查询所有公羊（gender=2）
|
||||
*
|
||||
* @return 公羊列表
|
||||
*/
|
||||
/**
|
||||
* 查询所有公羊（gender=2）
|
||||
* @return 公羊列表
|
||||
@@ -118,4 +104,24 @@ public interface SheepFileMapper
|
||||
* @return 羊只信息
|
||||
*/
|
||||
SheepFile selectSheepFileByManageTags(String manageTags);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增羊只档案 (对应 XML 中的 insert)
|
||||
*/
|
||||
public int insertSheepFile(SheepFile sheepFile);
|
||||
|
||||
/**
|
||||
* 修改羊只档案 (对应 XML 中的 update)
|
||||
*/
|
||||
public int updateSheepFile(SheepFile sheepFile);
|
||||
|
||||
/**
|
||||
* 删除羊只档案 (对应 XML 中的 delete)
|
||||
*/
|
||||
public int deleteSheepFileById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除羊只档案 (对应 XML 中的 delete)
|
||||
*/
|
||||
public int deleteSheepFileByIds(Long[] ids);
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
package com.zhyc.module.base.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.zhyc.module.base.domain.SheepPedigree;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* VIEWMapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-02-04
|
||||
*/
|
||||
public interface SheepPedigreeMapper
|
||||
{
|
||||
/**
|
||||
* 查询VIEW
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return VIEW
|
||||
*/
|
||||
public SheepPedigree selectSheepPedigreeById(Long id);
|
||||
|
||||
/**
|
||||
* 查询VIEW列表
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return VIEW集合
|
||||
*/
|
||||
public List<SheepPedigree> selectSheepPedigreeList(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 新增VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSheepPedigree(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 修改VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSheepPedigree(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 删除VIEW
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSheepPedigreeById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除VIEW
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSheepPedigreeByIds(Long[] ids);
|
||||
|
||||
|
||||
/**
|
||||
* 根据int类型id查询繁育状态名称
|
||||
* @param id 主键id（int类型）
|
||||
* @return 繁育状态名称（breed列的值）
|
||||
*/
|
||||
String selectBreedNameById(@Param("id") Long id);
|
||||
}
|
||||
@@ -8,28 +8,29 @@ import java.util.Map;
|
||||
|
||||
/**
|
||||
* 羊只档案Service接口
|
||||
*
|
||||
* @author wyt
|
||||
* * @author wyt
|
||||
* @date 2025-07-13
|
||||
*/
|
||||
public interface ISheepFileService
|
||||
public interface ISheepFileService
|
||||
{
|
||||
/**
|
||||
* 查询羊只档案
|
||||
*
|
||||
* @param id 羊只档案主键
|
||||
* * @param id 羊只档案主键
|
||||
* @return 羊只档案
|
||||
*/
|
||||
public SheepFile selectSheepFileById(Long id);
|
||||
|
||||
/**
|
||||
* 查询羊只档案列表
|
||||
*
|
||||
* @param sheepFile 羊只档案
|
||||
* * @param sheepFile 羊只档案
|
||||
* @return 羊只档案集合
|
||||
*/
|
||||
public List<SheepFile> selectSheepFileList(SheepFile sheepFile);
|
||||
|
||||
/**
|
||||
* 新增：搜索耳号接口
|
||||
*/
|
||||
List<String> searchEarNumbers(String query);
|
||||
|
||||
SheepFile selectBasSheepByManageTags(String trim);
|
||||
|
||||
@@ -41,27 +42,14 @@ public interface ISheepFileService
|
||||
List<Map<String,Object>> countParityOfLactation();
|
||||
|
||||
/**
|
||||
* 新增方法：获取指定字段的唯一值列表
|
||||
*
|
||||
* 这个方法为前端筛选功能提供数据支持
|
||||
* 当用户选择某个字段进行筛选时，调用此方法获取该字段的所有可能值
|
||||
*
|
||||
* @param fieldName 字段名（需要是数据库表中的列名）
|
||||
* @return 该字段的所有唯一值列表
|
||||
* @throws IllegalArgumentException 当字段名不在白名单中时抛出异常
|
||||
*
|
||||
* 示例用法：
|
||||
* List<String> earTags = getFieldValues("bs_manage_tags");
|
||||
* // 返回结果可能是：["AF00001", "AF00002", "AF00003", ...]
|
||||
* 获取指定字段的唯一值列表
|
||||
*/
|
||||
List<String> getFieldValues(String fieldName);
|
||||
|
||||
/**
|
||||
* 根据复杂条件查询羊只档案列表
|
||||
*
|
||||
* @param params 查询参数映射
|
||||
* @param sheepFile 原有的查询条件
|
||||
* @return 羊只档案列表
|
||||
* @param params 自定义参数Map (用于动态SQL)
|
||||
* @param sheepFile 包含List筛选条件的实体对象
|
||||
*/
|
||||
List<SheepFile> selectSheepFileListByCondition(
|
||||
Map<String, Object> params,
|
||||
@@ -73,4 +61,4 @@ public interface ISheepFileService
|
||||
|
||||
@Transactional
|
||||
int updateSheepFile(SheepFile sheepFile);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.zhyc.module.base.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.zhyc.module.base.domain.SheepPedigree;
|
||||
|
||||
/**
|
||||
* VIEWService接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-02-04
|
||||
*/
|
||||
public interface ISheepPedigreeService
|
||||
{
|
||||
/**
|
||||
* 查询VIEW
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return VIEW
|
||||
*/
|
||||
public SheepPedigree selectSheepPedigreeById(Long id);
|
||||
|
||||
/**
|
||||
* 查询VIEW列表
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return VIEW集合
|
||||
*/
|
||||
public List<SheepPedigree> selectSheepPedigreeList(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 新增VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSheepPedigree(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 修改VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSheepPedigree(SheepPedigree sheepPedigree);
|
||||
|
||||
/**
|
||||
* 批量删除VIEW
|
||||
*
|
||||
* @param ids 需要删除的VIEW主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSheepPedigreeByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除VIEW信息
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSheepPedigreeById(Long id);
|
||||
|
||||
public String getBreedNameById(Long id);
|
||||
}
|
||||
@@ -11,12 +11,12 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;import java.util.Map;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 羊只档案Service业务层处理
|
||||
*
|
||||
* @author wyt
|
||||
* * @author wyt
|
||||
* @date 2025-07-13
|
||||
*/
|
||||
@Service
|
||||
@@ -24,11 +24,11 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
@Autowired
|
||||
private SheepFileMapper sheepFileMapper;
|
||||
|
||||
@Autowired
|
||||
private IBreedRamFileService breedRamFileService;
|
||||
|
||||
/**
|
||||
* 查询羊只档案
|
||||
*
|
||||
* @param id 羊只档案主键
|
||||
* @return 羊只档案
|
||||
*/
|
||||
@Override
|
||||
public SheepFile selectSheepFileById(Long id) {
|
||||
@@ -37,21 +37,25 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
|
||||
/**
|
||||
* 查询羊只档案列表
|
||||
*
|
||||
* @param sheepFile 羊只档案
|
||||
* @return 羊只档案
|
||||
*/
|
||||
@Override
|
||||
public List<SheepFile> selectSheepFileList(SheepFile sheepFile) {
|
||||
return sheepFileMapper.selectSheepFileList(sheepFile);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增：模糊搜索耳号实现
|
||||
*/
|
||||
@Override
|
||||
public List<String> searchEarNumbers(String query) {
|
||||
return sheepFileMapper.searchEarNumbers(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SheepFile selectBasSheepByManageTags(String tags) {
|
||||
return sheepFileMapper.selectSheepByManageTags(tags);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> countBySheepType() {
|
||||
return sheepFileMapper.countBySheepType();
|
||||
@@ -71,6 +75,7 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
public List<Map<String, Object>> countParityOfLactation() {
|
||||
return sheepFileMapper.countParityOfLactation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long countInGroup() { return sheepFileMapper.countInGroup(); }
|
||||
|
||||
@@ -84,31 +89,42 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
throw new IllegalArgumentException("非法的字段名: " + fieldName + "，请检查字段名是否正确");
|
||||
}
|
||||
|
||||
// 第二步：调用新的 Provider 方法
|
||||
// 注意：这里调用的是 selectFieldValuesByProvider，不是 selectFieldValues
|
||||
return sheepFileMapper.selectFieldValuesByProvider(fieldName);
|
||||
// 调用Mapper
|
||||
// 注意：这里假设 Mapper 中有 selectFieldValues 方法
|
||||
// 如果你的 Mapper XML 中 id 是 selectFieldValues，请确保 Mapper 接口一致
|
||||
return sheepFileMapper.selectFieldValues(fieldName);
|
||||
}
|
||||
|
||||
/**
|
||||
* 核心修复：复杂条件查询
|
||||
* 必须调用 Mapper 中对应的 XML 方法 (selectSheepFileListByCondition)
|
||||
* 并且传递 sheepFile 对象以启用 <foreach> 列表查询
|
||||
*/
|
||||
@Override
|
||||
public List<SheepFile> selectSheepFileListByCondition(Map<String, Object> params, SheepFile sheepFile) {
|
||||
// 验证并处理参数
|
||||
// 1. 验证并处理自定义参数 (驼峰转下划线、安全检查)
|
||||
Map<String, Object> safeConditions = processConditions(params);
|
||||
|
||||
// 调用新的 Provider 方法
|
||||
List<SheepFile> result = sheepFileMapper.selectByCondition(sheepFile, safeConditions);
|
||||
|
||||
|
||||
return result;
|
||||
|
||||
// 2. 调用 Mapper
|
||||
// 这里必须使用与 XML 中 <select id="selectSheepFileListByCondition"> 对应的方法
|
||||
return sheepFileMapper.selectSheepFileListByCondition(safeConditions, sheepFile);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int insertSheepFile(SheepFile sheepFile) {
|
||||
// int rows = sheepFileMapper.insertSheepFile(sheepFile);
|
||||
// if (rows > 0) { syncToBreedRamFile(sheepFile); }
|
||||
// return rows;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int updateSheepFile(SheepFile sheepFile) {
|
||||
// int rows = sheepFileMapper.updateSheepFile(sheepFile);
|
||||
// if (rows > 0) { syncToBreedRamFile(sheepFile); }
|
||||
// return rows;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -126,12 +142,13 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
String fieldName = entry.getKey();
|
||||
Object value = entry.getValue();
|
||||
|
||||
// 将前端字段名转换为数据库字段名
|
||||
// 将前端字段名转换为数据库字段名 (例如: fatherManageTags -> father_manage_tags)
|
||||
// 这对于 XML 中的 ${key} = #{value} 至关重要
|
||||
String dbFieldName = convertToDbFieldName(fieldName);
|
||||
|
||||
// 验证字段名是否安全
|
||||
if (isValidFieldName(dbFieldName)) {
|
||||
// 处理值，确保不是 Character 类型
|
||||
// 处理值
|
||||
Object safeValue = value;
|
||||
if (value != null) {
|
||||
String strValue = value.toString();
|
||||
@@ -140,23 +157,17 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
if (strValue.startsWith("GT:") || strValue.startsWith("LT:") ||
|
||||
strValue.startsWith("GE:") || strValue.startsWith("LE:")) {
|
||||
String numPart = strValue.substring(3);
|
||||
// 验证数字部分是否安全（防止 SQL 注入）
|
||||
// 验证数字部分是否安全
|
||||
if (isNumeric(numPart)) {
|
||||
safeValue = strValue;
|
||||
} else {
|
||||
// 如果不是数字，忽略这个条件
|
||||
System.out.println("警告：范围条件的值不是数字: " + fieldName + " = " + strValue);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
// 其他值直接使用字符串
|
||||
safeValue = strValue;
|
||||
}
|
||||
}
|
||||
safeParams.put(dbFieldName, safeValue);
|
||||
} else {
|
||||
// 记录日志
|
||||
System.out.println("警告：忽略非法字段名: " + fieldName + " -> " + dbFieldName);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -191,61 +202,17 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
* 扩展字段名白名单验证
|
||||
*/
|
||||
private boolean isValidFieldName(String fieldName) {
|
||||
// 扩展允许查询的字段白名单
|
||||
// 字段白名单
|
||||
String[] allowedFields = {
|
||||
"id",
|
||||
"bs_manage_tags", // 管理耳号
|
||||
"electronic_tags", // 电子耳号
|
||||
"dr_ranch", // 牧场名称
|
||||
"sheepfold_name", // 羊舍名称
|
||||
"variety", // 品种
|
||||
"family", // 家系
|
||||
"name", // 羊只类型
|
||||
"gender", // 性别
|
||||
"birthday", // 出生日期
|
||||
"day_age", // 日龄
|
||||
"month_age", // 月龄
|
||||
"parity", // 胎次
|
||||
"birth_weight", // 出生体重
|
||||
"weaning_date", // 断奶日期
|
||||
"status_id", // 羊只状态
|
||||
"weaning_weight", // 断奶体重
|
||||
"current_weight", // 当前体重
|
||||
"weaning_day_age", // 断奶日龄
|
||||
"weaning_daily_gain", // 断奶日增重
|
||||
"breed", // 繁殖状态
|
||||
"father_manage_tags", // 父亲耳号
|
||||
"mother_manage_tags", // 母亲耳号
|
||||
"receptor_manage_tags", // 受体耳号
|
||||
"grandfather_manage_tags", // 祖父耳号
|
||||
"grandmother_manage_tags", // 祖母耳号
|
||||
"maternal_grandfather_manage_tags", // 外祖父耳号
|
||||
"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", // 来源牧场
|
||||
"update_by", // 修改人
|
||||
"update_time", // 修改日期
|
||||
"create_by", // 创建人
|
||||
"create_time" // 创建日期
|
||||
"id", "bs_manage_tags", "electronic_tags", "dr_ranch", "sheepfold_name", "variety", "family",
|
||||
"name", "gender", "birthday", "day_age", "month_age", "parity", "birth_weight", "weaning_date",
|
||||
"status_id", "weaning_weight", "current_weight", "weaning_day_age", "weaning_daily_gain", "breed",
|
||||
"father_manage_tags", "mother_manage_tags", "receptor_manage_tags", "grandfather_manage_tags",
|
||||
"grandmother_manage_tags", "maternal_grandfather_manage_tags", "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", "update_by", "update_time", "create_by", "create_time"
|
||||
};
|
||||
|
||||
for (String allowedField : allowedFields) {
|
||||
@@ -257,45 +224,32 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private IBreedRamFileService breedRamFileService; // 注入种公羊服务
|
||||
|
||||
/**
|
||||
* 新增羊只档案
|
||||
*/
|
||||
|
||||
/**
|
||||
* 同步公羊数据到种公羊档案表
|
||||
*/
|
||||
private void syncToBreedRamFile(SheepFile sheepFile) {
|
||||
try {
|
||||
// 检查是否已存在
|
||||
BreedRamFile existingRam = breedRamFileService.selectBreedRamFileByOrdinaryEarNumber(
|
||||
sheepFile.getBsManageTags()
|
||||
);
|
||||
|
||||
if (existingRam != null) {
|
||||
// 已存在，更新
|
||||
BreedRamFile updateRam = convertToBreedRamFile(sheepFile);
|
||||
updateRam.setId(existingRam.getId());
|
||||
breedRamFileService.updateBreedRamFile(updateRam);
|
||||
} else {
|
||||
// 不存在，新增
|
||||
BreedRamFile newRam = convertToBreedRamFile(sheepFile);
|
||||
breedRamFileService.insertBreedRamFile(newRam);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 记录日志，但不影响主流
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将SheepFile转换为BreedRamFile
|
||||
*/
|
||||
private BreedRamFile convertToBreedRamFile(SheepFile sheepFile) {
|
||||
BreedRamFile breedRamFile = new BreedRamFile();
|
||||
|
||||
// 基本信息
|
||||
breedRamFile.setOrdinaryEarNumber(sheepFile.getBsManageTags());
|
||||
breedRamFile.setRanchId(sheepFile.getRanchId());
|
||||
breedRamFile.setRanchName(sheepFile.getDrRanch());
|
||||
@@ -307,15 +261,13 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
breedRamFile.setSheepCategory(sheepFile.getName());
|
||||
breedRamFile.setBirthday(sheepFile.getBirthday());
|
||||
|
||||
// 体重相关
|
||||
breedRamFile.setBirthWeight(BigDecimal.valueOf(sheepFile.getBirthWeight()));
|
||||
if (sheepFile.getBirthWeight() != null) breedRamFile.setBirthWeight(BigDecimal.valueOf(sheepFile.getBirthWeight()));
|
||||
breedRamFile.setWeaningDate(sheepFile.getWeaningDate());
|
||||
breedRamFile.setWeaningDayAge(sheepFile.getWeaningDayAge());
|
||||
breedRamFile.setWeaningWeight(BigDecimal.valueOf(sheepFile.getWeaningWeight()));
|
||||
breedRamFile.setWeaningDailyGain(BigDecimal.valueOf(sheepFile.getWeaningDailyGain()));
|
||||
breedRamFile.setCurrentWeight(BigDecimal.valueOf(sheepFile.getCurrentWeight()));
|
||||
if (sheepFile.getWeaningWeight() != null) breedRamFile.setWeaningWeight(BigDecimal.valueOf(sheepFile.getWeaningWeight()));
|
||||
if (sheepFile.getWeaningDailyGain() != null) breedRamFile.setWeaningDailyGain(BigDecimal.valueOf(sheepFile.getWeaningDailyGain()));
|
||||
if (sheepFile.getCurrentWeight() != null) breedRamFile.setCurrentWeight(BigDecimal.valueOf(sheepFile.getCurrentWeight()));
|
||||
|
||||
// 家系信息
|
||||
breedRamFile.setFatherNumber(sheepFile.getFatherManageTags());
|
||||
breedRamFile.setMotherNumber(sheepFile.getMotherManageTags());
|
||||
breedRamFile.setGrandfatherNumber(sheepFile.getGrandfatherManageTags());
|
||||
@@ -323,7 +275,6 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
breedRamFile.setMaternalGrandfatherNumber(sheepFile.getMaternalGrandfatherManageTags());
|
||||
breedRamFile.setMaternalGrandmotherNumber(sheepFile.getMaternalGrandmotherManageTags());
|
||||
|
||||
// 审计信息
|
||||
breedRamFile.setCreateBy(sheepFile.getCreateBy());
|
||||
breedRamFile.setCreateTime(sheepFile.getCreateTime());
|
||||
breedRamFile.setUpdateBy(sheepFile.getUpdateBy());
|
||||
@@ -332,5 +283,4 @@ public class SheepFileServiceImpl implements ISheepFileService {
|
||||
|
||||
return breedRamFile;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.zhyc.module.base.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.base.mapper.SheepPedigreeMapper;
|
||||
import com.zhyc.module.base.domain.SheepPedigree;
|
||||
import com.zhyc.module.base.service.ISheepPedigreeService;
|
||||
|
||||
/**
|
||||
* VIEWService业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-02-04
|
||||
*/
|
||||
@Service
|
||||
public class SheepPedigreeServiceImpl implements ISheepPedigreeService
|
||||
{
|
||||
@Autowired
|
||||
private SheepPedigreeMapper sheepPedigreeMapper;
|
||||
|
||||
/**
|
||||
* 查询VIEW
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return VIEW
|
||||
*/
|
||||
@Override
|
||||
public SheepPedigree selectSheepPedigreeById(Long id)
|
||||
{
|
||||
return sheepPedigreeMapper.selectSheepPedigreeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询VIEW列表
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return VIEW
|
||||
*/
|
||||
@Override
|
||||
public List<SheepPedigree> selectSheepPedigreeList(SheepPedigree sheepPedigree)
|
||||
{
|
||||
return sheepPedigreeMapper.selectSheepPedigreeList(sheepPedigree);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertSheepPedigree(SheepPedigree sheepPedigree)
|
||||
{
|
||||
sheepPedigree.setCreateTime(DateUtils.getNowDate());
|
||||
return sheepPedigreeMapper.insertSheepPedigree(sheepPedigree);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改VIEW
|
||||
*
|
||||
* @param sheepPedigree VIEW
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateSheepPedigree(SheepPedigree sheepPedigree)
|
||||
{
|
||||
sheepPedigree.setUpdateTime(DateUtils.getNowDate());
|
||||
return sheepPedigreeMapper.updateSheepPedigree(sheepPedigree);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除VIEW
|
||||
*
|
||||
* @param ids 需要删除的VIEW主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSheepPedigreeByIds(Long[] ids)
|
||||
{
|
||||
return sheepPedigreeMapper.deleteSheepPedigreeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除VIEW信息
|
||||
*
|
||||
* @param id VIEW主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSheepPedigreeById(Long id)
|
||||
{
|
||||
return sheepPedigreeMapper.deleteSheepPedigreeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBreedNameById(Long id) {
|
||||
if (id == null) { // int类型id为空直接返回空
|
||||
return "";
|
||||
}
|
||||
return sheepPedigreeMapper.selectBreedNameById(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,511 @@
|
||||
package com.zhyc.module.base.util;
|
||||
|
||||
import com.zhyc.module.base.domain.SheepPedigree;
|
||||
import com.zhyc.module.base.service.ISheepPedigreeService;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.ss.util.CellRangeAddress;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URLEncoder;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import com.zhyc.common.utils.DictUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 羊只系谱自定义Excel导出工具（适配羊只系谱表（2）样式）
|
||||
*/
|
||||
@Component
|
||||
public class SheepPedigreeExcelUtils {
|
||||
// 日期格式化
|
||||
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
// 注入Service接口
|
||||
@Autowired
|
||||
private ISheepPedigreeService sheepPedigreeService;
|
||||
|
||||
/**
|
||||
* 导出指定bsManageTags的羊只系谱（符合羊只系谱表（2）样式）
|
||||
*/
|
||||
public void export(HttpServletResponse response, List<SheepPedigree> dataList) throws Exception {
|
||||
// 1. 创建Excel工作簿和工作表
|
||||
Workbook workbook = new XSSFWorkbook();
|
||||
Sheet sheet = workbook.createSheet("羊只系谱");
|
||||
// 设置列宽（6列，索引0-5）
|
||||
sheet.setColumnWidth(0, 15 * 256); // 第1列
|
||||
sheet.setColumnWidth(1, 15 * 256); // 第2列
|
||||
sheet.setColumnWidth(2, 15 * 256); // 第3列
|
||||
sheet.setColumnWidth(3, 15 * 256); // 第4列
|
||||
sheet.setColumnWidth(4, 15 * 256); // 第5列
|
||||
sheet.setColumnWidth(5, 15 * 256); // 第6列
|
||||
|
||||
// 2. 定义样式（新增：通用边框样式，所有单元格都应用）
|
||||
CellStyle titleStyle = createTitleStyle(workbook);
|
||||
CellStyle blockTitleStyle = createBlockTitleStyle(workbook);
|
||||
CellStyle contentStyle = createContentStyle(workbook);
|
||||
CellStyle borderStyle = createBorderStyle(workbook); // 纯边框样式，用于空单元格
|
||||
|
||||
int rowNum = 0;
|
||||
// 遍历数据
|
||||
for (SheepPedigree pedigree : dataList) {
|
||||
// ========== 1. 大标题：羊只系谱 ==========
|
||||
Row titleRow = sheet.createRow(rowNum++);
|
||||
titleRow.setHeightInPoints(25);
|
||||
Cell titleCell = titleRow.createCell(0);
|
||||
titleCell.setCellValue("羊只系谱");
|
||||
titleCell.setCellStyle(titleStyle);
|
||||
// 给标题行所有列应用边框
|
||||
fillRowWithBorder(titleRow, 0, 5, borderStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(rowNum-1, rowNum-1, 0, 5));
|
||||
|
||||
// ========== 2. 基础信息区块 ==========
|
||||
// 普通耳号
|
||||
Row earTagRow = sheet.createRow(rowNum++);
|
||||
earTagRow.setHeightInPoints(20);
|
||||
Cell earTagLabelCell = earTagRow.createCell(0);
|
||||
earTagLabelCell.setCellValue("普通耳号");
|
||||
earTagLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
String earTagContent = pedigree.getBsManageTags() != null ? pedigree.getBsManageTags() : "";
|
||||
Cell earTagValueCell = earTagRow.createCell(1);
|
||||
earTagValueCell.setCellValue(earTagContent);
|
||||
earTagValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 给当前行所有列填充边框
|
||||
fillRowWithBorder(earTagRow, 0, 5, borderStyle);
|
||||
CellRangeAddress earTagMerge = new CellRangeAddress(
|
||||
rowNum - 1,
|
||||
rowNum - 1,
|
||||
1,
|
||||
5
|
||||
);
|
||||
sheet.addMergedRegion(earTagMerge);
|
||||
|
||||
// 品种 + 类别
|
||||
Row varietyRow = sheet.createRow(rowNum++);
|
||||
varietyRow.setHeightInPoints(20);
|
||||
Cell varietyLabelCell = varietyRow.createCell(0);
|
||||
varietyLabelCell.setCellValue("品种");
|
||||
varietyLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
String varietyContent = pedigree.getVariety() != null ? pedigree.getVariety() : "";
|
||||
Cell varietyValueCell = varietyRow.createCell(1);
|
||||
varietyValueCell.setCellValue(varietyContent);
|
||||
varietyValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell categoryLabelCell = varietyRow.createCell(2);
|
||||
categoryLabelCell.setCellValue("类别");
|
||||
categoryLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
String categoryContent = pedigree.getName() != null ? pedigree.getName() : "";
|
||||
Cell categoryValueCell = varietyRow.createCell(3);
|
||||
categoryValueCell.setCellValue(categoryContent);
|
||||
categoryValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 填充边框
|
||||
fillRowWithBorder(varietyRow, 0, 5, borderStyle);
|
||||
CellRangeAddress categoryMerge = new CellRangeAddress(
|
||||
rowNum - 1,
|
||||
rowNum - 1,
|
||||
3,
|
||||
5
|
||||
);
|
||||
sheet.addMergedRegion(categoryMerge);
|
||||
|
||||
// 性别 + 出生重量 + 出生日期
|
||||
Row genderRow = sheet.createRow(rowNum++);
|
||||
genderRow.setHeightInPoints(20);
|
||||
Cell genderLabelCell = genderRow.createCell(0);
|
||||
genderLabelCell.setCellValue("性别");
|
||||
genderLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell genderValueCell = genderRow.createCell(1);
|
||||
genderValueCell.setCellValue(getGenderText(pedigree.getGender()));
|
||||
genderValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell birthWeightLabelCell = genderRow.createCell(2);
|
||||
birthWeightLabelCell.setCellValue("出生重量");
|
||||
birthWeightLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell birthWeightValueCell = genderRow.createCell(3);
|
||||
String birthWeightContent = pedigree.getBirthWeight() != null ? pedigree.getBirthWeight() + "kg" : "";
|
||||
birthWeightValueCell.setCellValue(birthWeightContent);
|
||||
birthWeightValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell birthDateLabelCell = genderRow.createCell(4);
|
||||
birthDateLabelCell.setCellValue("出生日期");
|
||||
birthDateLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell birthDateValueCell = genderRow.createCell(5);
|
||||
String birthDate = pedigree.getBirthday() != null ? DATE_FORMAT.format(pedigree.getBirthday()) : "";
|
||||
birthDateValueCell.setCellValue(birthDate);
|
||||
birthDateValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 填充边框
|
||||
fillRowWithBorder(genderRow, 0, 5, borderStyle);
|
||||
|
||||
// 毛色 + 月龄 + 状态
|
||||
Row furColorRow = sheet.createRow(rowNum++);
|
||||
furColorRow.setHeightInPoints(20);
|
||||
Cell furColorLabelCell = furColorRow.createCell(0);
|
||||
furColorLabelCell.setCellValue("毛色");
|
||||
furColorLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell furColorValueCell = furColorRow.createCell(1);
|
||||
String furColorContent = pedigree.getSheepColor() != null ? pedigree.getSheepColor() : "";
|
||||
furColorValueCell.setCellValue(furColorContent);
|
||||
furColorValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell monthAgeLabelCell = furColorRow.createCell(2);
|
||||
monthAgeLabelCell.setCellValue("月龄");
|
||||
monthAgeLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell monthAgeValueCell = furColorRow.createCell(3);
|
||||
String monthAgeContent = pedigree.getMonthAge() != null ? pedigree.getMonthAge() + "月" : "";
|
||||
monthAgeValueCell.setCellValue(monthAgeContent);
|
||||
monthAgeValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell statusLabelCell = furColorRow.createCell(4);
|
||||
statusLabelCell.setCellValue("状态");
|
||||
statusLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Map<Object, String> statusDict = new HashMap<>();
|
||||
statusDict.put(1L, "在群");
|
||||
statusDict.put(2L, "不在群");
|
||||
statusDict.put(null, "");
|
||||
|
||||
Object statusId = pedigree.getStatusId();
|
||||
String statusContent = statusDict.getOrDefault(statusId, "未知状态");
|
||||
|
||||
Cell statusValueCell = furColorRow.createCell(5);
|
||||
statusValueCell.setCellValue(statusContent);
|
||||
statusValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 填充边框
|
||||
fillRowWithBorder(furColorRow, 0, 5, borderStyle);
|
||||
|
||||
// 繁育状态 + 来源
|
||||
Row breedStatusRow = sheet.createRow(rowNum++);
|
||||
breedStatusRow.setHeightInPoints(20);
|
||||
int currentRow = rowNum - 1;
|
||||
|
||||
Cell breedStatusLabelCell = breedStatusRow.createCell(0);
|
||||
breedStatusLabelCell.setCellValue("繁育状态");
|
||||
breedStatusLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell breedStatusValueCell = breedStatusRow.createCell(1);
|
||||
String breedStatusContent = "";
|
||||
try {
|
||||
Object breedObj = pedigree.getBreed();
|
||||
if (breedObj != null) {
|
||||
breedStatusContent = breedObj.toString().trim();
|
||||
}
|
||||
if (breedStatusContent == null || breedStatusContent.isEmpty()) {
|
||||
breedStatusContent = "";
|
||||
}
|
||||
} catch (Exception e) {
|
||||
breedStatusContent = "";
|
||||
}
|
||||
breedStatusValueCell.setCellValue(breedStatusContent);
|
||||
breedStatusValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell sourceLabelCell = breedStatusRow.createCell(2);
|
||||
sourceLabelCell.setCellValue("来源");
|
||||
sourceLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell sourceValueCell = breedStatusRow.createCell(3);
|
||||
String sourceCode = pedigree.getSource() != null ? pedigree.getSource().toString() : "";
|
||||
String sourceContent = "";
|
||||
try {
|
||||
sourceContent = DictUtils.getDictLabel("source", sourceCode, "");
|
||||
} catch (Exception e) {
|
||||
sourceContent = "";
|
||||
System.err.println("来源字典映射失败：" + e.getMessage());
|
||||
}
|
||||
sourceValueCell.setCellValue(sourceContent);
|
||||
sourceValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 填充边框
|
||||
fillRowWithBorder(breedStatusRow, 0, 5, borderStyle);
|
||||
CellRangeAddress sourceMerge = new CellRangeAddress(
|
||||
currentRow,
|
||||
currentRow,
|
||||
3,
|
||||
5
|
||||
);
|
||||
sheet.addMergedRegion(sourceMerge);
|
||||
|
||||
// 等级 + 家系
|
||||
Row levelRow = sheet.createRow(rowNum++);
|
||||
levelRow.setHeightInPoints(20);
|
||||
int currentLevelRow = rowNum - 1;
|
||||
|
||||
Cell levelLabelCell = levelRow.createCell(0);
|
||||
levelLabelCell.setCellValue("等级");
|
||||
levelLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell levelValueCell = levelRow.createCell(1);
|
||||
String levelContent = pedigree.getGroupName() != null ? pedigree.getGroupName() : "";
|
||||
levelValueCell.setCellValue(levelContent);
|
||||
levelValueCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell familyLabelCell = levelRow.createCell(2);
|
||||
familyLabelCell.setCellValue("家系");
|
||||
familyLabelCell.setCellStyle(contentStyle);
|
||||
|
||||
Cell familyValueCell = levelRow.createCell(3);
|
||||
String familyContent = pedigree.getFamily() != null ? pedigree.getFamily() : "";
|
||||
familyValueCell.setCellValue(familyContent);
|
||||
familyValueCell.setCellStyle(contentStyle);
|
||||
|
||||
// 填充边框
|
||||
fillRowWithBorder(levelRow, 0, 5, borderStyle);
|
||||
CellRangeAddress familyMerge = new CellRangeAddress(
|
||||
currentLevelRow,
|
||||
currentLevelRow,
|
||||
3,
|
||||
5
|
||||
);
|
||||
sheet.addMergedRegion(familyMerge);
|
||||
|
||||
// ========== 3. 系谱信息区块（最终修复版） ==========
|
||||
Row pedigreeTitleRow = sheet.createRow(rowNum++);
|
||||
pedigreeTitleRow.setHeightInPoints(25); // 区块标题行高
|
||||
Cell pedigreeTitleCell = pedigreeTitleRow.createCell(0);
|
||||
pedigreeTitleCell.setCellValue("系谱信息");
|
||||
pedigreeTitleCell.setCellStyle(blockTitleStyle);
|
||||
// 填充标题行边框
|
||||
fillRowWithBorder(pedigreeTitleRow, 0, 5, borderStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(rowNum-1, rowNum-1, 0, 5));
|
||||
|
||||
// 系谱区块起始行（此时rowNum是系谱内容第1行）
|
||||
int pedigreeStartRow = rowNum;
|
||||
int pedigreeTotalRows = 12;
|
||||
// 统一设置系谱12行的行高+填充边框
|
||||
for (int i = 0; i < pedigreeTotalRows; i++) {
|
||||
Row tempRow = sheet.createRow(pedigreeStartRow + i);
|
||||
tempRow.setHeightInPoints(20);
|
||||
// 给每行的0-5列都填充边框样式
|
||||
fillRowWithBorder(tempRow, 0, 5, borderStyle);
|
||||
}
|
||||
|
||||
// ========== 1. 羊只列：第1列合并12行 ==========
|
||||
Row sheepRow = sheet.getRow(pedigreeStartRow);
|
||||
Cell sheepCell = sheepRow.createCell(0);
|
||||
String sheepValue = pedigree.getBsManageTags() != null && !pedigree.getBsManageTags().isEmpty()
|
||||
? "羊只：" + pedigree.getBsManageTags()
|
||||
: "羊只：无";
|
||||
sheepCell.setCellValue(sheepValue);
|
||||
sheepCell.setCellStyle(contentStyle); // 覆盖为内容样式（带边框+字体）
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow,
|
||||
pedigreeStartRow + 11,
|
||||
0,
|
||||
0
|
||||
));
|
||||
|
||||
// ========== 2. 父耳号：第2-3列合并前6行 ==========
|
||||
Row fatherRow = sheet.getRow(pedigreeStartRow);
|
||||
Cell fatherCell = fatherRow.createCell(1);
|
||||
String fatherValue = pedigree.getFatherManageTags() != null && !pedigree.getFatherManageTags().isEmpty()
|
||||
? "父耳号：" + pedigree.getFatherManageTags()
|
||||
: "父耳号：无";
|
||||
fatherCell.setCellValue(fatherValue);
|
||||
fatherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow,
|
||||
pedigreeStartRow + 5,
|
||||
1,
|
||||
2
|
||||
));
|
||||
|
||||
// ========== 3. 母耳号：第2-3列合并后6行 ==========
|
||||
Row motherRow = sheet.getRow(pedigreeStartRow + 6);
|
||||
Cell motherCell = motherRow.createCell(1);
|
||||
String motherValue = pedigree.getMotherManageTags() != null && !pedigree.getMotherManageTags().isEmpty()
|
||||
? "母耳号：" + pedigree.getMotherManageTags()
|
||||
: "母耳号：无";
|
||||
motherCell.setCellValue(motherValue);
|
||||
motherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow + 6,
|
||||
pedigreeStartRow + 11,
|
||||
1,
|
||||
2
|
||||
));
|
||||
|
||||
// ========== 4. 祖父耳号：第4-6列合并1-3行 ==========
|
||||
Row grandFatherRow = sheet.getRow(pedigreeStartRow);
|
||||
Cell grandFatherCell = grandFatherRow.createCell(3);
|
||||
String grandFatherValue = pedigree.getGrandfatherManageTags() != null && !pedigree.getGrandfatherManageTags().isEmpty()
|
||||
? "祖父耳号：" + pedigree.getGrandfatherManageTags()
|
||||
: "祖父耳号：无";
|
||||
grandFatherCell.setCellValue(grandFatherValue);
|
||||
grandFatherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow,
|
||||
pedigreeStartRow + 2,
|
||||
3,
|
||||
5
|
||||
));
|
||||
|
||||
// ========== 5. 祖母耳号：第4-6列合并4-6行 ==========
|
||||
Row grandMotherRow = sheet.getRow(pedigreeStartRow + 3);
|
||||
Cell grandMotherCell = grandMotherRow.createCell(3);
|
||||
String grandMotherValue = pedigree.getGrandmotherManageTags() != null && !pedigree.getGrandmotherManageTags().isEmpty()
|
||||
? "祖母耳号：" + pedigree.getGrandmotherManageTags()
|
||||
: "祖母耳号：无";
|
||||
grandMotherCell.setCellValue(grandMotherValue);
|
||||
grandMotherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow + 3,
|
||||
pedigreeStartRow + 5,
|
||||
3,
|
||||
5
|
||||
));
|
||||
|
||||
// ========== 6. 外祖父耳号：第4-6列合并7-9行 ==========
|
||||
Row maternalGrandFatherRow = sheet.getRow(pedigreeStartRow + 6);
|
||||
Cell maternalGrandFatherCell = maternalGrandFatherRow.createCell(3);
|
||||
String maternalGrandFatherValue = pedigree.getMaternalGrandfatherManageTags() != null && !pedigree.getMaternalGrandfatherManageTags().isEmpty()
|
||||
? "外祖父耳号：" + pedigree.getMaternalGrandfatherManageTags()
|
||||
: "外祖父耳号：无";
|
||||
maternalGrandFatherCell.setCellValue(maternalGrandFatherValue);
|
||||
maternalGrandFatherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow + 6,
|
||||
pedigreeStartRow + 8,
|
||||
3,
|
||||
5
|
||||
));
|
||||
|
||||
// ========== 7. 外祖母耳号：第4-6列合并10-12行 ==========
|
||||
Row maternalGrandMotherRow = sheet.getRow(pedigreeStartRow + 9);
|
||||
Cell maternalGrandMotherCell = maternalGrandMotherRow.createCell(3);
|
||||
String maternalGrandMotherValue = pedigree.getMaternalGrandmotherManageTags() != null && !pedigree.getMaternalGrandmotherManageTags().isEmpty()
|
||||
? "外祖母耳号：" + pedigree.getMaternalGrandmotherManageTags()
|
||||
: "外祖母耳号：无";
|
||||
maternalGrandMotherCell.setCellValue(maternalGrandMotherValue);
|
||||
maternalGrandMotherCell.setCellStyle(contentStyle);
|
||||
sheet.addMergedRegion(new CellRangeAddress(
|
||||
pedigreeStartRow + 9,
|
||||
pedigreeStartRow + 11,
|
||||
3,
|
||||
5
|
||||
));
|
||||
|
||||
// 更新rowNum到系谱区块结束行+1
|
||||
rowNum = pedigreeStartRow + pedigreeTotalRows;
|
||||
|
||||
}
|
||||
|
||||
// ========== 4. 输出Excel ==========
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
String fileName = URLEncoder.encode("羊只系谱_" + System.currentTimeMillis(), "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-Disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
|
||||
OutputStream os = response.getOutputStream();
|
||||
workbook.write(os);
|
||||
os.flush();
|
||||
os.close();
|
||||
workbook.close();
|
||||
}
|
||||
|
||||
// ========== 新增：填充整行边框的工具方法 ==========
|
||||
private void fillRowWithBorder(Row row, int startCol, int endCol, CellStyle borderStyle) {
|
||||
for (int col = startCol; col <= endCol; col++) {
|
||||
Cell cell = row.getCell(col);
|
||||
if (cell == null) {
|
||||
cell = row.createCell(col);
|
||||
}
|
||||
// 仅当单元格无样式时设置边框样式（避免覆盖已有内容样式）
|
||||
if (cell.getCellStyle() == null || cell.getCellStyle().getBorderTop() == BorderStyle.NONE) {
|
||||
cell.setCellStyle(borderStyle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 样式定义 ==========
|
||||
private static CellStyle createTitleStyle(Workbook workbook) {
|
||||
CellStyle style = workbook.createCellStyle();
|
||||
Font font = workbook.createFont();
|
||||
font.setFontName("微软雅黑");
|
||||
font.setFontHeightInPoints((short) 16);
|
||||
font.setBold(true);
|
||||
style.setFont(font);
|
||||
style.setAlignment(HorizontalAlignment.CENTER);
|
||||
style.setVerticalAlignment(VerticalAlignment.CENTER);
|
||||
// 标题样式带完整边框
|
||||
style.setBorderTop(BorderStyle.THIN);
|
||||
style.setBorderBottom(BorderStyle.THIN);
|
||||
style.setBorderLeft(BorderStyle.THIN);
|
||||
style.setBorderRight(BorderStyle.THIN);
|
||||
return style;
|
||||
}
|
||||
|
||||
private static CellStyle createBlockTitleStyle(Workbook workbook) {
|
||||
CellStyle style = workbook.createCellStyle();
|
||||
Font font = workbook.createFont();
|
||||
font.setFontName("微软雅黑");
|
||||
font.setFontHeightInPoints((short) 14);
|
||||
font.setBold(true);
|
||||
style.setFont(font);
|
||||
style.setAlignment(HorizontalAlignment.CENTER);
|
||||
style.setVerticalAlignment(VerticalAlignment.CENTER);
|
||||
style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
|
||||
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
|
||||
// 区块标题带完整边框
|
||||
style.setBorderTop(BorderStyle.THIN);
|
||||
style.setBorderBottom(BorderStyle.THIN);
|
||||
style.setBorderLeft(BorderStyle.THIN);
|
||||
style.setBorderRight(BorderStyle.THIN);
|
||||
return style;
|
||||
}
|
||||
|
||||
private static CellStyle createContentStyle(Workbook workbook) {
|
||||
CellStyle style = workbook.createCellStyle();
|
||||
Font font = workbook.createFont();
|
||||
font.setFontName("微软雅黑");
|
||||
font.setFontHeightInPoints((short) 12);
|
||||
style.setFont(font);
|
||||
style.setAlignment(HorizontalAlignment.LEFT);
|
||||
style.setVerticalAlignment(VerticalAlignment.CENTER);
|
||||
// 内容样式带完整边框
|
||||
style.setBorderTop(BorderStyle.THIN);
|
||||
style.setBorderBottom(BorderStyle.THIN);
|
||||
style.setBorderLeft(BorderStyle.THIN);
|
||||
style.setBorderRight(BorderStyle.THIN);
|
||||
return style;
|
||||
}
|
||||
|
||||
// 新增：纯边框样式（用于空单元格）
|
||||
private static CellStyle createBorderStyle(Workbook workbook) {
|
||||
CellStyle style = workbook.createCellStyle();
|
||||
// 仅设置边框，无字体/背景色（避免覆盖内容样式）
|
||||
style.setBorderTop(BorderStyle.THIN);
|
||||
style.setBorderBottom(BorderStyle.THIN);
|
||||
style.setBorderLeft(BorderStyle.THIN);
|
||||
style.setBorderRight(BorderStyle.THIN);
|
||||
style.setAlignment(HorizontalAlignment.LEFT);
|
||||
style.setVerticalAlignment(VerticalAlignment.CENTER);
|
||||
return style;
|
||||
}
|
||||
|
||||
// 性别数字转文字
|
||||
private static String getGenderText(Long gender) {
|
||||
if (gender == null) return "";
|
||||
switch (gender.intValue()) {
|
||||
case 1: return "母";
|
||||
case 2: return "公";
|
||||
case 3: return "阉羊";
|
||||
case 4: return "兼性";
|
||||
default: return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,15 @@ public class ScWeanRecordController extends BaseController {
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 【新增】模糊查询耳号列表 (用于前端下拉框远程搜索)
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('Weaning:weaning_record:list')")
|
||||
@GetMapping("/search_ear_numbers")
|
||||
public AjaxResult searchEarNumbers(@RequestParam("query") String query) {
|
||||
List<String> list = scWeanRecordService.searchEarNumbers(query);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出断奶记录列表
|
||||
@@ -121,18 +130,4 @@ public class ScWeanRecordController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 模糊查询母羊耳号列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('breed:lambing_records:query')") // 根据实际权限修改
|
||||
@GetMapping("/search_ear_numbers")
|
||||
public AjaxResult searchEarNumber(@RequestParam("query") String query) {
|
||||
try {
|
||||
List<String> earNumbers = scWeanRecordService.searchEarNumbers(query);
|
||||
return success(earNumbers);
|
||||
} catch (Exception e) {
|
||||
logger.error("搜索耳号异常", e);
|
||||
return error("搜索耳号失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,9 @@ public class SxCustomerController extends BaseController {
|
||||
@Log(title = "客户管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SxCustomer sxCustomer) {
|
||||
// 【新增】自动填充当前登录用户的 userId 和 deptId
|
||||
sxCustomer.setUserId(getUserId());
|
||||
sxCustomer.setDeptId(getDeptId());
|
||||
return toAjax(sxCustomerService.insertSxCustomer(sxCustomer));
|
||||
}
|
||||
|
||||
@@ -82,4 +85,4 @@ public class SxCustomerController extends BaseController {
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
return toAjax(sxCustomerService.deleteSxCustomerByIds(ids));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -78,6 +78,9 @@ public class SxSheepSaleController extends BaseController {
|
||||
@Log(title = "羊只销售记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SxSheepSale sxSheepSale) {
|
||||
// 【新增】自动填充当前登录用户的 userId 和 deptId
|
||||
sxSheepSale.setUserId(getUserId());
|
||||
sxSheepSale.setDeptId(getDeptId());
|
||||
return toAjax(sxSheepSaleService.insertSxSheepSale(sxSheepSale));
|
||||
}
|
||||
|
||||
|
||||
@@ -5,56 +5,134 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.zhyc.common.annotation.Excel;
|
||||
import com.zhyc.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 客户管理对象 sx_customer
|
||||
* * @author ruoyi
|
||||
* @date 2025-08-18
|
||||
*/
|
||||
public class SxCustomer extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键ID */
|
||||
private Long id;
|
||||
|
||||
/** 客户名称 */
|
||||
@Excel(name = "客户名称")
|
||||
private String name;
|
||||
|
||||
/** 客户电话 */
|
||||
@Excel(name = "客户电话")
|
||||
private String phone;
|
||||
|
||||
/** 省 */
|
||||
@Excel(name = "省")
|
||||
private String province;
|
||||
|
||||
/** 市 */
|
||||
@Excel(name = "市")
|
||||
private String city;
|
||||
|
||||
/** 区县 */
|
||||
@Excel(name = "区县")
|
||||
private String district;
|
||||
|
||||
/** 详细地址 */
|
||||
@Excel(name = "详细地址")
|
||||
private String address;
|
||||
|
||||
/** 用户ID */
|
||||
private Long userId;
|
||||
|
||||
/** 部门ID */
|
||||
private Long deptId;
|
||||
|
||||
// Getters and Setters
|
||||
public Long getId() { return id; }
|
||||
public void setId(Long id) { this.id = id; }
|
||||
public String getName() { return name; }
|
||||
public void setName(String name) { this.name = name; }
|
||||
public String getPhone() { return phone; }
|
||||
public void setPhone(String phone) { this.phone = phone; }
|
||||
public String getProvince() { return province; }
|
||||
public void setProvince(String province) { this.province = province; }
|
||||
public String getCity() { return city; }
|
||||
public void setCity(String city) { this.city = city; }
|
||||
public String getDistrict() { return district; }
|
||||
public void setDistrict(String district) { this.district = district; }
|
||||
public String getAddress() { return address; }
|
||||
public void setAddress(String address) { this.address = address; }
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(String phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public String getProvince() {
|
||||
return province;
|
||||
}
|
||||
|
||||
public void setProvince(String province) {
|
||||
this.province = province;
|
||||
}
|
||||
|
||||
public String getCity() {
|
||||
return city;
|
||||
}
|
||||
|
||||
public void setCity(String city) {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getDistrict() {
|
||||
return district;
|
||||
}
|
||||
|
||||
public void setDistrict(String district) {
|
||||
this.district = district;
|
||||
}
|
||||
|
||||
public String getAddress() {
|
||||
return address;
|
||||
}
|
||||
|
||||
public void setAddress(String address) {
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
public Long getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Long userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", id)
|
||||
.append("name", name)
|
||||
.append("phone", phone)
|
||||
.append("province", province)
|
||||
.append("city", city)
|
||||
.append("district", district)
|
||||
.append("address", address)
|
||||
.append("id", getId())
|
||||
.append("name", getName())
|
||||
.append("phone", getPhone())
|
||||
.append("province", getProvince())
|
||||
.append("city", getCity())
|
||||
.append("district", getDistrict())
|
||||
.append("address", getAddress())
|
||||
.append("remark", getRemark())
|
||||
.append("userId", getUserId())
|
||||
.append("deptId", getDeptId())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -147,6 +147,12 @@ public class SxSheepSale extends BaseEntity {
|
||||
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createdAt;
|
||||
|
||||
/** 用户ID */
|
||||
private Long userId;
|
||||
|
||||
/** 部门ID */
|
||||
private Long deptId;
|
||||
|
||||
// 【新增】非数据库字段：用于前端展示和选择羊舍后传递多个耳号
|
||||
private List<String> bsManageTagsList;
|
||||
|
||||
@@ -423,6 +429,22 @@ public class SxSheepSale extends BaseEntity {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public Long getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Long userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
// 【新增】getter 和 setter 方法
|
||||
public List<String> getBsManageTagsList() {
|
||||
return bsManageTagsList;
|
||||
@@ -531,6 +553,8 @@ public class SxSheepSale extends BaseEntity {
|
||||
.append("handlerId", getHandlerId())
|
||||
.append("createdBy", getCreatedBy())
|
||||
.append("createdAt", getCreatedAt())
|
||||
.append("userId", getUserId())
|
||||
.append("deptId", getDeptId())
|
||||
.append("remark", getRemark())
|
||||
.append("customerName", getCustomerName())
|
||||
.append("customerPhone", getCustomerPhone())
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.zhyc.module.sale.service.impl;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.zhyc.common.annotation.DataScope; // 【新增】引入数据权限注解
|
||||
import com.zhyc.module.sale.mapper.SxCustomerMapper;
|
||||
import com.zhyc.module.sale.domain.SxCustomer;
|
||||
import com.zhyc.module.sale.service.ISxCustomerService;
|
||||
@@ -17,7 +18,14 @@ public class SxCustomerServiceImpl implements ISxCustomerService {
|
||||
return sxCustomerMapper.selectSxCustomerById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询客户管理列表
|
||||
* 【新增】添加数据权限过滤注解
|
||||
* deptAlias = "c": 对应 Mapper.xml 中表 sx_customer 的别名 c
|
||||
* userAlias = "c": 对应 Mapper.xml 中表 sx_customer 的别名 c
|
||||
*/
|
||||
@Override
|
||||
@DataScope(deptAlias = "c", userAlias = "c")
|
||||
public List<SxCustomer> selectSxCustomerList(SxCustomer sxCustomer) {
|
||||
return sxCustomerMapper.selectSxCustomerList(sxCustomer);
|
||||
}
|
||||
@@ -41,4 +49,4 @@ public class SxCustomerServiceImpl implements ISxCustomerService {
|
||||
public int deleteSxCustomerById(Long id) {
|
||||
return sxCustomerMapper.deleteSxCustomerById(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,7 @@ import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.zhyc.common.exception.ServiceException;
|
||||
import com.zhyc.common.annotation.DataScope; // 【新增】引入数据权限注解
|
||||
import com.zhyc.module.sale.mapper.SxSheepSaleMapper;
|
||||
import com.zhyc.module.sale.domain.SxSheepSale;
|
||||
import com.zhyc.module.sale.service.ISxSheepSaleService;
|
||||
@@ -35,11 +34,15 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
|
||||
/**
|
||||
* 查询羊只销售记录列表
|
||||
* 【新增】添加数据权限过滤注解
|
||||
* deptAlias = "s": 对应 Mapper.xml 中表 sx_sheep_sale 的别名 s
|
||||
* userAlias = "s": 对应 Mapper.xml 中表 sx_sheep_sale 的别名 s
|
||||
*
|
||||
* @param sxSheepSale 羊只销售记录
|
||||
* @return 羊只销售记录
|
||||
*/
|
||||
@Override
|
||||
@DataScope(deptAlias = "s", userAlias = "s")
|
||||
public List<SxSheepSale> selectSxSheepSaleList(SxSheepSale sxSheepSale) {
|
||||
return sxSheepSaleMapper.selectSxSheepSaleList(sxSheepSale);
|
||||
}
|
||||
@@ -51,9 +54,8 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class) // 事务控制
|
||||
public int insertSxSheepSale(SxSheepSale sxSheepSale) {
|
||||
// 1. 业务验证
|
||||
// 1. 业务验证 (例如：销售日期不能为空，淘汰销售必须填写疾病类型等)
|
||||
validateSalesFields(sxSheepSale);
|
||||
|
||||
// 2. 自动计算逻辑
|
||||
@@ -80,7 +82,6 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateSxSheepSale(SxSheepSale sxSheepSale) {
|
||||
// 1. 业务验证
|
||||
validateSalesFields(sxSheepSale);
|
||||
@@ -88,7 +89,7 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
// 2. 自动计算逻辑
|
||||
calculateSalesFields(sxSheepSale);
|
||||
|
||||
// 3. 处理耳号列表
|
||||
// 3. 处理耳号列表（多个耳号用逗号分隔）
|
||||
if (sxSheepSale.getBsManageTagsList() != null && !sxSheepSale.getBsManageTagsList().isEmpty()) {
|
||||
sxSheepSale.setBsManageTags(String.join(",", sxSheepSale.getBsManageTagsList()));
|
||||
}
|
||||
@@ -120,7 +121,7 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据耳号查询羊只信息
|
||||
* 【新增】根据耳号查询羊只信息
|
||||
*/
|
||||
@Override
|
||||
public SxSheepSale selectSheepInfoByTag(String bsManageTags) {
|
||||
@@ -128,7 +129,7 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 自动计算总价、平均体重、平均单只价格
|
||||
* 【新增】自动计算总价、平均体重、平均单只价格
|
||||
*/
|
||||
private void calculateSalesFields(SxSheepSale sxSheepSale) {
|
||||
String pricingMethod = sxSheepSale.getPricingMethod();
|
||||
@@ -139,48 +140,59 @@ public class SxSheepSaleServiceImpl implements ISxSheepSaleService {
|
||||
if (sxSheepSale.getBsManageTagsList() != null && !sxSheepSale.getBsManageTagsList().isEmpty()) {
|
||||
sheepCount = sxSheepSale.getBsManageTagsList().size();
|
||||
} else if (sxSheepSale.getBsManageTags() != null && !sxSheepSale.getBsManageTags().isEmpty()) {
|
||||
// 如果前端没有传递列表，但有逗号分隔的字符串，也计算数量
|
||||
sheepCount = sxSheepSale.getBsManageTags().split(",").length;
|
||||
}
|
||||
|
||||
if ("按个体".equals(pricingMethod)) {
|
||||
// 总价 = 单价 * 数量
|
||||
if (unitPrice != null) {
|
||||
sxSheepSale.setTotalPrice(unitPrice.multiply(new BigDecimal(sheepCount)));
|
||||
}
|
||||
// 平均单只价格就是单价
|
||||
sxSheepSale.setAvgPricePerSheep(unitPrice);
|
||||
|
||||
} else if ("按体重".equals(pricingMethod)) {
|
||||
BigDecimal totalWeight = sxSheepSale.getTotalWeight();
|
||||
// 总价 = 单价 * 总重量
|
||||
if (unitPrice != null && totalWeight != null) {
|
||||
sxSheepSale.setTotalPrice(unitPrice.multiply(totalWeight));
|
||||
}
|
||||
// 平均体重 = 总重量 / 数量
|
||||
if (totalWeight != null && sheepCount > 0) {
|
||||
sxSheepSale.setAvgWeight(totalWeight.divide(new BigDecimal(sheepCount), 2, RoundingMode.HALF_UP));
|
||||
}
|
||||
// 平均单只价格 = 总价 / 数量
|
||||
if (sxSheepSale.getTotalPrice() != null && sheepCount > 0) {
|
||||
sxSheepSale.setAvgPricePerSheep(sxSheepSale.getTotalPrice().divide(new BigDecimal(sheepCount), 2, RoundingMode.HALF_UP));
|
||||
}
|
||||
}
|
||||
// 可以添加其他计价方式的逻辑
|
||||
}
|
||||
|
||||
/**
|
||||
* 业务字段验证 (使用 ServiceException)
|
||||
* 【新增】业务字段验证
|
||||
*/
|
||||
private void validateSalesFields(SxSheepSale sxSheepSale) {
|
||||
// 验证销售日期不能为空
|
||||
if (sxSheepSale.getSaleDate() == null) {
|
||||
throw new ServiceException("销售日期不能为空！");
|
||||
throw new RuntimeException("销售日期不能为空！");
|
||||
}
|
||||
|
||||
String saleType = sxSheepSale.getSaleType();
|
||||
// 如果销售类别是"淘汰销售"或"淘汰屠宰"，则疾病类型和班组不能为空
|
||||
if ("淘汰销售".equals(saleType) || "淘汰屠宰".equals(saleType)) {
|
||||
if (sxSheepSale.getDiseaseType() == null) {
|
||||
throw new ServiceException("淘汰销售或淘汰屠宰必须选择疾病类型！");
|
||||
throw new RuntimeException("淘汰销售或淘汰屠宰必须选择疾病类型！");
|
||||
}
|
||||
if (sxSheepSale.getGroupCode() == null) {
|
||||
throw new ServiceException("淘汰销售或淘汰屠宰必须选择班组！");
|
||||
throw new RuntimeException("淘汰销售或淘汰屠宰必须选择班组！");
|
||||
}
|
||||
}
|
||||
// 如果疾病类型是"病残羊"，则次要原因不能为空
|
||||
if ("病残羊".equals(sxSheepSale.getDiseaseType())) {
|
||||
if (sxSheepSale.getSecondaryReason() == null || sxSheepSale.getSecondaryReason().trim().isEmpty()) {
|
||||
throw new ServiceException("疾病类型为病残羊时，必须填写次要原因！");
|
||||
throw new RuntimeException("疾病类型为病残羊时，必须填写次要原因！");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhyc.module.base.mapper.SheepFileMapper">
|
||||
|
||||
|
||||
<resultMap type="SheepFile" id="SheepFileResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="bsManageTags" column="bs_manage_tags" />
|
||||
@@ -79,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<select id="selectSheepFileList" parameterType="SheepFile" resultMap="SheepFileResult">
|
||||
<include refid="selectSheepFileVo"/>
|
||||
<where>
|
||||
<where>
|
||||
AND (is_delete = 0 OR is_delete IS NULL)
|
||||
<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>
|
||||
@@ -90,91 +91,111 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="statusId != null "> and status_id = #{statusId}</if>
|
||||
<if test="breed != null and breed != ''"> and breed = #{breed}</if>
|
||||
</where>
|
||||
ORDER BY id ASC <!-- 修改为升序 -->
|
||||
ORDER BY id ASC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="searchEarNumbers" resultType="String">
|
||||
SELECT DISTINCT bs_manage_tags
|
||||
FROM sheep_file
|
||||
WHERE (is_delete = 0 OR is_delete IS NULL)
|
||||
<if test="query != null and query != ''">
|
||||
AND bs_manage_tags LIKE CONCAT('%', #{query}, '%')
|
||||
</if>
|
||||
ORDER BY bs_manage_tags ASC
|
||||
LIMIT 20
|
||||
</select>
|
||||
|
||||
<select id="selectSheepFileById" parameterType="Long" resultMap="SheepFileResult">
|
||||
<include refid="selectSheepFileVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectSheepByManageTags" parameterType="String" resultMap="SheepFileResult">
|
||||
<include refid="selectSheepFileVo"/>
|
||||
where bs_manage_tags = #{tags}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<!-- 在群羊只总数 -->
|
||||
<select id="countInGroup" resultType="java.lang.Long">
|
||||
SELECT COUNT(*) FROM sheep_file WHERE status_id = 1
|
||||
SELECT COUNT(*) FROM sheep_file WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
|
||||
</select>
|
||||
|
||||
<!-- 羊只类别分布 -->
|
||||
<select id="countBySheepType" resultType="java.util.Map">
|
||||
SELECT name AS name, COUNT(*) AS value
|
||||
FROM sheep_file
|
||||
WHERE status_id = 1
|
||||
WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
|
||||
GROUP BY name
|
||||
</select>
|
||||
|
||||
<!-- 繁育状态分布 -->
|
||||
<select id="countByBreedStatus" resultType="java.util.Map">
|
||||
SELECT breed AS name, COUNT(*) AS value
|
||||
FROM sheep_file
|
||||
WHERE status_id = 1
|
||||
WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
|
||||
GROUP BY breed
|
||||
</select>
|
||||
|
||||
<!-- 品种分布 -->
|
||||
<select id="countByVariety" resultType="java.util.Map">
|
||||
SELECT variety AS name, COUNT(*) AS value
|
||||
FROM sheep_file
|
||||
WHERE status_id = 1
|
||||
WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
|
||||
GROUP BY variety
|
||||
</select>
|
||||
|
||||
<!-- 泌乳羊胎次分布 -->
|
||||
<select id="countParityOfLactation" resultType="java.util.Map">
|
||||
SELECT parity AS name, COUNT(*) AS value
|
||||
FROM sheep_file
|
||||
WHERE status_id = 1 AND name = '泌乳羊'
|
||||
WHERE status_id = 1 AND name = '泌乳羊' AND (is_delete = 0 OR is_delete IS NULL)
|
||||
GROUP BY parity
|
||||
ORDER BY parity
|
||||
</select>
|
||||
|
||||
<!--
|
||||
获取字段唯一值的SQL映射
|
||||
说明：这个查询使用 ${fieldName} 直接拼接字段名，因为MyBatis的#{}不支持列名作为参数
|
||||
安全性：通过Service层的白名单验证来确保fieldName的安全性
|
||||
-->
|
||||
<select id="selectFieldValues" parameterType="String" resultType="String">
|
||||
SELECT
|
||||
DISTINCT ${fieldName} as field_value
|
||||
FROM
|
||||
sheep_file
|
||||
WHERE
|
||||
<!-- 过滤空值和NULL值，确保返回的数据质量 -->
|
||||
${fieldName} IS NOT NULL
|
||||
AND ${fieldName} != ''
|
||||
AND ${fieldName} != 'null'
|
||||
ORDER BY
|
||||
<!-- 按字母顺序排序，方便前端显示 -->
|
||||
${fieldName} ASC
|
||||
SELECT DISTINCT ${fieldName} as field_value
|
||||
FROM sheep_file
|
||||
WHERE ${fieldName} IS NOT NULL AND ${fieldName} != '' AND ${fieldName} != 'null'
|
||||
ORDER BY ${fieldName} ASC
|
||||
</select>
|
||||
|
||||
<select id="selectSheepFileListByCondition" parameterType="map" resultMap="SheepFileResult">
|
||||
<select id="selectSheepFileListByCondition" resultMap="SheepFileResult">
|
||||
<include refid="selectSheepFileVo"/>
|
||||
FROM sheep_file
|
||||
<where>
|
||||
<!-- 逻辑删除过滤 -->
|
||||
AND is_delete = 0
|
||||
AND (is_delete = 0 OR is_delete IS NULL)
|
||||
|
||||
<!-- 原有的 SheepFile 条件（保持兼容性） -->
|
||||
<if test="sheepFile != null">
|
||||
<if test="sheepFile.bsManageTags != null and sheepFile.bsManageTags != ''">
|
||||
<if test="sheepFile.allEarNumbers != null and sheepFile.allEarNumbers.size() > 0">
|
||||
AND bs_manage_tags IN
|
||||
<foreach collection="sheepFile.allEarNumbers" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="sheepFile.allEleEarNumbers != null and sheepFile.allEleEarNumbers.size() > 0">
|
||||
AND electronic_tags IN
|
||||
<foreach collection="sheepFile.allEleEarNumbers" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="sheepFile.allGenders != null and sheepFile.allGenders.size() > 0">
|
||||
AND gender IN
|
||||
<foreach collection="sheepFile.allGenders" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="sheepFile.allBreedingStatus != null and sheepFile.allBreedingStatus.size() > 0">
|
||||
AND breed IN
|
||||
<foreach collection="sheepFile.allBreedingStatus" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="sheepFile.allSheepTypes != null and sheepFile.allSheepTypes.size() > 0">
|
||||
AND name IN
|
||||
<foreach collection="sheepFile.allSheepTypes" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
<if test="sheepFile.bsManageTags != null and sheepFile.bsManageTags != '' and (sheepFile.allEarNumbers == null or sheepFile.allEarNumbers.size() == 0)">
|
||||
AND bs_manage_tags LIKE CONCAT('%', #{sheepFile.bsManageTags}, '%')
|
||||
</if>
|
||||
<if test="sheepFile.electronicTags != null and sheepFile.electronicTags != ''">
|
||||
<if test="sheepFile.electronicTags != null and sheepFile.electronicTags != '' and (sheepFile.allEleEarNumbers == null or sheepFile.allEleEarNumbers.size() == 0)">
|
||||
AND electronic_tags LIKE CONCAT('%', #{sheepFile.electronicTags}, '%')
|
||||
</if>
|
||||
<if test="sheepFile.drRanch != null and sheepFile.drRanch != ''">
|
||||
@@ -183,23 +204,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="sheepFile.variety != null and sheepFile.variety != ''">
|
||||
AND variety LIKE CONCAT('%', #{sheepFile.variety}, '%')
|
||||
</if>
|
||||
<if test="sheepFile.name != null and sheepFile.name != ''">
|
||||
<if test="sheepFile.name != null and sheepFile.name != '' and (sheepFile.allSheepTypes == null or sheepFile.allSheepTypes.size() == 0)">
|
||||
AND name LIKE CONCAT('%', #{sheepFile.name}, '%')
|
||||
</if>
|
||||
<if test="sheepFile.gender != null">
|
||||
<if test="sheepFile.gender != null and (sheepFile.allGenders == null or sheepFile.allGenders.size() == 0)">
|
||||
AND gender = #{sheepFile.gender}
|
||||
</if>
|
||||
<if test="sheepFile.statusId != null">
|
||||
AND status_id = #{sheepFile.statusId}
|
||||
</if>
|
||||
<if test="sheepFile.breed != null and sheepFile.breed != ''">
|
||||
<if test="sheepFile.breed != null and sheepFile.breed != '' and (sheepFile.allBreedingStatus == null or sheepFile.allBreedingStatus.size() == 0)">
|
||||
AND breed LIKE CONCAT('%', #{sheepFile.breed}, '%')
|
||||
</if>
|
||||
</if>
|
||||
|
||||
<!-- 动态条件处理 - 使用多个if标签代替复杂的choose -->
|
||||
<if test="params != null and !params.isEmpty()">
|
||||
<!-- 空值条件 -->
|
||||
<foreach collection="params.entrySet()" item="value" index="key">
|
||||
<if test="value != null and value.toString() == 'IS_NULL'">
|
||||
AND ${key} IS NULL
|
||||
@@ -207,12 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="value != null and value.toString() == 'NOT_NULL'">
|
||||
AND ${key} IS NOT NULL
|
||||
</if>
|
||||
</foreach>
|
||||
|
||||
<!-- 范围条件 -->
|
||||
<foreach collection="params.entrySet()" item="value" index="key">
|
||||
<!-- 显式将 value 转换为字符串 -->
|
||||
<if test="value != null and value.toString() != null">
|
||||
<if test="value != null and value.toString() != null and (value.toString().startsWith('GT:') or value.toString().startsWith('LT:') or value.toString().startsWith('GE:') or value.toString().startsWith('LE:'))">
|
||||
<choose>
|
||||
<when test="value.toString().startsWith('GT:')">
|
||||
AND ${key} > #{value.toString().substring(3)}
|
||||
@@ -228,21 +243,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
</foreach>
|
||||
|
||||
<!-- 列表条件 -->
|
||||
<foreach collection="params.entrySet()" item="value" index="key">
|
||||
<if test="value != null and value.toString() != null and value.toString().contains(',')">
|
||||
<if test="value != null and value.toString() != null and value.toString().contains(',') and !value.toString().startsWith('GT:')">
|
||||
AND ${key} IN
|
||||
<foreach collection="value.toString().split(',')" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</foreach>
|
||||
|
||||
<!-- 模糊查询条件（针对文本字段） -->
|
||||
<foreach collection="params.entrySet()" item="value" index="key">
|
||||
<if test="value != null and value.toString() != null">
|
||||
<if test="value != null and value.toString() != 'IS_NULL' and value.toString() != 'NOT_NULL' and !value.toString().contains(',') and !value.toString().startsWith('GT:') and !value.toString().startsWith('LT:') and !value.toString().startsWith('GE:') and !value.toString().startsWith('LE:')">
|
||||
<choose>
|
||||
<when test="key == 'bs_manage_tags' or key == 'electronic_tags' or
|
||||
key == 'dr_ranch' or key == 'sheepfold_name' or
|
||||
@@ -253,7 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
AND ${key} LIKE CONCAT('%', #{value}, '%')
|
||||
</when>
|
||||
<otherwise>
|
||||
<!-- 普通等于条件 -->
|
||||
AND ${key} = #{value}
|
||||
</otherwise>
|
||||
</choose>
|
||||
@@ -264,23 +272,234 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
ORDER BY id ASC
|
||||
</select>
|
||||
|
||||
<!-- <!– 查询所有公羊（gender=2） –>-->
|
||||
<!-- <select id="selectRamList" resultMap="SheepFileResult">-->
|
||||
<!-- <include refid="selectSheepFileVo"/>-->
|
||||
<!-- where gender = 2 and (is_delete = 0 or is_delete is null)-->
|
||||
<!-- order by create_time desc-->
|
||||
<!-- </select>-->
|
||||
|
||||
<!-- 查询所有公羊 -->
|
||||
<select id="selectRamList" resultMap="SheepFileResult">
|
||||
SELECT * FROM sheep_file
|
||||
WHERE gender = 2 AND is_delete = 0
|
||||
</select>
|
||||
|
||||
<!-- 根据管理耳号查询 -->
|
||||
<select id="selectSheepFileByManageTags" resultMap="SheepFileResult">
|
||||
SELECT * FROM sheep_file
|
||||
WHERE bs_manage_tags = #{manageTags} AND is_delete = 0
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<insert id="insertSheepFile" parameterType="SheepFile" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into sheep_file
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<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="name != null">name,</if>
|
||||
<if test="gender != null">gender,</if>
|
||||
<if test="birthday != null">birthday,</if>
|
||||
<if test="dayAge != null">day_age,</if>
|
||||
<if test="monthAge != null">month_age,</if>
|
||||
<if test="parity != null">parity,</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="weaningDayAge != null">weaning_day_age,</if>
|
||||
<if test="weaningDailyGain != null">weaning_daily_gain,</if>
|
||||
<if test="breedStatusId != null">breed_status_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="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="sourceDate != null">source_date,</if>
|
||||
<if test="sourceRanchId != null">source_ranch_id,</if>
|
||||
<if test="sourceRanch != null">source_ranch,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="isDelete != null">is_delete,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<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="name != null">#{name},</if>
|
||||
<if test="gender != null">#{gender},</if>
|
||||
<if test="birthday != null">#{birthday},</if>
|
||||
<if test="dayAge != null">#{dayAge},</if>
|
||||
<if test="monthAge != null">#{monthAge},</if>
|
||||
<if test="parity != null">#{parity},</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="weaningDayAge != null">#{weaningDayAge},</if>
|
||||
<if test="weaningDailyGain != null">#{weaningDailyGain},</if>
|
||||
<if test="breedStatusId != null">#{breedStatusId},</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="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="sourceDate != null">#{sourceDate},</if>
|
||||
<if test="sourceRanchId != null">#{sourceRanchId},</if>
|
||||
<if test="sourceRanch != null">#{sourceRanch},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="isDelete != null">#{isDelete},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateSheepFile" parameterType="SheepFile">
|
||||
update sheep_file
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<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="name != null">name = #{name},</if>
|
||||
<if test="gender != null">gender = #{gender},</if>
|
||||
<if test="birthday != null">birthday = #{birthday},</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="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="weaningDayAge != null">weaning_day_age = #{weaningDayAge},</if>
|
||||
<if test="weaningDailyGain != null">weaning_daily_gain = #{weaningDailyGain},</if>
|
||||
<if test="breedStatusId != null">breed_status_id = #{breedStatusId},</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="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="sourceDate != null">source_date = #{sourceDate},</if>
|
||||
<if test="sourceRanchId != null">source_ranch_id = #{sourceRanchId},</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="isDelete != null">is_delete = #{isDelete},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteSheepFileById" parameterType="Long">
|
||||
update sheep_file set is_delete = 1 where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSheepFileByIds" parameterType="String">
|
||||
update sheep_file set is_delete = 1 where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,391 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhyc.module.base.mapper.SheepPedigreeMapper">
|
||||
|
||||
<resultMap type="SheepPedigree" id="SheepPedigreeResult">
|
||||
<result property="id" column="id" />
|
||||
<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="name" column="name" />
|
||||
<result property="gender" column="gender" />
|
||||
<result property="birthday" column="birthday" />
|
||||
<result property="dayAge" column="day_age" />
|
||||
<result property="monthAge" column="month_age" />
|
||||
<result property="parity" column="parity" />
|
||||
<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="weaningDayAge" column="weaning_day_age" />
|
||||
<result property="weaningDailyGain" column="weaning_daily_gain" />
|
||||
<result property="currentWeight" column="current_weight" />
|
||||
<result property="breedStatusId" column="breed_status_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="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="sourceDate" column="source_date" />
|
||||
<result property="sourceRanchId" column="source_ranch_id" />
|
||||
<result property="sourceRanch" column="source_ranch" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="isDelete" column="is_delete" />
|
||||
<result property="sheepColor" column="sheep_color" />
|
||||
<result property="groupName" column="group_name" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSheepPedigreeVo">
|
||||
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, weaning_day_age, weaning_daily_gain, 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, sheep_color, group_name from sheep_pedigree
|
||||
</sql>
|
||||
|
||||
<select id="selectSheepPedigreeList" parameterType="SheepPedigree" resultMap="SheepPedigreeResult">
|
||||
<include refid="selectSheepPedigreeVo"/>
|
||||
<where>
|
||||
<if test="bsManageTags != null and bsManageTags != ''"> and bs_manage_tags = #{bsManageTags}</if>
|
||||
<if test="ranchId != null "> and ranch_id = #{ranchId}</if>
|
||||
<if test="drRanch != null and drRanch != ''"> and dr_ranch = #{drRanch}</if>
|
||||
<if test="sheepfoldId != null "> and sheepfold_id = #{sheepfoldId}</if>
|
||||
<if test="sheepfoldName != null and sheepfoldName != ''"> and sheepfold_name like concat('%', #{sheepfoldName}, '%')</if>
|
||||
<if test="electronicTags != null and electronicTags != ''"> and electronic_tags = #{electronicTags}</if>
|
||||
<if test="varietyId != null "> and variety_id = #{varietyId}</if>
|
||||
<if test="variety != null and variety != ''"> and variety = #{variety}</if>
|
||||
<if test="family != null and family != ''"> and family = #{family}</if>
|
||||
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||
<if test="gender != null "> and gender = #{gender}</if>
|
||||
<if test="birthday != null "> and birthday = #{birthday}</if>
|
||||
<if test="dayAge != null "> and day_age = #{dayAge}</if>
|
||||
<if test="monthAge != null "> and month_age = #{monthAge}</if>
|
||||
<if test="parity != null "> and parity = #{parity}</if>
|
||||
<if test="birthWeight != null "> and birth_weight = #{birthWeight}</if>
|
||||
<if test="weaningDate != null "> and weaning_date = #{weaningDate}</if>
|
||||
<if test="statusId != null "> and status_id = #{statusId}</if>
|
||||
<if test="weaningWeight != null "> and weaning_weight = #{weaningWeight}</if>
|
||||
<if test="weaningDayAge != null "> and weaning_day_age = #{weaningDayAge}</if>
|
||||
<if test="weaningDailyGain != null "> and weaning_daily_gain = #{weaningDailyGain}</if>
|
||||
<if test="currentWeight != null "> and current_weight = #{currentWeight}</if>
|
||||
<if test="breedStatusId != null "> and breed_status_id = #{breedStatusId}</if>
|
||||
<if test="breed != null and breed != ''"> and breed = #{breed}</if>
|
||||
<if test="bsFatherId != null "> and bs_father_id = #{bsFatherId}</if>
|
||||
<if test="fatherManageTags != null and fatherManageTags != ''"> and father_manage_tags = #{fatherManageTags}</if>
|
||||
<if test="bsMotherId != null "> and bs_mother_id = #{bsMotherId}</if>
|
||||
<if test="motherManageTags != null and motherManageTags != ''"> and mother_manage_tags = #{motherManageTags}</if>
|
||||
<if test="receptorId != null "> and receptor_id = #{receptorId}</if>
|
||||
<if test="receptorManageTags != null and receptorManageTags != ''"> and receptor_manage_tags = #{receptorManageTags}</if>
|
||||
<if test="fatherFatherId != null "> and father_father_id = #{fatherFatherId}</if>
|
||||
<if test="grandfatherManageTags != null and grandfatherManageTags != ''"> and grandfather_manage_tags = #{grandfatherManageTags}</if>
|
||||
<if test="fatherMotherId != null "> and father_mother_id = #{fatherMotherId}</if>
|
||||
<if test="grandmotherManageTags != null and grandmotherManageTags != ''"> and grandmother_manage_tags = #{grandmotherManageTags}</if>
|
||||
<if test="fatherId != null "> and father_id = #{fatherId}</if>
|
||||
<if test="maternalGrandfatherManageTags != null and maternalGrandfatherManageTags != ''"> and maternal_grandfather_manage_tags = #{maternalGrandfatherManageTags}</if>
|
||||
<if test="motherId != null "> and mother_id = #{motherId}</if>
|
||||
<if test="maternalGrandmotherManageTags != null and maternalGrandmotherManageTags != ''"> and maternal_grandmother_manage_tags = #{maternalGrandmotherManageTags}</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="matingDay != null "> and mating_day = #{matingDay}</if>
|
||||
<if test="gestationDay != null "> and gestation_day = #{gestationDay}</if>
|
||||
<if test="expectedDate != null "> and expected_date = #{expectedDate}</if>
|
||||
<if test="postLambingDay != null "> and post_lambing_day = #{postLambingDay}</if>
|
||||
<if test="lactationDay != null "> and lactation_day = #{lactationDay}</if>
|
||||
<if test="anestrousDay != null "> and anestrous_day = #{anestrousDay}</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="comment != null and comment != ''"> and comment = #{comment}</if>
|
||||
<if test="controlled != null "> and controlled = #{controlled}</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="sourceDate != null "> and source_date = #{sourceDate}</if>
|
||||
<if test="sourceRanchId != null "> and source_ranch_id = #{sourceRanchId}</if>
|
||||
<if test="sourceRanch != null and sourceRanch != ''"> and source_ranch = #{sourceRanch}</if>
|
||||
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
|
||||
<if test="sheepColor != null and sheepColor != ''"> and sheep_color = #{sheepColor}</if>
|
||||
<if test="groupName != null and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSheepPedigreeById" parameterType="Long" resultMap="SheepPedigreeResult">
|
||||
<include refid="selectSheepPedigreeVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertSheepPedigree" parameterType="SheepPedigree">
|
||||
insert into sheep_pedigree
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<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="name != null">name,</if>
|
||||
<if test="gender != null">gender,</if>
|
||||
<if test="birthday != null">birthday,</if>
|
||||
<if test="dayAge != null">day_age,</if>
|
||||
<if test="monthAge != null">month_age,</if>
|
||||
<if test="parity != null">parity,</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="weaningDayAge != null">weaning_day_age,</if>
|
||||
<if test="weaningDailyGain != null">weaning_daily_gain,</if>
|
||||
<if test="currentWeight != null">current_weight,</if>
|
||||
<if test="breedStatusId != null">breed_status_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="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="sourceDate != null">source_date,</if>
|
||||
<if test="sourceRanchId != null">source_ranch_id,</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>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="isDelete != null">is_delete,</if>
|
||||
<if test="sheepColor != null and sheepColor != ''">sheep_color,</if>
|
||||
<if test="groupName != null and groupName != ''">group_name,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<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="name != null">#{name},</if>
|
||||
<if test="gender != null">#{gender},</if>
|
||||
<if test="birthday != null">#{birthday},</if>
|
||||
<if test="dayAge != null">#{dayAge},</if>
|
||||
<if test="monthAge != null">#{monthAge},</if>
|
||||
<if test="parity != null">#{parity},</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="weaningDayAge != null">#{weaningDayAge},</if>
|
||||
<if test="weaningDailyGain != null">#{weaningDailyGain},</if>
|
||||
<if test="currentWeight != null">#{currentWeight},</if>
|
||||
<if test="breedStatusId != null">#{breedStatusId},</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="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="sourceDate != null">#{sourceDate},</if>
|
||||
<if test="sourceRanchId != null">#{sourceRanchId},</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>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="isDelete != null">#{isDelete},</if>
|
||||
<if test="sheepColor != null and sheepColor != ''">#{sheepColor},</if>
|
||||
<if test="groupName != null and groupName != ''">#{groupName},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateSheepPedigree" parameterType="SheepPedigree">
|
||||
update sheep_pedigree
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<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="name != null">name = #{name},</if>
|
||||
<if test="gender != null">gender = #{gender},</if>
|
||||
<if test="birthday != null">birthday = #{birthday},</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="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="weaningDayAge != null">weaning_day_age = #{weaningDayAge},</if>
|
||||
<if test="weaningDailyGain != null">weaning_daily_gain = #{weaningDailyGain},</if>
|
||||
<if test="currentWeight != null">current_weight = #{currentWeight},</if>
|
||||
<if test="breedStatusId != null">breed_status_id = #{breedStatusId},</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="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="sourceDate != null">source_date = #{sourceDate},</if>
|
||||
<if test="sourceRanchId != null">source_ranch_id = #{sourceRanchId},</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>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="isDelete != null">is_delete = #{isDelete},</if>
|
||||
<if test="sheepColor != null and sheepColor != ''">sheep_color = #{sheepColor},</if>
|
||||
<if test="groupName != null and groupName != ''">group_name = #{groupName},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteSheepPedigreeById" parameterType="Long">
|
||||
delete from sheep_pedigree where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSheepPedigreeByIds" parameterType="String">
|
||||
delete from sheep_pedigree where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<select id="selectBreedNameById" resultType="java.lang.String">
|
||||
SELECT breed
|
||||
FROM bas_breed_status
|
||||
WHERE id = #{id} <!-- #{id}会自动适配int类型 -->
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -157,13 +157,4 @@
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<!-- 模糊查询耳号列表 -->
|
||||
<select id="searchEarNumbers" resultType="java.lang.String">
|
||||
SELECT DISTINCT sf.bs_manage_tags
|
||||
FROM sheep_file sf
|
||||
WHERE sf.bs_manage_tags LIKE CONCAT(#{query}, '%')
|
||||
AND sf.is_delete = 0
|
||||
ORDER BY sf.bs_manage_tags
|
||||
LIMIT 50
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -11,23 +11,26 @@
|
||||
<result property="district" column="district"/>
|
||||
<result property="address" column="address"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="userId" column="user_id"/>
|
||||
<result property="deptId" column="dept_id"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSxCustomerVo">
|
||||
SELECT id, name, phone, province, city, district, address, remark
|
||||
FROM sx_customer
|
||||
SELECT c.id, c.name, c.phone, c.province, c.city, c.district, c.address, c.remark, c.user_id, c.dept_id
|
||||
FROM sx_customer c
|
||||
</sql>
|
||||
|
||||
<select id="selectSxCustomerList" parameterType="SxCustomer" resultMap="SxCustomerResult">
|
||||
<include refid="selectSxCustomerVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
|
||||
<if test="name != null and name != ''"> AND c.name LIKE CONCAT('%', #{name}, '%')</if>
|
||||
${params.dataScope}
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSxCustomerById" parameterType="Long" resultMap="SxCustomerResult">
|
||||
<include refid="selectSxCustomerVo"/>
|
||||
WHERE id = #{id}
|
||||
WHERE c.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertSxCustomer" parameterType="SxCustomer" useGeneratedKeys="true" keyProperty="id">
|
||||
@@ -40,6 +43,8 @@
|
||||
<if test="district != null">district,</if>
|
||||
<if test="address != null">address,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
</trim>
|
||||
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
@@ -49,6 +54,8 @@
|
||||
<if test="district != null">#{district},</if>
|
||||
<if test="address != null">#{address},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@@ -76,4 +83,4 @@
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
</mapper>
|
||||
@@ -36,33 +36,28 @@
|
||||
<result property="createdBy" column="created_by" />
|
||||
<result property="createdAt" column="created_at" />
|
||||
<result property="remark" column="remark" />
|
||||
|
||||
<result property="customerName" column="customer_name" />
|
||||
<result property="salesPersonName" column="sales_person_name" />
|
||||
<result property="customerPhone" column="customer_phone" />
|
||||
<result property="customerAddress" column="customer_address" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSxSheepSaleVo">
|
||||
SELECT
|
||||
s.id, s.bs_manage_tags, s.sheepfold_id, s.variety, s.sheep_name, s.gender, s.month_age, s.parity, s.breed,
|
||||
s.post_lambing_day, s.lactation_day, s.lambing_day, s.event_type, s.sale_date, s.pricing_method,
|
||||
s.unit_price, s.total_price, s.total_weight, s.avg_weight, s.avg_price_per_sheep, s.sale_type,
|
||||
s.disease_type, s.secondary_reason, s.group_code, s.customer_id, s.sales_person_id,
|
||||
s.quarantine_no, s.approval_no, s.technician_id, s.handler_id, s.created_by, s.created_at, s.remark,
|
||||
c.name AS customer_name,
|
||||
c.phone AS customer_phone,
|
||||
CONCAT(IFNULL(c.province,''), IFNULL(c.city,''), IFNULL(c.district,''), IFNULL(c.address,'')) AS customer_address,
|
||||
u.nick_name AS sales_person_name
|
||||
FROM sx_sheep_sale s
|
||||
LEFT JOIN sx_customer c ON s.customer_id = c.id
|
||||
LEFT JOIN sys_user u ON s.sales_person_id = u.user_id
|
||||
select s.id, s.bs_manage_tags, s.sheepfold_id, s.variety, s.sheep_name, s.gender, s.month_age, s.parity, s.breed, s.post_lambing_day, s.lactation_day, s.lambing_day, s.event_type, s.sale_date, s.pricing_method, s.unit_price, s.total_price, s.total_weight, s.avg_weight, s.avg_price_per_sheep, s.sale_type, s.disease_type, s.secondary_reason, s.group_code, s.customer_id, s.sales_person_id, s.quarantine_no, s.approval_no, s.technician_id, s.handler_id, s.created_by, s.created_at, s.remark, s.user_id, s.dept_id
|
||||
from sx_sheep_sale s
|
||||
</sql>
|
||||
|
||||
<sql id="selectSheepFileVo">
|
||||
select
|
||||
bs_manage_tags, variety, name as sheep_name, gender, month_age, parity, breed,
|
||||
post_lambing_day, lactation_day, lambing_day, sheepfold_id
|
||||
bs_manage_tags,
|
||||
variety,
|
||||
name as sheep_name,
|
||||
gender,
|
||||
month_age,
|
||||
parity,
|
||||
breed,
|
||||
post_lambing_day,
|
||||
lactation_day,
|
||||
lambing_day,
|
||||
sheepfold_id
|
||||
from sheep_file
|
||||
</sql>
|
||||
|
||||
@@ -74,20 +69,13 @@
|
||||
<select id="selectSxSheepSaleList" parameterType="SxSheepSale" resultMap="SxSheepSaleResult">
|
||||
<include refid="selectSxSheepSaleVo"/>
|
||||
<where>
|
||||
<if test="customerName != null and customerName != ''">
|
||||
AND c.name LIKE CONCAT('%', #{customerName}, '%')
|
||||
</if>
|
||||
|
||||
<if test="salesPersonName != null and salesPersonName != ''">
|
||||
AND u.nick_name LIKE CONCAT('%', #{salesPersonName}, '%')
|
||||
</if>
|
||||
|
||||
<if test="params.beginSaleDate != null and params.beginSaleDate != ''">
|
||||
AND date_format(s.sale_date,'%y%m%d') >= date_format(#{params.beginSaleDate},'%y%m%d')
|
||||
</if>
|
||||
<if test="params.endSaleDate != null and params.endSaleDate != ''">
|
||||
AND date_format(s.sale_date,'%y%m%d') <= date_format(#{params.endSaleDate},'%y%m%d')
|
||||
</if>
|
||||
<if test="bsManageTags != null and bsManageTags != ''"> and s.bs_manage_tags = #{bsManageTags}</if>
|
||||
<if test="sheepfoldId != null "> and s.sheepfold_id = #{sheepfoldId}</if>
|
||||
<if test="variety != null and variety != ''"> and s.variety = #{variety}</if>
|
||||
<if test="sheepName != null and sheepName != ''"> and s.sheep_name = #{sheepName}</if>
|
||||
<if test="saleDate != null"> and s.sale_date = #{saleDate}</if>
|
||||
<if test="saleType != null and saleType != ''"> and s.sale_type = #{saleType}</if>
|
||||
${params.dataScope}
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@@ -131,6 +119,8 @@
|
||||
<if test="createdBy != null">created_by,</if>
|
||||
<if test="createdAt != null">created_at,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="bsManageTags != null and bsManageTags != ''">#{bsManageTags},</if>
|
||||
@@ -165,6 +155,8 @@
|
||||
<if test="createdBy != null">#{createdBy},</if>
|
||||
<if test="createdAt != null">#{createdAt},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user