diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java index 0bbab98..1d8a3c7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdFe.java @@ -90,7 +90,7 @@ public class DdFe extends BaseEntity @Excel(name = "废弃原因") private String discardTxt; - public void setId(Long id) + public void setId(Long id) { this.id = id; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeCommentController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeCommentController.java index 756e4a5..f6f5d88 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeCommentController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeCommentController.java @@ -4,14 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; @@ -101,4 +94,9 @@ public class ScChangeCommentController extends BaseController { return toAjax(scChangeCommentService.deleteScChangeCommentByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scChangeCommentService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeEarController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeEarController.java index cd6b28b..a1cb289 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeEarController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeEarController.java @@ -7,14 +7,7 @@ import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.service.IBasSheepService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; @@ -23,6 +16,7 @@ import com.zhyc.module.produce.manage_sheep.domain.ScChangeEar; import com.zhyc.module.produce.manage_sheep.service.IScChangeEarService; import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.RequestParam; /** * 修改电子耳号记录Controller @@ -116,4 +110,9 @@ public class ScChangeEarController extends BaseController { return toAjax(scChangeEarService.deleteScChangeEarByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scChangeEarService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeVarietyController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeVarietyController.java index fd5b092..5bd289e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeVarietyController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScChangeVarietyController.java @@ -4,14 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; @@ -101,4 +94,9 @@ public class ScChangeVarietyController extends BaseController { return toAjax(scChangeVarietyService.deleteScChangeVarietyByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scChangeVarietyService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java index 6307706..49e4578 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransitionInfoController.java @@ -5,14 +5,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.zhyc.common.annotation.Log; import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.domain.AjaxResult; @@ -116,4 +109,9 @@ public class ScTransitionInfoController extends BaseController { int rows = scTransitionInfoService.approveScTransitionInfo(scTransitionInfo); return toAjax(rows); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scTransitionInfoService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java index 2fd53e3..8979aef 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeComment.java @@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 改备注对象 sc_change_comment @@ -67,4 +68,7 @@ public class ScChangeComment extends BaseEntity { */ @Excel(name = "技术员") private String technician; + + /** 前端多耳号条件,非数据库字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java index 76dc820..bd5b584 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeEar.java @@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 修改电子耳号记录对象 sc_change_ear @@ -84,4 +85,7 @@ public class ScChangeEar extends BaseEntity { @Excel(name = "技术员") private String technician; + + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java index a93f079..319de6f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScChangeVariety.java @@ -1,6 +1,7 @@ package com.zhyc.module.produce.manage_sheep.domain; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -77,4 +78,6 @@ public class ScChangeVariety extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date eventDate; + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java index 8176046..7aceb3e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransitionInfo.java @@ -7,6 +7,7 @@ import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; import java.time.LocalDate; +import java.util.List; /** * 转场对象 sc_transition_info @@ -96,5 +97,6 @@ public class ScTransitionInfo extends BaseEntity { @Excel(name = "备注") private String comment; - + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java index cd71536..c57ee71 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeCommentMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; import com.zhyc.module.produce.manage_sheep.domain.ScChangeComment; +import org.apache.ibatis.annotations.Param; /** * 改备注Mapper接口 @@ -58,4 +59,13 @@ public interface ScChangeCommentMapper * @return 结果 */ public int deleteScChangeCommentByIds(Long[] ids); + + List selectScChangeCommentList( + @Param("sc") ScChangeComment sc, + @Param("manageTagsList") List manageTagsList); + + /** + * 远程下拉:模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeEarMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeEarMapper.java index 5699a46..ac9af02 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeEarMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeEarMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; import com.zhyc.module.produce.manage_sheep.domain.ScChangeEar; +import org.apache.ibatis.annotations.Param; /** * 修改电子耳号记录Mapper接口 @@ -58,4 +59,14 @@ public interface ScChangeEarMapper * @return 结果 */ public int deleteScChangeEarByIds(Integer[] ids); + + /** + * 远程下拉:模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScChangeEarList( + @Param("sc") ScChangeEar sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeVarietyMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeVarietyMapper.java index 12d9075..c4c0714 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeVarietyMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScChangeVarietyMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.manage_sheep.mapper; import java.util.List; import com.zhyc.module.produce.manage_sheep.domain.ScChangeVariety; +import org.apache.ibatis.annotations.Param; /** * 改品种记录Mapper接口 @@ -58,4 +59,14 @@ public interface ScChangeVarietyMapper * @return 结果 */ public int deleteScChangeVarietyByIds(Integer[] ids); + + /** + * 远程下拉:模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScChangeVarietyList( + @Param("sc") ScChangeVariety sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java index ce67176..6cdf29a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransitionInfoMapper.java @@ -64,4 +64,13 @@ public interface ScTransitionInfoMapper //批量转场 int insertScTransitionInfoBatch(@Param("list") List transitionInfoList); + /** + * 远程下拉:模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScTransitionInfoList( + @Param("sc") ScTransitionInfo sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeCommentService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeCommentService.java index cd11f0c..153cc4a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeCommentService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeCommentService.java @@ -58,4 +58,9 @@ public interface IScChangeCommentService * @return 结果 */ public int deleteScChangeCommentById(Long id); + + /** + * 远程模糊搜索耳号(下拉用) + */ + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeEarService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeEarService.java index 93133ea..ff78473 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeEarService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeEarService.java @@ -58,4 +58,6 @@ public interface IScChangeEarService * @return 结果 */ public int deleteScChangeEarById(Integer id); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeVarietyService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeVarietyService.java index 7de8f59..0a73b97 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeVarietyService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScChangeVarietyService.java @@ -58,4 +58,6 @@ public interface IScChangeVarietyService * @return 结果 */ public int deleteScChangeVarietyById(Integer id); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java index c9cb5c5..d4c85ea 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransitionInfoService.java @@ -71,4 +71,5 @@ public interface IScTransitionInfoService { //审批转场 public int approveScTransitionInfo(ScTransitionInfo scTransitionInfo); + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java index 1a3ae46..9d582d4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java @@ -49,9 +49,14 @@ public class ScChangeCommentServiceImpl implements IScChangeCommentService @Override public List selectScChangeCommentList(ScChangeComment scChangeComment) { - return scChangeCommentMapper.selectScChangeCommentList(scChangeComment); + // 把实体和独立参数一起传过去 + return scChangeCommentMapper.selectScChangeCommentList(scChangeComment, + scChangeComment.getManageTagsList()); + } + @Override + public List searchEarNumbers(String query) { + return scChangeCommentMapper.searchEarNumbers(query); } - /** * 新增改备注 * diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java index e9126a5..fd968ff 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java @@ -67,8 +67,8 @@ public class ScChangeEarServiceImpl implements IScChangeEarService */ @Override public List selectScChangeEarList(ScChangeEar scChangeEar) { - List list = scChangeEarMapper.selectScChangeEarList(scChangeEar); - return list; + return scChangeEarMapper.selectScChangeEarList(scChangeEar, + scChangeEar.getManageTagsList()); } /** @@ -166,4 +166,10 @@ public class ScChangeEarServiceImpl implements IScChangeEarService { return scChangeEarMapper.deleteScChangeEarById(id); } + + + @Override + public List searchEarNumbers(String query) { + return scChangeEarMapper.searchEarNumbers(query.trim()); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java index 735aa49..be56bde 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java @@ -52,7 +52,8 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService @Override public List selectScChangeVarietyList(ScChangeVariety scChangeVariety) { - return scChangeVarietyMapper.selectScChangeVarietyList(scChangeVariety); + return scChangeVarietyMapper.selectScChangeVarietyList(scChangeVariety, + scChangeVariety.getManageTagsList()); } /** @@ -133,4 +134,9 @@ public class ScChangeVarietyServiceImpl implements IScChangeVarietyService { return scChangeVarietyMapper.deleteScChangeVarietyById(id); } + + @Override + public List searchEarNumbers(String query) { + return scChangeVarietyMapper.searchEarNumbers(query.trim()); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java index f399396..1831c5d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java @@ -55,7 +55,8 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService @Override public List selectScTransitionInfoList(ScTransitionInfo scTransitionInfo) { - return scTransitionInfoMapper.selectScTransitionInfoList(scTransitionInfo); + return scTransitionInfoMapper.selectScTransitionInfoList(scTransitionInfo, + scTransitionInfo.getManageTagsList()); } /** @@ -212,4 +213,9 @@ public class ScTransitionInfoServiceImpl implements IScTransitionInfoService transTypeMap.put(2, "育肥调拨"); return transTypeMap.getOrDefault(transTypeCode, "未知类型"); } + + @Override + public List searchEarNumbers(String query) { + return scTransitionInfoMapper.searchEarNumbers(query.trim()); + } } diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml index 607963b..4dbd2ce 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml @@ -35,26 +35,31 @@ left join da_sheepfold sf on bs.sheepfold_id = sf.id - - - and bs.manage_tags like concat('%', #{manageTags}, '%') + + + + bs.manage_tags like concat('%', #{tag}, '%') + - and bs.sheepfold_id = #{sheepfoldId} - - and scc.new_comment like concat('%', #{newComment}, '%') + + and bs.sheepfold_id = #{sc.sheepfoldId} - - and scc.old_comment like concat('%', #{oldComment}, '%') + + and scc.new_comment like concat('%', #{sc.newComment}, '%') - - and scc.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + and scc.old_comment like concat('%', #{sc.oldComment}, '%') - - and scc.event_date between #{params.beginEventDate} and #{params.endEventDate} + + and scc.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} + + + and scc.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate} ORDER BY scc.create_time DESC @@ -111,4 +116,13 @@ #{id} + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml index c85b4ab..c2c2204 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml @@ -43,34 +43,27 @@ LEFT JOIN da_sheepfold sf ON bs.sheepfold_id = sf.id - - and sce.sheep_id = #{sheepId} - - and ( - bs.manage_tags LIKE CONCAT('%', #{manageTags}, '%') - OR - bs.electronic_tags LIKE CONCAT('%', #{manageTags}, '%') - ) + and sce.sheep_id = #{sc.sheepId} + + + (bs.manage_tags like concat('%', #{tag}, '%') + or bs.electronic_tags like concat('%', #{tag}, '%')) + - and bs.sheepfold_id = #{sheepfoldId} - - and sf.sheepfold_name LIKE CONCAT('%', #{sheepfoldName}, '%') + and bs.sheepfold_id = #{sc.sheepfoldId} + and sce.ear_type = #{sc.earType} + and sce.newTag like concat('%', #{sc.newTag}, '%') + and sce.oldTag like concat('%', #{sc.oldTag}, '%') + + and sce.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - and sce.ear_type = #{earType} - - and sce.newTag LIKE CONCAT('%', #{newTag}, '%') - - - and sce.oldTag LIKE CONCAT('%', #{oldTag}, '%') - - - and sce.create_time between #{params.beginCreateTime} and #{params.endCreateTime} - - - and sce.event_date between #{params.beginEventDate} and #{params.endEventDate} + + and sce.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate} ORDER BY sce.create_time DESC @@ -133,4 +126,13 @@ #{id} + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml index 4370ad8..520e403 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml @@ -37,27 +37,26 @@ left join da_sheepfold sf on bs.sheepfold_id = sf.id - - and scv.sheep_id = #{sheepId} - - and bs.manage_tags like concat('%', #{manageTags}, '%') + + + + bs.manage_tags like concat('%', #{tag}, '%') + - and bs.sheepfold_id = #{sheepfoldId} - - and scv.variety_old like concat('%', #{varietyOld}, '%') + + + and scv.sheep_id = #{sc.sheepId} + and bs.sheepfold_id = #{sc.sheepfoldId} + and scv.variety_old like concat('%', #{sc.varietyOld}, '%') + and scv.variety_new like concat('%', #{sc.varietyNew}, '%') + + and scv.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - - and scv.variety_new like concat('%', #{varietyNew}, '%') - - - and scv.create_time between #{params.beginCreateTime} and #{params.endCreateTime} - - - and scv.event_date between #{params.beginEventDate} and #{params.endEventDate} + + and scv.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate} ORDER BY scv.create_time DESC @@ -117,4 +116,13 @@ #{id} + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml index 89b81f3..790abde 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml @@ -44,28 +44,26 @@ LEFT JOIN bas_sheep_variety bv ON bs.variety_id = bv.id - - and sheep_id = #{sheepId} - - and bs.manage_tags LIKE CONCAT('%', #{manageTags}, '%') + + + + bs.manage_tags like concat('%', #{tag}, '%') + - - - - and t.trans_type = #{transType} - - and t.transition_date between #{params.beginTransitionDate} and #{params.endTransitionDate} + + + and t.sheep_id = #{sc.sheepId} + and t.trans_type = #{sc.transType} + and bs.variety_id = #{sc.varietyId} + and t.trans_to = #{sc.transTo} + and t.trans_from = #{sc.transFrom} + and t.status = #{sc.status} + + and t.transition_date between #{sc.params.beginTransitionDate} and #{sc.params.endTransitionDate} - and bs.variety_id = #{varietyId} - and trans_to = #{transTo} - and trans_from = #{transFrom} - and status = #{status} - - - ORDER BY t.create_time DESC @@ -154,4 +152,13 @@ #{id} + + \ No newline at end of file