diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java index b94a01b..80a3e6a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyMeasureController.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; @@ -103,4 +96,9 @@ public class ScBodyMeasureController extends BaseController { return toAjax(scBodyMeasureService.deleteScBodyMeasureByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scBodyMeasureService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.java index d2438a7..2ee2ca7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBodyScoreController.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 ScBodyScoreController extends BaseController { return toAjax(scBodyScoreService.deleteScBodyScoreByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scBodyScoreService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.java index e6a9cad..670b566 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/controller/ScBreastRatingController.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 ScBreastRatingController extends BaseController { return toAjax(scBreastRatingService.deleteScBreastRatingByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scBreastRatingService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java index 25f6410..a569280 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyMeasure.java @@ -8,6 +8,7 @@ import com.zhyc.common.core.domain.BaseEntity; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * 体尺测量对象 sc_body_measure @@ -184,13 +185,7 @@ public class ScBodyMeasure extends BaseEntity { @Excel(name = "技术员") private String technician; - /** - * 排序字段 - */ - private String orderBy; - /** - * 排序方向 - */ - private String sortDirection; + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java index eb010ff..1c455cc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBodyScore.java @@ -1,6 +1,7 @@ package com.zhyc.module.produce.bodyManage.domain; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -77,13 +78,6 @@ public class ScBodyScore extends BaseEntity { @Excel(name = "技术员") private String technician; - /** - * 排序字段 - */ - private String orderBy; - - /** - * 排序方向 - */ - private String sortDirection; + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java index 057dda1..e7b0852 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/domain/ScBreastRating.java @@ -8,6 +8,7 @@ import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; import java.time.LocalDate; +import java.util.List; /** * 乳房评分对象 sc_breast_rating @@ -110,13 +111,7 @@ public class ScBreastRating extends BaseEntity { @Excel(name = "技术员") private String technician; - /** - * 排序字段 - */ - private String orderBy; - /** - * 排序方向 - */ - private String sortDirection; + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyMeasureMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyMeasureMapper.java index 7566ff1..f0fd460 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyMeasureMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyMeasureMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper; import java.util.List; import com.zhyc.module.produce.bodyManage.domain.ScBodyMeasure; +import org.apache.ibatis.annotations.Param; /** * 体尺测量Mapper接口 @@ -58,4 +59,14 @@ public interface ScBodyMeasureMapper * @return 结果 */ public int deleteScBodyMeasureByIds(Long[] ids); + + /** + * 模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScBodyMeasureList( + @Param("sc") ScBodyMeasure sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyScoreMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyScoreMapper.java index 1e7a4e6..c513b5b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyScoreMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBodyScoreMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper; import java.util.List; import com.zhyc.module.produce.bodyManage.domain.ScBodyScore; +import org.apache.ibatis.annotations.Param; /** * 体况评分Mapper接口 @@ -58,4 +59,13 @@ public interface ScBodyScoreMapper * @return 结果 */ public int deleteScBodyScoreByIds(Long[] ids); + /** + * 模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScBodyScoreList( + @Param("sc") ScBodyScore sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBreastRatingMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBreastRatingMapper.java index 485043a..dedcb4b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBreastRatingMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/mapper/ScBreastRatingMapper.java @@ -2,6 +2,7 @@ package com.zhyc.module.produce.bodyManage.mapper; import java.util.List; import com.zhyc.module.produce.bodyManage.domain.ScBreastRating; +import org.apache.ibatis.annotations.Param; /** * 乳房评分Mapper接口 @@ -58,4 +59,14 @@ public interface ScBreastRatingMapper * @return 结果 */ public int deleteScBreastRatingByIds(Long[] ids); + + /** + * 模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScBreastRatingList( + @Param("sc") ScBreastRating sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyMeasureService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyMeasureService.java index f86848f..2ae7c75 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyMeasureService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyMeasureService.java @@ -58,4 +58,6 @@ public interface IScBodyMeasureService * @return 结果 */ public int deleteScBodyMeasureById(Long id); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyScoreService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyScoreService.java index 78ac57d..ccd4823 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyScoreService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBodyScoreService.java @@ -58,4 +58,6 @@ public interface IScBodyScoreService * @return 结果 */ public int deleteScBodyScoreById(Long id); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBreastRatingService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBreastRatingService.java index 81b408f..a5c7c14 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBreastRatingService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/IScBreastRatingService.java @@ -58,4 +58,6 @@ public interface IScBreastRatingService * @return 结果 */ public int deleteScBreastRatingById(Long id); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyMeasureServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyMeasureServiceImpl.java index dad69e0..e528b17 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyMeasureServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyMeasureServiceImpl.java @@ -44,9 +44,14 @@ public class ScBodyMeasureServiceImpl implements IScBodyMeasureService * @return 体尺测量 */ @Override - public List selectScBodyMeasureList(ScBodyMeasure scBodyMeasure) - { - return scBodyMeasureMapper.selectScBodyMeasureList(scBodyMeasure); + public List selectScBodyMeasureList(ScBodyMeasure scBodyMeasure) { + return scBodyMeasureMapper.selectScBodyMeasureList(scBodyMeasure, + scBodyMeasure.getManageTagsList()); + } + + @Override + public List searchEarNumbers(String query) { + return scBodyMeasureMapper.searchEarNumbers(query.trim()); } /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyScoreServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyScoreServiceImpl.java index 1a55d69..e25bce9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyScoreServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBodyScoreServiceImpl.java @@ -49,7 +49,13 @@ public class ScBodyScoreServiceImpl implements IScBodyScoreService { */ @Override public List selectScBodyScoreList(ScBodyScore scBodyScore) { - return scBodyScoreMapper.selectScBodyScoreList(scBodyScore); + return scBodyScoreMapper.selectScBodyScoreList(scBodyScore, + scBodyScore.getManageTagsList()); + } + + @Override + public List searchEarNumbers(String query) { + return scBodyScoreMapper.searchEarNumbers(query.trim()); } /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBreastRatingServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBreastRatingServiceImpl.java index 09cd767..4fd01cd 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBreastRatingServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/bodyManage/service/impl/ScBreastRatingServiceImpl.java @@ -52,7 +52,13 @@ public class ScBreastRatingServiceImpl implements IScBreastRatingService { */ @Override public List selectScBreastRatingList(ScBreastRating scBreastRating) { - return scBreastRatingMapper.selectScBreastRatingList(scBreastRating); + return scBreastRatingMapper.selectScBreastRatingList(scBreastRating, + scBreastRating.getManageTagsList()); + } + + @Override + public List searchEarNumbers(String query) { + return scBreastRatingMapper.searchEarNumbers(query.trim()); } /** diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java index 24518d4..192ed1f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/controller/ScTransGroupController.java @@ -8,14 +8,7 @@ import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; import com.zhyc.module.produce.manage_sheep.service.IScTransGroupService; 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; @@ -97,12 +90,8 @@ public class ScTransGroupController extends BaseController { return toAjax(scTransGroupService.deleteScTransGroupByIds(ids)); } - - /** - * 审批转群记录 - */ -// @PutMapping("/approve") -// public AjaxResult approve(@RequestBody ScTransGroup scTransGroup) { -// return toAjax(scTransGroupService.approveScTransGroup(scTransGroup)); -// } + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scTransGroupService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java index f45435e..32edd57 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/domain/ScTransGroup.java @@ -6,6 +6,8 @@ import lombok.NoArgsConstructor; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import java.util.List; + /** * 转群记录对象 sc_trans_group * @@ -112,5 +114,6 @@ public class ScTransGroup 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 c57ee71..51c85f5 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 @@ -65,7 +65,7 @@ public interface ScChangeCommentMapper @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 ac9af02..7bab60d 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 @@ -61,7 +61,7 @@ public interface ScChangeEarMapper public int deleteScChangeEarByIds(Integer[] ids); /** - * 远程下拉:模糊搜索耳号 + * 模糊搜索耳号 */ List searchEarNumbers(@Param("query") String query); 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 c4c0714..46d67b2 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 @@ -61,7 +61,7 @@ public interface ScChangeVarietyMapper public int deleteScChangeVarietyByIds(Integer[] ids); /** - * 远程下拉:模糊搜索耳号 + * 模糊搜索耳号 */ List searchEarNumbers(@Param("query") String query); diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java index 5746adc..981f28b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/mapper/ScTransGroupMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.zhyc.module.produce.manage_sheep.domain.ScTransGroup; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 转群记录Mapper接口 @@ -60,4 +61,14 @@ public interface ScTransGroupMapper { * @return 结果 */ public int deleteScTransGroupByIds(Integer[] ids); + + /** + * 模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScTransGroupList( + @Param("sc") ScTransGroup 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 6cdf29a..af07511 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 @@ -65,7 +65,7 @@ public interface ScTransitionInfoMapper int insertScTransitionInfoBatch(@Param("list") List transitionInfoList); /** - * 远程下拉:模糊搜索耳号 + * 模糊搜索耳号 */ List searchEarNumbers(@Param("query") String query); diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java index 6430d38..305438b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/IScTransGroupService.java @@ -64,4 +64,6 @@ public interface IScTransGroupService { * 审批转群记录 */ int approveScTransGroup(ScTransGroup scTransGroup); + + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java index 914a781..57a0411 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScCastrateController.java @@ -7,14 +7,7 @@ import com.zhyc.module.produce.other.domain.ScCastrate; import com.zhyc.module.produce.other.service.IScCastrateService; 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; @@ -102,4 +95,9 @@ public class ScCastrateController extends BaseController { return toAjax(scCastrateService.deleteScCastrateByIds(ids)); } + + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scCastrateService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java index 9f97e71..fb20b18 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/ScFixHoofController.java @@ -107,7 +107,10 @@ public class ScFixHoofController extends BaseController return toAjax(scFixHoofService.deleteScFixHoofByIds(ids)); } - + @GetMapping("/search_ear_numbers") + public AjaxResult searchEarNumbers(@RequestParam("query") String query){ + return success(scFixHoofService.searchEarNumbers(query.trim())); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java index 4f3b0f2..17f20ec 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScAddSheepServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScAddSheepServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.StringUtils; 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/other/controller/impl/ScChangeCommentServiceImpl.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeCommentServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeCommentServiceImpl.java index 9d582d4..8f34141 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/other/controller/impl/ScChangeCommentServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import java.util.Date; import java.util.List; 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/other/controller/impl/ScChangeEarServiceImpl.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeEarServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeEarServiceImpl.java index fd968ff..fcea6a2 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/other/controller/impl/ScChangeEarServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import java.util.List; import com.zhyc.common.utils.DateUtils; 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/other/controller/impl/ScChangeVarietyServiceImpl.java similarity index 98% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScChangeVarietyServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScChangeVarietyServiceImpl.java index be56bde..eaf93ae 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/other/controller/impl/ScChangeVarietyServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import java.util.Date; import java.util.List; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java similarity index 96% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java index d1ffb9c..3956ffc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransGroupServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransGroupServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import java.util.Arrays; import java.util.HashMap; @@ -56,7 +56,8 @@ public class ScTransGroupServiceImpl implements IScTransGroupService { */ @Override public List selectScTransGroupList(ScTransGroup scTransGroup) { - List list = scTransGroupMapper.selectScTransGroupList(scTransGroup); + List list = scTransGroupMapper.selectScTransGroupList(scTransGroup, + scTransGroup.getManageTagsList()); list.forEach(group -> { group.setReasonText(convertReason(group.getReason())); group.setStatusText(convertStatus(group.getStatus())); @@ -209,4 +210,9 @@ public class ScTransGroupServiceImpl implements IScTransGroupService { eventTypeMap.put(4, "预售转群"); return eventTypeMap.getOrDefault(eventType, "未知"); } + + @Override + public List searchEarNumbers(String query) { + return scTransGroupMapper.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/other/controller/impl/ScTransitionInfoServiceImpl.java similarity index 99% rename from zhyc-module/src/main/java/com/zhyc/module/produce/manage_sheep/service/impl/ScTransitionInfoServiceImpl.java rename to zhyc-module/src/main/java/com/zhyc/module/produce/other/controller/impl/ScTransitionInfoServiceImpl.java index 1831c5d..0e4e329 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/other/controller/impl/ScTransitionInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhyc.module.produce.manage_sheep.service.impl; +package com.zhyc.module.produce.other.controller.impl; import java.util.*; diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java index 3426e4b..fcbe256 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScCastrate.java @@ -7,6 +7,8 @@ import lombok.NoArgsConstructor; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import java.util.List; + /** * 去势对象 sc_castrate * @@ -72,5 +74,6 @@ public class ScCastrate extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private String eventDate; - + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java index bd2a20b..5d2fb0d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/domain/ScFixHoof.java @@ -7,6 +7,8 @@ import lombok.NoArgsConstructor; import com.zhyc.common.annotation.Excel; import com.zhyc.common.core.domain.BaseEntity; +import java.util.List; + /** * 修蹄对象 sc_fix_hoof * @@ -62,4 +64,7 @@ public class ScFixHoof extends BaseEntity @Excel(name = "事件日期", width = 15, dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private String eventDate; + + /** 前端多耳号查询条件,非表字段 */ + private List manageTagsList; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java index 8b09e94..29d7d7d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScCastrateMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.zhyc.module.produce.other.domain.ScCastrate; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 去势Mapper接口 @@ -61,4 +62,14 @@ public interface ScCastrateMapper * @return 结果 */ public int deleteScCastrateByIds(Long[] ids); + + /** + * 模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + + /* 列表查询支持多耳号模糊 */ + List selectScCastrateList( + @Param("sc") ScCastrate sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java index 490ddc4..16141da 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/mapper/ScFixHoofMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.zhyc.module.produce.other.domain.ScFixHoof; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 修蹄Mapper接口 @@ -61,5 +62,13 @@ public interface ScFixHoofMapper { */ public int deleteScFixHoofByIds(Integer[] ids); + /** + *模糊搜索耳号 + */ + List searchEarNumbers(@Param("query") String query); + /* 列表查询支持多耳号模糊 */ + List selectScFixHoofList( + @Param("sc") ScFixHoof sc, + @Param("manageTagsList") List manageTagsList); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java index 293a6bf..33daad3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScCastrateService.java @@ -59,5 +59,5 @@ public interface IScCastrateService { */ public int deleteScCastrateById(Long id); - + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java index 32d9263..7cfd571 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/IScFixHoofService.java @@ -67,5 +67,5 @@ public interface IScFixHoofService { */ Long findIdByManageTags(String manageTags); - + List searchEarNumbers(String query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java index 74f80eb..f000dd3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScCastrateServiceImpl.java @@ -44,7 +44,8 @@ public class ScCastrateServiceImpl implements IScCastrateService { */ @Override public List selectScCastrateList(ScCastrate scCastrate) { - return scCastrateMapper.selectScCastrateList(scCastrate); + return scCastrateMapper.selectScCastrateList(scCastrate, + scCastrate.getManageTagsList()); } /** @@ -105,4 +106,10 @@ public class ScCastrateServiceImpl implements IScCastrateService { public int deleteScCastrateById(Long id) { return scCastrateMapper.deleteScCastrateById(id); } + + + @Override + public List searchEarNumbers(String query) { + return scCastrateMapper.searchEarNumbers(query.trim()); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java index 298d6c5..ed77ff9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/produce/other/service/impl/ScFixHoofServiceImpl.java @@ -51,9 +51,11 @@ public class ScFixHoofServiceImpl implements IScFixHoofService { */ @Override public List selectScFixHoofList(ScFixHoof scFixHoof) { - return scFixHoofMapper.selectScFixHoofList(scFixHoof); + return scFixHoofMapper.selectScFixHoofList(scFixHoof, + scFixHoof.getManageTagsList()); } + /** * 新增修蹄 * @@ -118,5 +120,8 @@ public class ScFixHoofServiceImpl implements IScFixHoofService { return sheep.getId(); } - + @Override + public List searchEarNumbers(String query) { + return scFixHoofMapper.searchEarNumbers(query.trim()); + } } \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml index 80aa3cd..c459c40 100644 --- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml @@ -85,24 +85,26 @@ LEFT JOIN bas_sheep_variety bsv ON bs.variety_id = bsv.id - - and sm.sheep_id = #{sheepId} - - and sm.measure_date between #{params.beginMeasureDate} and #{params.endMeasureDate} + + + bs.manage_tags like concat('%', #{tag}, '%') + - - and bs.manage_tags like concat('%', #{manageTags}, '%') + and sm.sheep_id = #{sc.sheepId} + and bs.sheepfold_id = #{sc.sheepfoldId} + and bsv.id = #{sc.varietyId} + and bs.type_id = #{sc.sheepTypeId} + + and sm.measure_date between #{sc.params.beginMeasureDate} and #{sc.params.endMeasureDate} - AND bs.sheepfold_id = #{sheepfoldId} - AND bsv.id = #{varietyId} - and bs.type_id = #{sheepTypeId} - - and sm.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + and sm.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - ORDER BY sm.create_time DESC + ORDER BY sm.create_time DESC + SELECT DISTINCT bs.manage_tags + FROM bas_sheep bs + WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%') + AND bs.is_delete = 0 + ORDER BY bs.manage_tags + LIMIT 50 + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml index 6da0595..c95d978 100644 --- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml @@ -41,24 +41,26 @@ left join bas_sheep_variety bsv on bs.variety_id = bsv.id - - and sbs.sheep_id = #{sheepId} - and bsv.id = #{varietyId} - and bs.sheepfold_id = #{sheepfold} - - and sbs.datetime between #{params.beginDatetime} and #{params.endDatetime} + + + bs.manage_tags like concat('%', #{tag}, '%') + - and score = #{score} - - and sbs.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + and sbs.sheep_id = #{sc.sheepId} + and bsv.id = #{sc.varietyId} + and bs.sheepfold_id = #{sc.sheepfold} + and sbs.score = #{sc.score} + + and sbs.datetime between #{sc.params.beginDatetime} and #{sc.params.endDatetime} - - and bs.manage_tags like concat('%', #{manageTags}, '%') + + and sbs.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - ORDER BY sbs.create_time DESC + ORDER BY sbs.create_time DESC + SELECT DISTINCT bs.manage_tags + FROM bas_sheep bs + WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%') + AND bs.is_delete = 0 + ORDER BY bs.manage_tags + LIMIT 50 + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml index d4d5c40..a8564f2 100644 --- a/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml @@ -41,22 +41,24 @@ 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 bsv.id = #{varietyId} - and sf.id = #{sheepfoldId} - - and sbr.event_date between #{params.beginEventDate} and #{params.endEventDate} + and bsv.id = #{sc.varietyId} + and sf.id = #{sc.sheepfoldId} + + and sbr.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate} - - and sbr.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + and sbr.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - ORDER BY sbr.create_time DESC + ORDER BY sbr.create_time DESC + SELECT DISTINCT bs.manage_tags + FROM bas_sheep bs + WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%') + AND bs.is_delete = 0 + ORDER BY bs.manage_tags + LIMIT 50 + \ No newline at end of file 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 4dbd2ce..cb80d10 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 @@ -38,7 +38,6 @@ - bs.manage_tags like concat('%', #{tag}, '%') - - and scv.sheep_id = #{sc.sheepId} and bs.sheepfold_id = #{sc.sheepfoldId} and scv.variety_old like concat('%', #{sc.varietyOld}, '%') diff --git a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml index ada406b..60b55ec 100644 --- a/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml @@ -51,25 +51,23 @@ LEFT JOIN bas_sheep_variety bv ON tg.variety_id = bv.id - - and sheep_id = #{sheepId} - - and s.manage_tags like concat('%', #{manageTags}, '%') + + + s.manage_tags like concat('%', #{tag}, '%') + - - - and tg.trans_date between #{params.beginTransDate} and #{params.endTransDate} + and tg.sheep_id = #{sc.sheepId} + and tg.fold_to = #{sc.foldTo} + and tg.fold_from = #{sc.foldFrom} + and tg.status = #{sc.status} + and tg.variety_id = #{sc.varietyId} + and st.id = #{sc.sheepTypeId} + + and tg.trans_date between #{sc.params.beginTransDate} and #{sc.params.endTransDate} - and fold_to = #{foldTo} - and fold_from = #{foldFrom} - and status = #{status} - and tg.variety_id = #{varietyId} - and st.id = #{sheepTypeId} - - - ORDER BY tg.create_time DESC @@ -144,4 +142,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 790abde..7c7ece3 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 @@ -47,14 +47,11 @@ + + SELECT DISTINCT bs.manage_tags + FROM bas_sheep bs + WHERE bs.manage_tags LIKE CONCAT('%', #{query}, '%') + AND bs.is_delete = 0 + ORDER BY bs.manage_tags + LIMIT 50 + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml index 77ca28d..706675b 100644 --- a/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml +++ b/zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml @@ -37,21 +37,22 @@ left join bas_sheep_variety bv on bs.variety_id = bv.id - - and sheep_id = #{sheepId} - and bs.sheepfold_id = #{sheepfold} - and bs.variety_id = #{varietyId} - - and fh.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + + bs.manage_tags like concat('%', #{tag}, '%') + - - and bs.manage_tags like concat('%', #{manageTags}, '%') + and bs.sheepfold_id = #{sc.sheepfold} + and bs.variety_id = #{sc.varietyId} + and fh.technician like concat('%', #{sc.technician}, '%') + + and fh.create_time between #{sc.params.beginCreateTime} and #{sc.params.endCreateTime} - - and fh.event_date between #{params.beginEventDate} and #{params.endEventDate} + + and fh.event_date between #{sc.params.beginEventDate} and #{sc.params.endEventDate} ORDER BY fh.create_time DESC @@ -111,5 +112,12 @@ - + \ No newline at end of file