diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java index 1c7c8aa..c55d64f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java @@ -47,6 +47,16 @@ public class DewormController extends BaseController return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('biosafety:deworm:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + Deworm deworm = new Deworm(); + deworm.setSheepNo(sheepNo); + List list = dewormService.selectSheepNoList(deworm); + return success(list); + } + /** * 导出驱虫列表 */ diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java index c7968e8..6d68ade 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java @@ -2,6 +2,8 @@ package com.zhyc.module.biosafety.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhyc.module.biosafety.domain.Deworm; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -114,4 +116,15 @@ public class DiagnosisController extends BaseController { return toAjax(diagnosisService.deleteDiagnosisByIds(ids)); } + + @PreAuthorize("@ss.hasPermi('biosafety:diagnosis:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + Diagnosis diagnosis = new Diagnosis(); + diagnosis.setSheepNo(sheepNo); + List list = diagnosisService.selectSheepNoList(diagnosis); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java index 4066006..34e05a1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.service.IHealthService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -105,4 +106,15 @@ public class HealthController extends BaseController { return toAjax(healthService.deleteHealthByIds(ids)); } + + @PreAuthorize("@ss.hasPermi('biosafety:health:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + Health health = new Health(); + health.setSheepNo(sheepNo); + List list = healthService.selectSheepNoList(health); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java index 2abc6d6..dcc6029 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.zhyc.module.biosafety.domain.Health; import com.zhyc.module.biosafety.service.IImmunityService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -104,4 +105,15 @@ public class ImmunityController extends BaseController { return toAjax(immunityService.deleteImmunityByIds(ids)); } + + @PreAuthorize("@ss.hasPermi('biosafety:immunity:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + Immunity immunity = new Immunity(); + immunity.setSheepNo(sheepNo); + List list = immunityService.selectSheepNoList(immunity); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java index dee5d75..1a14ed3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.zhyc.module.biosafety.domain.Health; import com.zhyc.module.biosafety.domain.QuarantineReport; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -104,4 +105,15 @@ public class QuarantineReportController extends BaseController { return toAjax(quarantineReportService.deleteQuarantineReportByIds(ids)); } + + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + QuarantineReport report = new QuarantineReport(); + report.setSheepNo(sheepNo); + List list = quarantineReportService.selectSheepNoList(report); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java index d77739a..330016b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.zhyc.module.biosafety.domain.Health; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.service.ISwMedicineUsageService; import org.springframework.security.access.prepost.PreAuthorize; @@ -110,4 +111,14 @@ public class SwMedicineUsageController extends BaseController { return toAjax(swMedicineUsageService.deleteSwMedicineUsageByIds(ids)); } + @PreAuthorize("@ss.hasPermi('biosafety:usageInfo:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + SwMedicineUsage usage = new SwMedicineUsage(); + usage.setSheepNo(sheepNo); + List list = swMedicineUsageService.selectSheepNoList(usage); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java index 38c23e3..4ed4c53 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.zhyc.module.biosafety.domain.Health; import com.zhyc.module.biosafety.domain.Treatment; import com.zhyc.module.biosafety.service.ITreatmentService; import org.springframework.security.access.prepost.PreAuthorize; @@ -104,4 +105,15 @@ public class TreatmentController extends BaseController { return toAjax(treatmentService.deleteTreatmentByIds(ids)); } + + @PreAuthorize("@ss.hasPermi('biosafety:treatment:list')") + @GetMapping("/searchEarNumbers") + public AjaxResult getSheepNoList(String sheepNo) + { + Treatment treatment = new Treatment(); + treatment.setSheepNo(sheepNo); + List list = treatmentService.selectSheepNoList(treatment); + return success(list); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java index 8ce542c..35e5652 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java @@ -61,4 +61,6 @@ public interface DewormMapper * @return 结果 */ public int deleteDewormByIds(Long[] ids); + + List selectSheepNoList(Deworm deworm); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java index f9f8076..70a6850 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DiagnosisMapper.java @@ -60,4 +60,6 @@ public interface DiagnosisMapper * @return 结果 */ public int deleteDiagnosisByIds(Long[] ids); + + List selectSheepNoList(Diagnosis diagnosis); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java index bcdc175..d8ac9e3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/HealthMapper.java @@ -13,6 +13,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface HealthMapper { + + + /** * 查询保健 * @@ -60,4 +63,6 @@ public interface HealthMapper * @return 结果 */ public int deleteHealthByIds(Long[] ids); + + List selectSheepNoList(Health health); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java index a500a9e..277b25e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/ImmunityMapper.java @@ -60,4 +60,6 @@ public interface ImmunityMapper * @return 结果 */ public int deleteImmunityByIds(Long[] ids); + + List selectSheepNoList(Immunity immunity); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java index bc4c181..a67d075 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/QuarantineReportMapper.java @@ -61,4 +61,6 @@ public interface QuarantineReportMapper * @return 结果 */ public int deleteQuarantineReportByIds(Long[] ids); + + List selectSheepNoList(QuarantineReport report); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java index 32f3ef0..1dc8c25 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java @@ -89,4 +89,6 @@ public interface SwMedicineUsageMapper public int deleteSwMedicineUsageDetailsByMediUsage(Integer id); List selectSwMedicineUsageDetailsById(Integer id); + + List selectSheepNoList(SwMedicineUsage usage); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java index 1d48767..a1635fb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java @@ -66,4 +66,6 @@ public interface TreatmentMapper List selectTreatmentStatus(Long sheepId); + + List selectSheepNoList(Treatment treatment); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDewormService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDewormService.java index f897fa4..da01ded 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDewormService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDewormService.java @@ -59,4 +59,6 @@ public interface IDewormService * @return 结果 */ public int deleteDewormById(Long id); + + List selectSheepNoList(Deworm deworm); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDiagnosisService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDiagnosisService.java index 8f47fed..16f4e6c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDiagnosisService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDiagnosisService.java @@ -61,4 +61,6 @@ public interface IDiagnosisService public int deleteDiagnosisById(Long id); int insertDiagnosisList(Diagnosis diagnosis); + + List selectSheepNoList(Diagnosis diagnosis); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IHealthService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IHealthService.java index b9d8e8e..7e98f70 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IHealthService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IHealthService.java @@ -58,4 +58,6 @@ public interface IHealthService * @return 结果 */ public int deleteHealthById(Long id); + + List selectSheepNoList(Health health); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IImmunityService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IImmunityService.java index 1f75b9b..14ddb24 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IImmunityService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IImmunityService.java @@ -58,4 +58,6 @@ public interface IImmunityService * @return 结果 */ public int deleteImmunityById(Long id); + + List selectSheepNoList(Immunity immunity); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IQuarantineReportService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IQuarantineReportService.java index 2aaeb26..0539989 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IQuarantineReportService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IQuarantineReportService.java @@ -59,4 +59,6 @@ public interface IQuarantineReportService * @return 结果 */ public int deleteQuarantineReportById(Long id); + + List selectSheepNoList(QuarantineReport report); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java index af3d42f..9308533 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java @@ -61,4 +61,6 @@ public interface ISwMedicineUsageService public int deleteSwMedicineUsageById(Integer id); List selectSwMedicineUsageDetailsById(Integer id); + + List selectSheepNoList(SwMedicineUsage usage); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java index 558ccc4..103d879 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java @@ -60,4 +60,6 @@ public interface ITreatmentService * @return 结果 */ public int deleteTreatmentById(Long id); + + List selectSheepNoList(Treatment treatment); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java index 716a333..39d21d2 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java @@ -172,4 +172,10 @@ public class DewormServiceImpl implements IDewormService { return dewormMapper.deleteDewormById(id); } + + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(Deworm deworm) { + return dewormMapper.selectSheepNoList(deworm); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java index cd247e0..1458279 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java @@ -11,6 +11,7 @@ import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.BasSheepMapper; import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.Treatment; import com.zhyc.module.biosafety.mapper.DiagnosisMapper; import com.zhyc.module.biosafety.mapper.TreatmentMapper; @@ -220,4 +221,10 @@ public class DiagnosisServiceImpl implements IDiagnosisService return diagnosisMapper.deleteDiagnosisById(id); } + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(Diagnosis diagnosis) { + return diagnosisMapper.selectSheepNoList(diagnosis); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java index 34d0e7b..5739e21 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java @@ -11,6 +11,7 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; @@ -165,4 +166,11 @@ public class HealthServiceImpl implements IHealthService { return healthMapper.deleteHealthById(id); } + + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(Health health) { + return healthMapper.selectSheepNoList(health); + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java index d7f0f1e..3f91f35 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java @@ -9,6 +9,7 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; +import com.zhyc.module.biosafety.domain.Deworm; import com.zhyc.module.biosafety.domain.SwMedicineUsage; import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; @@ -170,4 +171,10 @@ public class ImmunityServiceImpl implements IImmunityService { return immunityMapper.deleteImmunityById(id); } + + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(Immunity immunity) { + return immunityMapper.selectSheepNoList(immunity); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java index 8023f7d..1cdf6ba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java @@ -9,6 +9,7 @@ import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.service.impl.SheepFileServiceImpl; +import com.zhyc.module.biosafety.domain.Immunity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.QuarantineReportMapper; @@ -136,4 +137,10 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService { return quarantineReportMapper.deleteQuarantineReportById(id); } + + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(QuarantineReport report) { + return quarantineReportMapper.selectSheepNoList(report); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java index 0a1327d..60e69c1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.module.biosafety.domain.Immunity; import com.zhyc.module.biosafety.service.ISwMedicineUsageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -152,4 +153,10 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService } } } + + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(SwMedicineUsage usage) { + return swMedicineUsageMapper.selectSheepNoList(usage); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java index 1c21aa1..f5226d4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java @@ -10,15 +10,12 @@ import com.zhyc.common.utils.bean.BeanUtils; import com.zhyc.module.Exception.BusinessException; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; -import com.zhyc.module.biosafety.domain.Diagnosis; -import com.zhyc.module.biosafety.domain.SwMedicineUsage; -import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.domain.*; import com.zhyc.module.biosafety.mapper.DiagnosisMapper; import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.TreatmentMapper; -import com.zhyc.module.biosafety.domain.Treatment; import com.zhyc.module.biosafety.service.ITreatmentService; import org.springframework.transaction.annotation.Transactional; @@ -243,6 +240,12 @@ public class TreatmentServiceImpl implements ITreatmentService return treatmentMapper.deleteTreatmentById(id); } + @DataScope(deptAlias = "s", userAlias = "s") + @Override + public List selectSheepNoList(Treatment treatment) { + return treatmentMapper.selectSheepNoList(treatment); + } + public void updateTreatmentStatus(Long sheepId) { List treatments=treatmentMapper.selectTreatmentStatus(sheepId); Diagnosis diagnosis = new Diagnosis(); diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index e19566f..a5aeebe 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -82,6 +82,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where s.id = #{id} + insert into sw_deworm diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml index 5d5302c..c688522 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml @@ -91,6 +91,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sd.id = #{id} + insert into sw_diagnosis diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml index 68072d2..84e3549 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml @@ -85,6 +85,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where s.id = #{id} + insert into sw_health diff --git a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml index 32e9a85..35004e0 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml @@ -83,6 +83,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where s.id = #{id} + insert into sw_immunity diff --git a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml index e585b03..2f666bb 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml @@ -102,6 +102,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sqr.id = #{id} ORDER BY datetime DESC + INSERT INTO sw_quarantine_report diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml index a45c47d..cae2c1c 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml @@ -156,6 +156,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE smud.medi_usage = #{id} + insert into sw_medicine_usage diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml index e9a045c..ee3d01c 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml @@ -105,6 +105,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into sw_treatment