From de40e1d393668f805eb65cace2f61edfa891eb9e Mon Sep 17 00:00:00 2001 From: piaobo <1913856125@qq.com> Date: Mon, 21 Jul 2025 19:28:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=96=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/SheepFileController.java | 38 +-- .../module/base/mapper/SheepFileMapper.java | 30 +-- .../base/service/ISheepFileService.java | 31 +-- .../service/impl/SheepFileServiceImpl.java | 61 +---- .../QuarantineReportController.java | 12 +- .../controller/SwMedicineUsageController.java | 2 +- .../biosafety/domain/SwMedicineUsage.java | 57 +---- .../domain/SwMedicineUsageDetails.java | 2 +- .../module/biosafety/domain/Treatment.java | 12 +- .../mapper/SwMedicineUsageMapper.java | 6 +- .../biosafety/mapper/TreatmentMapper.java | 2 + .../service/ISwMedicineUsageService.java | 4 +- .../biosafety/service/ITreatmentService.java | 2 + .../impl/SwMedicineUsageServiceImpl.java | 8 +- .../service/impl/TreatmentServiceImpl.java | 70 +++++- .../resources/mapper/base/SheepFileMapper.xml | 221 +----------------- .../biosafety/SwMedicineUsageMapper.xml | 4 +- .../mapper/biosafety/TreatmentMapper.xml | 27 ++- 18 files changed, 148 insertions(+), 441 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java index dc1c0c2..3211970 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java @@ -6,6 +6,7 @@ import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.core.page.TableDataInfo; import com.zhyc.common.enums.BusinessType; import com.zhyc.common.utils.poi.ExcelUtil; +import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.service.ISheepFileService; import org.springframework.beans.factory.annotation.Autowired; @@ -63,36 +64,13 @@ public class SheepFileController extends BaseController return success(sheepFileService.selectSheepFileById(id)); } - /** - * 新增羊只档案 - */ - @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:add')") - @Log(title = "羊只档案", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SheepFile sheepFile) - { - return toAjax(sheepFileService.insertSheepFile(sheepFile)); + /* + * 根据耳号查询是否存在羊舍 + * */ + @GetMapping("/byNo/{manageTags}") + public AjaxResult byManageTags(@PathVariable String manageTags){ + SheepFile sheep=sheepFileService.selectBasSheepByManageTags(manageTags.trim()); + return success(sheep); } - /** - * 修改羊只档案 - */ - @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:edit')") - @Log(title = "羊只档案", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SheepFile sheepFile) - { - return toAjax(sheepFileService.updateSheepFile(sheepFile)); - } - - /** - * 删除羊只档案 - */ - @PreAuthorize("@ss.hasPermi('sheep_file:sheep_file:remove')") - @Log(title = "羊只档案", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(sheepFileService.deleteSheepFileByIds(ids)); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java index b4af8dc..2392a19 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java @@ -28,36 +28,12 @@ public interface SheepFileMapper */ public List selectSheepFileList(SheepFile sheepFile); - /** - * 新增羊只档案 - * - * @param sheepFile 羊只档案 - * @return 结果 - */ - public int insertSheepFile(SheepFile sheepFile); /** - * 修改羊只档案 + * 根据管理耳号查询 * - * @param sheepFile 羊只档案 + * @param tags 管理耳号 * @return 结果 */ - public int updateSheepFile(SheepFile sheepFile); - - /** - * 删除羊只档案 - * - * @param id 羊只档案主键 - * @return 结果 - */ - public int deleteSheepFileById(Long id); - - /** - * 批量删除羊只档案 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSheepFileByIds(Long[] ids); - + SheepFile selectSheepByManageTags(String tags); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java index 9084727..da23952 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java @@ -28,35 +28,6 @@ public interface ISheepFileService */ public List selectSheepFileList(SheepFile sheepFile); - /** - * 新增羊只档案 - * - * @param sheepFile 羊只档案 - * @return 结果 - */ - public int insertSheepFile(SheepFile sheepFile); - /** - * 修改羊只档案 - * - * @param sheepFile 羊只档案 - * @return 结果 - */ - public int updateSheepFile(SheepFile sheepFile); - - /** - * 批量删除羊只档案 - * - * @param ids 需要删除的羊只档案主键集合 - * @return 结果 - */ - public int deleteSheepFileByIds(Long[] ids); - - /** - * 删除羊只档案信息 - * - * @param id 羊只档案主键 - * @return 结果 - */ - public int deleteSheepFileById(Long id); + SheepFile selectBasSheepByManageTags(String trim); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index 9402a6b..1a77d6a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -16,82 +16,35 @@ import java.util.List; * @date 2025-07-13 */ @Service -public class SheepFileServiceImpl implements ISheepFileService -{ +public class SheepFileServiceImpl implements ISheepFileService { @Autowired private SheepFileMapper sheepFileMapper; /** * 查询羊只档案 - * + * * @param id 羊只档案主键 * @return 羊只档案 */ @Override - public SheepFile selectSheepFileById(Long id) - { + public SheepFile selectSheepFileById(Long id) { return sheepFileMapper.selectSheepFileById(id); } /** * 查询羊只档案列表 - * + * * @param sheepFile 羊只档案 * @return 羊只档案 */ @Override - public List selectSheepFileList(SheepFile sheepFile) - { + public List selectSheepFileList(SheepFile sheepFile) { return sheepFileMapper.selectSheepFileList(sheepFile); } - /** - * 新增羊只档案 - * - * @param sheepFile 羊只档案 - * @return 结果 - */ @Override - public int insertSheepFile(SheepFile sheepFile) - { - sheepFile.setCreateTime(DateUtils.getNowDate()); - return sheepFileMapper.insertSheepFile(sheepFile); + public SheepFile selectBasSheepByManageTags(String tags) { + return sheepFileMapper.selectSheepByManageTags(tags); } - /** - * 修改羊只档案 - * - * @param sheepFile 羊只档案 - * @return 结果 - */ - @Override - public int updateSheepFile(SheepFile sheepFile) - { - sheepFile.setUpdateTime(DateUtils.getNowDate()); - return sheepFileMapper.updateSheepFile(sheepFile); - } - - /** - * 批量删除羊只档案 - * - * @param ids 需要删除的羊只档案主键 - * @return 结果 - */ - @Override - public int deleteSheepFileByIds(Long[] ids) - { - return sheepFileMapper.deleteSheepFileByIds(ids); - } - - /** - * 删除羊只档案信息 - * - * @param id 羊只档案主键 - * @return 结果 - */ - @Override - public int deleteSheepFileById(Long id) - { - return sheepFileMapper.deleteSheepFileById(id); - } } 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 5c6847e..1c06745 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 @@ -29,7 +29,7 @@ import com.zhyc.common.core.page.TableDataInfo; * @date 2025-07-14 */ @RestController -@RequestMapping("/bisosafety/quarantine") +@RequestMapping("/biosafety/quarantine") public class QuarantineReportController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class QuarantineReportController extends BaseController /** * 查询检疫记录列表 */ - @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:list')") + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:list')") @GetMapping("/list") public TableDataInfo list(QuarantineReport quarantineReport) { @@ -50,7 +50,7 @@ public class QuarantineReportController extends BaseController /** * 导出检疫记录列表 */ - @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:export')") + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:export')") @Log(title = "检疫记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QuarantineReport quarantineReport) @@ -73,7 +73,7 @@ public class QuarantineReportController extends BaseController /** * 新增检疫记录 */ - @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:add')") + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:add')") @Log(title = "检疫记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody QuarantineReport quarantineReport) @@ -84,7 +84,7 @@ public class QuarantineReportController extends BaseController /** * 修改检疫记录 */ - @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:edit')") + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:edit')") @Log(title = "检疫记录", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody QuarantineReport quarantineReport) @@ -95,7 +95,7 @@ public class QuarantineReportController extends BaseController /** * 删除检疫记录 */ - @PreAuthorize("@ss.hasPermi('bisosafety:quarantine:remove')") + @PreAuthorize("@ss.hasPermi('biosafety:quarantine:remove')") @Log(title = "检疫记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) 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 fef0f3f..c3661aa 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 @@ -65,7 +65,7 @@ public class SwMedicineUsageController extends BaseController */ @PreAuthorize("@ss.hasPermi('biosafety:usageInfo:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(@PathVariable("id") Integer id) { return success(swMedicineUsageService.selectSwMedicineUsageById(id)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index bc442d0..56f3997 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.domain; import java.util.List; + +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -12,12 +14,13 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-12 */ +@Data public class SwMedicineUsage extends BaseEntity { private static final long serialVersionUID = 1L; /** id */ - private Long id; + private Integer id; /** 使用名称 */ @Excel(name = "使用名称") @@ -30,57 +33,5 @@ public class SwMedicineUsage extends BaseEntity /** 药品使用记录详情信息 */ private List swMedicineUsageDetailsList; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setUseType(String useType) - { - this.useType = useType; - } - - public String getUseType() - { - return useType; - } - - public List getSwMedicineUsageDetailsList() - { - return swMedicineUsageDetailsList; - } - - public void setSwMedicineUsageDetailsList(List swMedicineUsageDetailsList) - { - this.swMedicineUsageDetailsList = swMedicineUsageDetailsList; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("useType", getUseType()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("swMedicineUsageDetailsList", getSwMedicineUsageDetailsList()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java index b3e24c6..7a02bdc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java @@ -22,7 +22,7 @@ public class SwMedicineUsageDetails extends BaseEntity /** 药品使用记录id */ @Excel(name = "药品使用记录id") - private Long mediUsage; + private Integer mediUsage; /** 药品id */ @Excel(name = "药品id") diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index 67777b8..85a69e0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -22,7 +22,6 @@ public class Treatment extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ private Long id; /** 诊疗记录id */ @@ -30,7 +29,11 @@ public class Treatment extends BaseEntity /** 羊只耳号 */ @Excel(name = "羊只耳号") + private String sheepNo; + private Long sheepId; +// 用于批量新增 + private List sheepIds; /** 品种 */ @Excel(name = "品种") @@ -71,11 +74,14 @@ public class Treatment extends BaseEntity /** 疾病类型 */ @Excel(name = "疾病类型") + private String diseaseName; + private Long diseaseId; + /** 父疾病 */ @Excel(name = "父疾病") - private String diseasePid; + private Long diseasePid; /** 兽医 */ @Excel(name = "兽医") @@ -83,7 +89,7 @@ public class Treatment extends BaseEntity /** 药品使用记录id */ @Excel(name = "药品使用记录id") - private Long usageId; + private Integer usageId; // 药品使用 private List usageDetails; 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 a58cdb8..16ce066 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 @@ -19,7 +19,7 @@ public interface SwMedicineUsageMapper * @param id 药品使用记录主键 * @return 药品使用记录 */ - public SwMedicineUsage selectSwMedicineUsageById(Long id); + public SwMedicineUsage selectSwMedicineUsageById(Integer id); /** * 查询药品使用记录列表 @@ -51,7 +51,7 @@ public interface SwMedicineUsageMapper * @param id 药品使用记录主键 * @return 结果 */ - public int deleteSwMedicineUsageById(Long id); + public int deleteSwMedicineUsageById(Integer id); /** * 批量删除药品使用记录 @@ -84,5 +84,5 @@ public interface SwMedicineUsageMapper * @param id 药品使用记录ID * @return 结果 */ - public int deleteSwMedicineUsageDetailsByMediUsage(Long id); + public int deleteSwMedicineUsageDetailsByMediUsage(Integer id); } 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 1807ed0..d8930ba 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 @@ -59,4 +59,6 @@ public interface TreatmentMapper * @return 结果 */ public int deleteTreatmentByIds(Long[] ids); + + int insertTreatmentList(List treatments); } 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 d10ee3a..70e3dd8 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 @@ -17,7 +17,7 @@ public interface ISwMedicineUsageService * @param id 药品使用记录主键 * @return 药品使用记录 */ - public SwMedicineUsage selectSwMedicineUsageById(Long id); + public SwMedicineUsage selectSwMedicineUsageById(Integer id); /** * 查询药品使用记录列表 @@ -57,5 +57,5 @@ public interface ISwMedicineUsageService * @param id 药品使用记录主键 * @return 结果 */ - public int deleteSwMedicineUsageById(Long id); + public int deleteSwMedicineUsageById(Integer id); } 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 3d11b0a..ed72447 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 @@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service; import java.util.List; import com.zhyc.module.biosafety.domain.Treatment; +import org.springframework.transaction.annotation.Transactional; /** * 治疗记录Service接口 @@ -36,6 +37,7 @@ public interface ITreatmentService */ public int insertTreatment(Treatment treatment); + /** * 修改治疗记录 * 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 684454e..9fbf96d 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 @@ -31,7 +31,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService * @return 药品使用记录 */ @Override - public SwMedicineUsage selectSwMedicineUsageById(Long id) + public SwMedicineUsage selectSwMedicineUsageById(Integer id) { return swMedicineUsageMapper.selectSwMedicineUsageById(id); } @@ -61,7 +61,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService swMedicineUsage.setCreateTime(DateUtils.getNowDate()); int rows = swMedicineUsageMapper.insertSwMedicineUsage(swMedicineUsage); insertSwMedicineUsageDetails(swMedicineUsage); - return rows; + return swMedicineUsage.getId(); } /** @@ -102,7 +102,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService */ @Transactional @Override - public int deleteSwMedicineUsageById(Long id) + public int deleteSwMedicineUsageById(Integer id) { swMedicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(id); return swMedicineUsageMapper.deleteSwMedicineUsageById(id); @@ -116,7 +116,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService public void insertSwMedicineUsageDetails(SwMedicineUsage swMedicineUsage) { List swMedicineUsageDetailsList = swMedicineUsage.getSwMedicineUsageDetailsList(); - Long id = swMedicineUsage.getId(); + Integer id = swMedicineUsage.getId(); if (StringUtils.isNotNull(swMedicineUsageDetailsList)) { List list = new ArrayList(); 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 1d576f5..9ab2ac5 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 @@ -1,9 +1,15 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +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.base.service.impl.SheepFileServiceImpl; import com.zhyc.module.biosafety.domain.SwMedicineUsage; -import com.zhyc.module.biosafety.domain.SwPrescription; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +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; @@ -24,6 +30,10 @@ public class TreatmentServiceImpl implements ITreatmentService private TreatmentMapper treatmentMapper; @Autowired private SwMedicineUsageServiceImpl medicineUsageService; + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + @Autowired + private SheepFileMapper sheepFileMapper; /** * 查询治疗记录 @@ -34,7 +44,11 @@ public class TreatmentServiceImpl implements ITreatmentService @Override public Treatment selectTreatmentById(Long id) { - return treatmentMapper.selectTreatmentById(id); + Treatment treatment = treatmentMapper.selectTreatmentById(id); +// 获取药品使用记录 + SwMedicineUsage swMedicineUsage = medicineUsageService.selectSwMedicineUsageById(treatment.getUsageId()); + treatment.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return treatment; } /** @@ -59,14 +73,53 @@ public class TreatmentServiceImpl implements ITreatmentService @Transactional public int insertTreatment(Treatment treatment) { +// 使用记录的文件 SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails()); medicineUsage.setName("羊只治疗"); medicineUsage.setUseType("4"); + +// 新增单挑数据 + if (treatment.getSheepId()!=null){ // 药品使用记录 - medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails()); - medicineUsageService.insertSwMedicineUsage(medicineUsage); - treatment.setCreateTime(DateUtils.getNowDate()); - return treatmentMapper.insertTreatment(treatment); + Integer id=medicineUsageService.insertSwMedicineUsage(medicineUsage); +// 药品使用记录id + treatment.setUsageId(id); + treatment.setCreateTime(DateUtils.getNowDate()); + return treatmentMapper.insertTreatment(treatment); + +// 批量新增 + }else { + + List treatments = new ArrayList<>(); + treatment.setCreateTime(DateUtils.getNowDate()); + for (String sheepId : treatment.getSheepIds()) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId)); + Treatment treat = new Treatment(); + BeanUtils.copyProperties(treatment, treat); + treat.setSheepId(Long.valueOf(sheepId)); + treat.setVariety(sheepFile.getVariety()); + treat.setSheepType(sheepFile.getName()); + treat.setMonthAge(sheepFile.getMonthAge()); + treat.setGender(String.valueOf(sheepFile.getGender())); + treat.setBreed(sheepFile.getBreed()); + treat.setParity(sheepFile.getParity()); + treat.setLactDay(sheepFile.getLactationDay()); + treat.setGestDay(sheepFile.getGestationDay()); +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + System.out.println(medicineUsage); + System.out.println(usageId); + treat.setUsageId(usageId); + treatments.add(treat); + } +// 药品使用记录 + medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails()); + + + return treatmentMapper.insertTreatmentList(treatments); + } + } /** @@ -78,6 +131,11 @@ public class TreatmentServiceImpl implements ITreatmentService @Override public int updateTreatment(Treatment treatment) { + for (SwMedicineUsageDetails usageDetail : treatment.getUsageDetails()) { + usageDetail.setMediUsage(treatment.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(treatment.getUsageId()); + medicineUsageMapper.batchSwMedicineUsageDetails(treatment.getUsageDetails()); treatment.setUpdateTime(DateUtils.getNowDate()); return treatmentMapper.updateTreatment(treatment); } diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml index cec4acf..3b339c1 100644 --- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml @@ -94,223 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - - insert into sheep_file - - id, - bs_manage_tags, - ranch_id, - dr_ranch, - sheepfold_id, - sheepfold_name, - electronic_tags, - variety_id, - variety, - family, - name, - gender, - birthday, - day_age, - month_age, - parity, - birth_weight, - weaning_date, - status_id, - weaning_weight, - current_weight, - breed_status_id, - breed, - bs_father_id, - father_manage_tags, - bs_mother_id, - mother_manage_tags, - receptor_id, - receptor_manage_tags, - father_father_id, - grandfather_manage_tags, - father_mother_id, - grandmother_manage_tags, - father_id, - maternal_grandfather_manage_tags, - mother_id, - maternal_grandmother_manage_tags, - mating_date, - mating_type_id, - preg_date, - lambing_date, - lambing_day, - mating_day, - gestation_day, - expected_date, - post_lambing_day, - lactation_day, - anestrous_day, - mating_counts, - mating_total, - miscarriage_counts, - comment, - controlled, - body, - breast, - source, - source_date, - source_ranch_id, - source_ranch, - update_by, - update_time, - create_by, - create_time, - is_delete, - - - #{id}, - #{bsManageTags}, - #{ranchId}, - #{drRanch}, - #{sheepfoldId}, - #{sheepfoldName}, - #{electronicTags}, - #{varietyId}, - #{variety}, - #{family}, - #{name}, - #{gender}, - #{birthday}, - #{dayAge}, - #{monthAge}, - #{parity}, - #{birthWeight}, - #{weaningDate}, - #{statusId}, - #{weaningWeight}, - #{currentWeight}, - #{breedStatusId}, - #{breed}, - #{bsFatherId}, - #{fatherManageTags}, - #{bsMotherId}, - #{motherManageTags}, - #{receptorId}, - #{receptorManageTags}, - #{fatherFatherId}, - #{grandfatherManageTags}, - #{fatherMotherId}, - #{grandmotherManageTags}, - #{fatherId}, - #{maternalGrandfatherManageTags}, - #{motherId}, - #{maternalGrandmotherManageTags}, - #{matingDate}, - #{matingTypeId}, - #{pregDate}, - #{lambingDate}, - #{lambingDay}, - #{matingDay}, - #{gestationDay}, - #{expectedDate}, - #{postLambingDay}, - #{lactationDay}, - #{anestrousDay}, - #{matingCounts}, - #{matingTotal}, - #{miscarriageCounts}, - #{comment}, - #{controlled}, - #{body}, - #{breast}, - #{source}, - #{sourceDate}, - #{sourceRanchId}, - #{sourceRanch}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - #{isDelete}, - - - - - update sheep_file - - bs_manage_tags = #{bsManageTags}, - ranch_id = #{ranchId}, - dr_ranch = #{drRanch}, - sheepfold_id = #{sheepfoldId}, - sheepfold_name = #{sheepfoldName}, - electronic_tags = #{electronicTags}, - variety_id = #{varietyId}, - variety = #{variety}, - family = #{family}, - name = #{name}, - gender = #{gender}, - birthday = #{birthday}, - day_age = #{dayAge}, - month_age = #{monthAge}, - parity = #{parity}, - birth_weight = #{birthWeight}, - weaning_date = #{weaningDate}, - status_id = #{statusId}, - weaning_weight = #{weaningWeight}, - current_weight = #{currentWeight}, - breed_status_id = #{breedStatusId}, - breed = #{breed}, - bs_father_id = #{bsFatherId}, - father_manage_tags = #{fatherManageTags}, - bs_mother_id = #{bsMotherId}, - mother_manage_tags = #{motherManageTags}, - receptor_id = #{receptorId}, - receptor_manage_tags = #{receptorManageTags}, - father_father_id = #{fatherFatherId}, - grandfather_manage_tags = #{grandfatherManageTags}, - father_mother_id = #{fatherMotherId}, - grandmother_manage_tags = #{grandmotherManageTags}, - father_id = #{fatherId}, - maternal_grandfather_manage_tags = #{maternalGrandfatherManageTags}, - mother_id = #{motherId}, - maternal_grandmother_manage_tags = #{maternalGrandmotherManageTags}, - mating_date = #{matingDate}, - mating_type_id = #{matingTypeId}, - preg_date = #{pregDate}, - lambing_date = #{lambingDate}, - lambing_day = #{lambingDay}, - mating_day = #{matingDay}, - gestation_day = #{gestationDay}, - expected_date = #{expectedDate}, - post_lambing_day = #{postLambingDay}, - lactation_day = #{lactationDay}, - anestrous_day = #{anestrousDay}, - mating_counts = #{matingCounts}, - mating_total = #{matingTotal}, - miscarriage_counts = #{miscarriageCounts}, - comment = #{comment}, - controlled = #{controlled}, - body = #{body}, - breast = #{breast}, - source = #{source}, - source_date = #{sourceDate}, - source_ranch_id = #{sourceRanchId}, - source_ranch = #{sourceRanch}, - update_by = #{updateBy}, - update_time = #{updateTime}, - create_by = #{createBy}, - create_time = #{createTime}, - is_delete = #{isDelete}, - - where id = #{id} - - - - delete from sheep_file where id = #{id} - - - - delete from sheep_file where id in - - #{id} - - + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml index 20ce9f6..f86bdef 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, use_type, update_by, update_time, create_by, create_time from sw_medicine_usage where id = #{id} @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sw_medicine_usage_details where medi_usage = #{mediUsage} diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml index ea9b470..9e03b7f 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -18,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,7 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, diag_id, sheep_id, variety, sheep_type, month_age, gender, parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id, comment, update_by, update_time, create_by, create_time from sw_treatment + select t.id, diag_id, sheep_id, variety, sheep_type, month_age, t.gender, t.parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id, t.comment, t.update_by, t.update_time, t.create_by, t.create_time, + bs.manage_tags, + sd.name disease_name + from sw_treatment t + left join bas_sheep bs on t.sheep_id = bs.id + left join sw_disease sd on t.disease_id = sd.id - where id = #{id} + where t.id = #{id} @@ -95,6 +102,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into sw_treatment + (diag_id, sheep_id, variety, sheep_type, month_age, gender, + parity, breed, lact_day, gest_day, datetime, + disease_id, disease_pid, veterinary, usage_id, + comment, update_by, update_time, create_by, create_time) + values + + (#{t.diagId}, #{t.sheepId}, #{t.variety}, #{t.sheepType}, + #{t.monthAge}, #{t.gender}, #{t.parity}, #{t.breed}, + #{t.lactDay}, #{t.gestDay}, #{t.datetime}, #{t.diseaseId}, + #{t.diseasePid}, #{t.veterinary},#{t.usageId}, #{t.comment}, + #{t.updateBy}, #{t.updateTime},#{t.createBy}, #{t.createTime}) + + + update sw_treatment