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

Compare commits

base: admin:e7b5a97e0dbfa780a5d73405fccee421e1aa6123
Branches Tags
admin:main
..
compare: admin:465246929949f0d751f54c817631931757579a8c
Branches Tags
admin:main

No commits in common. "e7b5a97e0dbfa780a5d73405fccee421e1aa6123" and "465246929949f0d751f54c817631931757579a8c" have entirely different histories.
e7b5a97e0d ... 4652469299

18 changed files with 141 additions and 299 deletions
Show Stats Expand all files Collapse all files

20
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/controller/ScTransGroupController.java
View File

@ -25,13 +25,14 @@ import com.zhyc.common.core.page.TableDataInfo;
/**
* 转群记录Controller
*
*
* @author ruoyi
* @date 2025-07-10
*/
@RestController
@RequestMapping("produce/manage_sheep/trans_group")
public class ScTransGroupController extends BaseController {
public class ScTransGroupController extends BaseController
{
@Autowired
private IScTransGroupService scTransGroupService;
@ -40,7 +41,8 @@ public class ScTransGroupController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('produce:trans_group:list')")
@GetMapping("/list")
public TableDataInfo list(ScTransGroup scTransGroup) {
public TableDataInfo list(ScTransGroup scTransGroup)
{
startPage();
List<ScTransGroup> list = scTransGroupService.selectScTransGroupList(scTransGroup);
return getDataTable(list);
@ -63,7 +65,8 @@ public class ScTransGroupController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('produce:trans_group:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id) {
public AjaxResult getInfo(@PathVariable("id") Integer id)
{
return success(scTransGroupService.selectScTransGroupById(id));
}
@ -73,7 +76,8 @@ public class ScTransGroupController extends BaseController {
@PreAuthorize("@ss.hasPermi('produce:trans_group:add')")
@Log(title = "转群记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ScTransGroup scTransGroup) {
public AjaxResult add(@RequestBody ScTransGroup scTransGroup)
{
return toAjax(scTransGroupService.insertScTransGroup(scTransGroup));
}
@ -83,7 +87,8 @@ public class ScTransGroupController extends BaseController {
@PreAuthorize("@ss.hasPermi('produce:trans_group:edit')")
@Log(title = "转群记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ScTransGroup scTransGroup) {
public AjaxResult edit(@RequestBody ScTransGroup scTransGroup)
{
return toAjax(scTransGroupService.updateScTransGroup(scTransGroup));
}
@ -93,7 +98,8 @@ public class ScTransGroupController extends BaseController {
@PreAuthorize("@ss.hasPermi('produce:trans_group:remove')")
@Log(title = "转群记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids) {
public AjaxResult remove(@PathVariable Integer[] ids)
{
return toAjax(scTransGroupService.deleteScTransGroupByIds(ids));
}
}

58
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/domain/ScTransGroup.java
View File

@ -11,90 +11,66 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* 转群记录对象 sc_trans_group
*
*
* @author ruoyi
* @date 2025-07-10
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ScTransGroup extends BaseEntity {
public class ScTransGroup extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
* $column.columnComment
*/
/** $column.columnComment */
private Integer id;
/**
* 羊只id
*/
/** 羊只id */
@Excel(name = "羊只id")
private Integer sheepId;
/**
* 转入羊舍
*/
/** 转入羊舍 */
private String foldTo;
/**
* 转出羊舍
*/
/** 转出羊舍 */
private String foldFrom;
/**
* 转出羊舍名称
*/
/** 转出羊舍名称 */
@Excel(name = "转出羊舍")
private String foldFromName;
/**
* 转入羊舍名称
*/
/** 转入羊舍名称 */
@Excel(name = "转入羊舍")
private String foldToName;
/** 转群原因 */
/**
* 品种id
*/
/** 品种id */
private Long varietyId;
/**
* 品种名称（联表查询返回，非数据库字段）
*/
/** 品种名称（联表查询返回，非数据库字段） */
@Excel(name = "品种")
private String varietyName;
private Integer reason;
/**
* 转群原因描述 用于导出
*/
/** 转群原因描述 用于导出*/
@Excel(name = "转群原因")
private String reasonText;
/**
* 技术员
*/
/** 技术员 */
@Excel(name = "技术员")
private String technician;
/**
* 状态
*/
/** 状态 */
private Integer status;
/**
* 状态描述 用于导出
*/
/** 状态描述 用于导出*/
@Excel(name = "状态")
private String statusText;
/**
* 备注
*/
/** 备注 */
@Excel(name = "备注")
private String comment;
}

18
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/mapper/ScTransGroupMapper.java
View File

@ -1,19 +1,19 @@
package com.zhyc.module.produce.manage_sheep.trans_group.mapper;
import java.util.List;
import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
/**
* 转群记录Mapper接口
*
*
* @author ruoyi
* @date 2025-07-10
*/
public interface ScTransGroupMapper {
public interface ScTransGroupMapper
{
/**
* 查询转群记录
*
*
* @param id 转群记录主键
* @return 转群记录
*/
@ -21,7 +21,7 @@ public interface ScTransGroupMapper {
/**
* 查询转群记录列表
*
*
* @param scTransGroup 转群记录
* @return 转群记录集合
*/
@ -29,7 +29,7 @@ public interface ScTransGroupMapper {
/**
* 新增转群记录
*
*
* @param scTransGroup 转群记录
* @return 结果
*/
@ -37,7 +37,7 @@ public interface ScTransGroupMapper {
/**
* 修改转群记录
*
*
* @param scTransGroup 转群记录
* @return 结果
*/
@ -45,7 +45,7 @@ public interface ScTransGroupMapper {
/**
* 删除转群记录
*
*
* @param id 转群记录主键
* @return 结果
*/
@ -53,7 +53,7 @@ public interface ScTransGroupMapper {
/**
* 批量删除转群记录
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/

18
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/trans_group/service/IScTransGroupService.java
View File

@ -1,19 +1,19 @@
package com.zhyc.module.produce.manage_sheep.trans_group.service;
import java.util.List;
import com.zhyc.module.produce.manage_sheep.trans_group.domain.ScTransGroup;
/**
* 转群记录Service接口
*
*
* @author ruoyi
* @date 2025-07-10
*/
public interface IScTransGroupService {
public interface IScTransGroupService
{
/**
* 查询转群记录
*
*
* @param id 转群记录主键
* @return 转群记录
*/
@ -21,7 +21,7 @@ public interface IScTransGroupService {
/**
* 查询转群记录列表
*
*
* @param scTransGroup 转群记录
* @return 转群记录集合
*/
@ -29,7 +29,7 @@ public interface IScTransGroupService {
/**
* 新增转群记录
*
*
* @param scTransGroup 转群记录
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IScTransGroupService {
/**
* 修改转群记录
*
*
* @param scTransGroup 转群记录
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IScTransGroupService {
/**
* 批量删除转群记录
*
*
* @param ids 需要删除的转群记录主键集合
* @return 结果
*/
@ -53,7 +53,7 @@ public interface IScTransGroupService {
/**
* 删除转群记录信息
*
*
* @param id 转群记录主键
* @return 结果
*/

55
zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/transition_info/domain/ScTransitionInfo.java
View File

@ -10,76 +10,45 @@ import com.zhyc.common.core.domain.BaseEntity;
/**
* 转场对象 sc_transition_info
*
*
* @author ruoyi
* @date 2025-07-10
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ScTransitionInfo extends BaseEntity {
public class ScTransitionInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
*
*/
/** */
private Integer id;
/**
* 羊只id
*/
/** 羊只id */
@Excel(name = "羊只id")
private Integer sheepId;
/**
* 品种id
*/
private Long varietyId;
/**
* 品种名称（联表返回，非数据库字段）
*/
@Excel(name = "品种")
private String varietyName;
/**
* 转入牧场
*/
/** 转入牧场 */
@Excel(name = "转入牧场")
private String transTo;
/**
* 当前牧场
*/
/** 当前牧场 */
@Excel(name = "当前牧场")
private String transFrom;
/**
* 转场类型
*/
/** 转场类型 */
@Excel(name = "转场类型")
private Integer transType;
/**
* 转场类型名称 只用于导出
*/
@Excel(name = "转场类型")
private String transTypeText;
/**
* 技术员
*/
/** 技术员 */
@Excel(name = "技术员")
private String technician;
/**
* 状态
*/
/** 状态 */
@Excel(name = "状态")
private Integer status;
/**
* 备注
*/
/** 备注 */
@Excel(name = "备注")
private String comment;

12
zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/controller/ScFixHoofController.java
View File

@ -77,9 +77,9 @@ public class ScFixHoofController extends BaseController
@PreAuthorize("@ss.hasPermi('produce:fixHoof:add')")
@Log(title = "修蹄", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ScFixHoof dto){
dto.setSheepId(scFixHoofService.findIdByManageTags(dto.getManageTags()).intValue());
return toAjax(scFixHoofService.insertScFixHoof(dto));
public AjaxResult add(@RequestBody ScFixHoof scFixHoof)
{
return toAjax(scFixHoofService.insertScFixHoof(scFixHoof));
}
/**
@ -88,9 +88,9 @@ public class ScFixHoofController extends BaseController
@PreAuthorize("@ss.hasPermi('produce:fixHoof:edit')")
@Log(title = "修蹄", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ScFixHoof dto){
dto.setSheepId(scFixHoofService.findIdByManageTags(dto.getManageTags()).intValue());
return toAjax(scFixHoofService.updateScFixHoof(dto));
public AjaxResult edit(@RequestBody ScFixHoof scFixHoof)
{
return toAjax(scFixHoofService.updateScFixHoof(scFixHoof));
}
/**

5
zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/domain/ScFixHoof.java
View File

@ -25,11 +25,8 @@ public class ScFixHoof extends BaseEntity
private Integer id;
/** 羊只id */
@Excel(name = "羊只id")
private Integer sheepId;
/** 管理耳号（仅用于接收参数/返回视图，不存库） */
@Excel(name = "管理耳号")
// @TableField(exist = false) // ← 非数据库字段
private String manageTags;
/** 羊舍id */
private Integer sheepfold;

22
zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/mapper/ScFixHoofMapper.java
View File

@ -1,21 +1,19 @@
package com.zhyc.module.produce.other.fixHoof.mapper;
import java.util.List;
import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof;
import com.zhyc.module.produce.sheep.domain.BasSheep;
import org.apache.ibatis.annotations.Param;
/**
* 修蹄Mapper接口
*
*
* @author ruoyi
* @date 2025-07-10
*/
public interface ScFixHoofMapper {
public interface ScFixHoofMapper
{
/**
* 查询修蹄
*
*
* @param id 修蹄主键
* @return 修蹄
*/
@ -23,7 +21,7 @@ public interface ScFixHoofMapper {
/**
* 查询修蹄列表
*
*
* @param scFixHoof 修蹄
* @return 修蹄集合
*/
@ -31,7 +29,7 @@ public interface ScFixHoofMapper {
/**
* 新增修蹄
*
*
* @param scFixHoof 修蹄
* @return 结果
*/
@ -39,7 +37,7 @@ public interface ScFixHoofMapper {
/**
* 修改修蹄
*
*
* @param scFixHoof 修蹄
* @return 结果
*/
@ -47,7 +45,7 @@ public interface ScFixHoofMapper {
/**
* 删除修蹄
*
*
* @param id 修蹄主键
* @return 结果
*/
@ -55,11 +53,9 @@ public interface ScFixHoofMapper {
/**
* 批量删除修蹄
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteScFixHoofByIds(Integer[] ids);
}

9
zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/IScFixHoofService.java
View File

@ -58,13 +58,4 @@ public interface IScFixHoofService
* @return 结果
*/
public int deleteScFixHoofById(Integer id);
/**
* 根据管理耳号查询
* @param manageTags
* @return
*/
Long findIdByManageTags(String manageTags);
}

66
zhyc-module/src/main/java/com/zhyc/module/produce/other/fixHoof/service/impl/ScFixHoofServiceImpl.java
View File

@ -1,119 +1,95 @@
package com.zhyc.module.produce.other.fixHoof.service.impl;
import java.util.List;
import com.zhyc.common.exception.ServiceException;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.StringUtils;
import com.zhyc.module.produce.other.fixHoof.domain.ScFixHoof;
import com.zhyc.module.produce.other.fixHoof.mapper.ScFixHoofMapper;
import com.zhyc.module.produce.sheep.domain.BasSheep;
import com.zhyc.module.produce.sheep.mapper.BasSheepMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zhyc.module.produce.other.fixHoof.service.IScFixHoofService;
import org.springframework.transaction.annotation.Transactional;
/**
* 修蹄Service业务层处理
*
*
* @author ruoyi
* @date 2025-07-10
*/
@Service
public class ScFixHoofServiceImpl implements IScFixHoofService {
public class ScFixHoofServiceImpl implements IScFixHoofService
{
@Autowired
private ScFixHoofMapper scFixHoofMapper;
@Autowired
private BasSheepMapper basSheepMapper;
/**
* 查询修蹄
*
*
* @param id 修蹄主键
* @return 修蹄
*/
@Override
public ScFixHoof selectScFixHoofById(Integer id) {
public ScFixHoof selectScFixHoofById(Integer id)
{
return scFixHoofMapper.selectScFixHoofById(id);
}
/**
* 查询修蹄列表
*
*
* @param scFixHoof 修蹄
* @return 修蹄
*/
@Override
public List<ScFixHoof> selectScFixHoofList(ScFixHoof scFixHoof) {
public List<ScFixHoof> selectScFixHoofList(ScFixHoof scFixHoof)
{
return scFixHoofMapper.selectScFixHoofList(scFixHoof);
}
/**
* 新增修蹄
*
*
* @param scFixHoof 修蹄
* @return 结果
*/
@Override
public int insertScFixHoof(ScFixHoof scFixHoof) {
// 校验羊只是否存在
BasSheep sheep = basSheepMapper.selectBasSheepById(scFixHoof.getSheepId().longValue());
if (sheep == null) {
throw new ServiceException("该羊只ID不存在，请检查后再添加");
}
public int insertScFixHoof(ScFixHoof scFixHoof)
{
scFixHoof.setCreateTime(DateUtils.getNowDate());
return scFixHoofMapper.insertScFixHoof(scFixHoof);
}
/**
* 修改修蹄
*
*
* @param scFixHoof 修蹄
* @return 结果
*/
@Override
public int updateScFixHoof(ScFixHoof scFixHoof) {
public int updateScFixHoof(ScFixHoof scFixHoof)
{
return scFixHoofMapper.updateScFixHoof(scFixHoof);
}
/**
* 批量删除修蹄
*
*
* @param ids 需要删除的修蹄主键
* @return 结果
*/
@Override
public int deleteScFixHoofByIds(Integer[] ids) {
public int deleteScFixHoofByIds(Integer[] ids)
{
return scFixHoofMapper.deleteScFixHoofByIds(ids);
}
/**
* 删除修蹄信息
*
*
* @param id 修蹄主键
* @return 结果
*/
@Override
public int deleteScFixHoofById(Integer id) {
public int deleteScFixHoofById(Integer id)
{
return scFixHoofMapper.deleteScFixHoofById(id);
}
/**
* 根据管理耳号查询
*/
@Override
public Long findIdByManageTags(String manageTags){
if(StringUtils.isBlank(manageTags))
throw new ServiceException("管理耳号不能为空");
BasSheep sheep = basSheepMapper.selectBasSheepByManageTags(manageTags.trim());
if(sheep == null)
throw new ServiceException("管理耳号不存在：" + manageTags);
return sheep.getId();
}
}

25
zhyc-module/src/main/java/com/zhyc/module/produce/sheep/controller/BasSheepController.java
View File

@ -1,17 +1,20 @@
package com.zhyc.module.produce.sheep.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.zhyc.module.produce.sheep.domain.BasSheep;
import com.zhyc.module.produce.sheep.mapper.BasSheepMapper;
import com.zhyc.module.produce.sheep.service.IBasSheepService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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;
@ -32,8 +35,6 @@ public class BasSheepController extends BaseController
@Autowired
private IBasSheepService basSheepService;
@Autowired
private BasSheepMapper basSheepMapper;
/**
* 查询羊只基本信息列表
*/
@ -101,14 +102,4 @@ public class BasSheepController extends BaseController
{
return toAjax(basSheepService.deleteBasSheepByIds(ids));
}
@GetMapping("/byManageTags/{manageTags}")
public AjaxResult byManageTags(@PathVariable String manageTags){
BasSheep sheep = basSheepService.selectBasSheepByManageTags(manageTags.trim());
return success(sheep);
}
}

1
zhyc-module/src/main/java/com/zhyc/module/produce/sheep/domain/BasSheep.java
View File

@ -38,7 +38,6 @@ public class BasSheep extends BaseEntity
/** 羊舍id */
@Excel(name = "羊舍id")
private Long sheepfoldId;
private String sheepfoldName;
/** 电子耳号 */
@Excel(name = "电子耳号")

9
zhyc-module/src/main/java/com/zhyc/module/produce/sheep/mapper/BasSheepMapper.java
View File

@ -2,7 +2,6 @@ package com.zhyc.module.produce.sheep.mapper;
import java.util.List;
import com.zhyc.module.produce.sheep.domain.BasSheep;
import org.apache.ibatis.annotations.Param;
/**
* 羊只基本信息Mapper接口
@ -59,12 +58,4 @@ public interface BasSheepMapper
* @return 结果
*/
public int deleteBasSheepByIds(Long[] ids);
/**
* 根据管理耳号查询
*/
BasSheep selectBasSheepByManageTags(String manageTags);
}

2
zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/IBasSheepService.java
View File

@ -58,6 +58,4 @@ public interface IBasSheepService
* @return 结果
*/
public int deleteBasSheepById(Long id);
BasSheep selectBasSheepByManageTags(String trim);
}

6
zhyc-module/src/main/java/com/zhyc/module/produce/sheep/service/impl/BasSheepServiceImpl.java
View File

@ -93,10 +93,4 @@ public class BasSheepServiceImpl implements IBasSheepService
{
return basSheepMapper.deleteBasSheepById(id);
}
@Override
public BasSheep selectBasSheepByManageTags(String manageTags){
return basSheepMapper.selectBasSheepByManageTags(manageTags);
}
}

69
zhyc-module/src/main/resources/mapper/produce/manage_sheep/transition_info/ScTransitionInfoMapper.xml
View File

@ -1,60 +1,45 @@
<?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.produce.manage_sheep.transition_info.mapper.ScTransitionInfoMapper">
<resultMap type="ScTransitionInfo" id="ScTransitionInfoResult">
<result property="id" column="id"/>
<result property="sheepId" column="sheep_id"/>
<result property="varietyId" column="variety_id"/>
<result property="varietyName" column="varietyName"/>
<result property="transTo" column="trans_to"/>
<result property="transFrom" column="trans_from"/>
<result property="transType" column="trans_type"/>
<result property="transTypeText" column="trans_type_text"/>
<result property="technician" column="technician"/>
<result property="status" column="status"/>
<result property="comment" column="comment"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="id" column="id" />
<result property="sheepId" column="sheep_id" />
<result property="transTo" column="trans_to" />
<result property="transFrom" column="trans_from" />
<result property="transType" column="trans_type" />
<result property="technician" column="technician" />
<result property="status" column="status" />
<result property="comment" column="comment" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectScTransitionInfoVo">
SELECT t.*, bv.variety AS varietyName,
CASE t.trans_type
WHEN 0 THEN '内部转场'
WHEN 1 THEN '跨场转场'
WHEN 2 THEN '销售转场'
ELSE '未知'
END AS trans_type_text
FROM sc_transition_info t
LEFT JOIN bas_sheep_variety bv ON t.variety_id = bv.id
select id, sheep_id, trans_to, trans_from, trans_type, technician, status, comment, create_by, create_time from sc_transition_info
</sql>
<select id="selectScTransitionInfoList" parameterType="ScTransitionInfo" resultMap="ScTransitionInfoResult">
<include refid="selectScTransitionInfoVo"/>
<where>
<if test="sheepId != null ">and sheep_id = #{sheepId}</if>
<if test="varietyId != null">and t.variety_id = #{varietyId}</if>
<if test="transTo != null and transTo != ''">and trans_to = #{transTo}</if>
<if test="transFrom != null and transFrom != ''">and trans_from = #{transFrom}</if>
<if test="status != null ">and status = #{status}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
<where>
<if test="sheepId != null "> and sheep_id = #{sheepId}</if>
<if test="transTo != null and transTo != ''"> and trans_to = #{transTo}</if>
<if test="transFrom != null and transFrom != ''"> and trans_from = #{transFrom}</if>
<if test="status != null "> and status = #{status}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
<select id="selectScTransitionInfoById" parameterType="Integer" resultMap="ScTransitionInfoResult">
<include refid="selectScTransitionInfoVo"/>
WHERE t.id = #{id}
where id = #{id}
</select>
<insert id="insertScTransitionInfo" parameterType="ScTransitionInfo" useGeneratedKeys="true" keyProperty="id">
insert into sc_transition_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sheepId != null">sheep_id,</if>
<if test="varietyId != null">variety_id,</if>
<if test="transTo != null and transTo != ''">trans_to,</if>
<if test="transFrom != null and transFrom != ''">trans_from,</if>
<if test="transType != null">trans_type,</if>
@ -63,10 +48,9 @@
<if test="comment != null">comment,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sheepId != null">#{sheepId},</if>
<if test="varietyId != null">#{varietyId},</if>
<if test="transTo != null and transTo != ''">#{transTo},</if>
<if test="transFrom != null and transFrom != ''">#{transFrom},</if>
<if test="transType != null">#{transType},</if>
@ -75,14 +59,13 @@
<if test="comment != null">#{comment},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</trim>
</insert>
<update id="updateScTransitionInfo" parameterType="ScTransitionInfo">
update sc_transition_info
<trim prefix="SET" suffixOverrides=",">
<if test="sheepId != null">sheep_id = #{sheepId},</if>
<if test="varietyId != null">variety_id = #{varietyId},</if>
<if test="transTo != null and transTo != ''">trans_to = #{transTo},</if>
<if test="transFrom != null and transFrom != ''">trans_from = #{transFrom},</if>
<if test="transType != null">trans_type = #{transType},</if>
@ -96,13 +79,11 @@
</update>
<delete id="deleteScTransitionInfoById" parameterType="Integer">
delete
from sc_transition_info
where id = #{id}
delete from sc_transition_info where id = #{id}
</delete>
<delete id="deleteScTransitionInfoByIds" parameterType="String">
delete from sc_transition_info where id in
delete from sc_transition_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

14
zhyc-module/src/main/resources/mapper/produce/other/fixHoof/ScFixHoofMapper.xml
View File

@ -6,7 +6,7 @@
<resultMap type="ScFixHoof" id="ScFixHoofResult">
<result property="id" column="id"/>
<result property="manageTags" column="manageTags"/>
<result property="sheepId" column="sheep_id"/>
<result property="sheepfold" column="sheepfold"/>
<result property="varietyId" column="variety_id"/>
<result property="sheepfoldName" column="sheepfoldName"/>
@ -18,17 +18,16 @@
<sql id="selectScFixHoofVo">
select fh.id,
bs.manage_tags AS manageTags,
fh.sheep_id,
fh.sheepfold,
sf.sheepfold_name AS sheepfoldName,
sf.sheepfold_name as sheepfoldName,
fh.variety_id,
bv.variety AS varietyName,
bv.variety as varietyName,
fh.comment,
fh.technician,
fh.create_by,
fh.create_time
from sc_fix_hoof fh
left join bas_sheep bs on fh.sheep_id = bs.id
left join da_sheepfold sf on fh.sheepfold = sf.id
left join bas_sheep_variety bv on fh.variety_id = bv.id
</sql>
@ -44,9 +43,6 @@
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
<if test="manageTags != null and manageTags != ''">
and bs.manage_tags like concat('%', #{manageTags}, '%')
</if>
</where>
</select>
@ -101,6 +97,4 @@
#{id}
</foreach>
</delete>
</mapper>

31
zhyc-module/src/main/resources/mapper/produce/sheep/BasSheepMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.produce.sheep.mapper.BasSheepMapper">
<resultMap type="BasSheep" id="BasSheepResult">
<result property="id" column="id" />
<result property="manageTags" column="manage_tags" />
@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasSheepList" parameterType="BasSheep" resultMap="BasSheepResult">
<include refid="selectBasSheepVo"/>
<where>
<where>
<if test="manageTags != null and manageTags != ''"> and manage_tags = #{manageTags}</if>
<if test="ranchId != null "> and ranch_id = #{ranchId}</if>
<if test="sheepfoldId != null "> and sheepfold_id = #{sheepfoldId}</if>
@ -91,25 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
</where>
</select>
<select id="selectBasSheepById" parameterType="java.lang.Long" resultType="BasSheep">
SELECT s.id,
s.sheepfold_id AS sheepfoldId,
sf.sheepfold_name AS sheepfoldName,
s.variety_id AS varietyId,
bv.variety AS varietyName
FROM bas_sheep s
LEFT JOIN da_sheepfold sf ON s.sheepfold_id = sf.id
LEFT JOIN bas_sheep_variety bv ON s.variety_id = bv.id
WHERE s.id = #{id}
</select>
<select id="selectBasSheepByManageTags" parameterType="string" resultType="com.zhyc.module.produce.sheep.domain.BasSheep">
SELECT id, sheepfold_id AS sheepfoldId, variety_id AS varietyId
FROM bas_sheep
WHERE LOWER(TRIM(manage_tags)) = LOWER(TRIM(#{manageTags}))
AND is_delete = 0
LIMIT 1
<select id="selectBasSheepById" parameterType="Long" resultMap="BasSheepResult">
<include refid="selectBasSheepVo"/>
where id = #{id}
</select>
<insert id="insertBasSheep" parameterType="BasSheep" useGeneratedKeys="true" keyProperty="id">
@ -249,11 +234,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteBasSheepByIds" parameterType="String">
delete from bas_sheep where id in
delete from bas_sheep where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>