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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zyh 2025-07-22 14:59:47 +08:00
commit 4f45e1fcbf
25 changed files with 364 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupMappingController.java
View File

@ -18,6 +18,11 @@ import com.zhyc.module.base.service.IBasSheepGroupMappingService;
import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo;
// 1. 导入
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 羊只分组关联Controller
*
@ -43,6 +48,10 @@ public class BasSheepGroupMappingController extends BaseController
return getDataTable(list);
}
// 2. 声明（放在类内部、方法外部）
private static final Logger log = LoggerFactory.getLogger(BasSheepGroupMappingController.class);
@PreAuthorize("@ss.hasPermi('sheep_grouping:sheep_grouping:list')")
@GetMapping("/listJoin")
public TableDataInfo list(
@ -103,7 +112,11 @@ public class BasSheepGroupMappingController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BasSheepGroupMapping basSheepGroupMapping)
{
return toAjax(basSheepGroupMappingService.updateBasSheepGroupMapping(basSheepGroupMapping));
try {
return toAjax(basSheepGroupMappingService.updateBasSheepGroupMapping(basSheepGroupMapping));
} catch (RuntimeException e) {
return error(e.getMessage());
}
}
/**
@ -116,4 +129,20 @@ public class BasSheepGroupMappingController extends BaseController
{
return toAjax(basSheepGroupMappingService.deleteBasSheepGroupMappingByIds(ids));
}
@PostMapping("/addByEarTags")
public AjaxResult addByEarTags(@RequestBody Map<String, Object> params) {
List<String> earTags = (List<String>) params.get("earTags");
Long groupId = Long.valueOf(params.get("groupId").toString());
if (earTags == null || earTags.isEmpty()) {
return error("耳号列表不能为空");
}
return basSheepGroupMappingService.addByEarTags(earTags, groupId);
}
}

38
zhyc-module/src/main/java/com/zhyc/module/base/controller/SheepFileController.java
View File

@ -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));
}
}

7
zhyc-module/src/main/java/com/zhyc/module/base/mapper/BasSheepGroupMappingMapper.java
View File

@ -76,4 +76,11 @@ public interface BasSheepGroupMappingMapper
public int deleteBasSheepGroupMappingByIds(Long[] ids);
List<Map<String, Object>> selectSheepIdsByEarTags(@Param("earTags") List<String> earTags);
int batchInsert(@Param("list") List<BasSheepGroupMapping> list);
List<BasSheepGroupMapping> selectListByGroupId(@Param("groupId") Long groupId);
}

30
zhyc-module/src/main/java/com/zhyc/module/base/mapper/SheepFileMapper.java
View File

@ -28,36 +28,12 @@ public interface SheepFileMapper
*/
public List<SheepFile> 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);
}

3
zhyc-module/src/main/java/com/zhyc/module/base/service/IBasSheepGroupMappingService.java
View File

@ -3,6 +3,7 @@ package com.zhyc.module.base.service;
import java.util.List;
import java.util.Map;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.module.base.domain.BasSheepGroupMapping;
/**
@ -67,4 +68,6 @@ public interface IBasSheepGroupMappingService
* @return 结果
*/
public int deleteBasSheepGroupMappingById(Long id);
public AjaxResult addByEarTags(List<String> earTags, Long groupId);
}

31
zhyc-module/src/main/java/com/zhyc/module/base/service/ISheepFileService.java
View File

@ -28,35 +28,6 @@ public interface ISheepFileService
*/
public List<SheepFile> 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);
}

94
zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupMappingServiceImpl.java
View File

@ -1,8 +1,9 @@
package com.zhyc.module.base.service.impl;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.module.base.domain.BasSheepGroupMapping;
import com.zhyc.module.base.mapper.BasSheepGroupMappingMapper;
import com.zhyc.module.base.service.IBasSheepGroupMappingService;
@ -70,9 +71,21 @@ public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingSer
* @param basSheepGroupMapping 羊只分组关联
* @return 结果
*/
// @Override
// public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping)
// {
// return basSheepGroupMappingMapper.updateBasSheepGroupMapping(basSheepGroupMapping);
// }
@Override
public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping)
{
public int updateBasSheepGroupMapping(BasSheepGroupMapping basSheepGroupMapping) {
Long SheepId = basSheepGroupMapping.getSheepId();
Long GroupId = basSheepGroupMapping.getGroupId();
existsInGroup(SheepId,GroupId);
if (existsInGroup(basSheepGroupMapping.getSheepId(), basSheepGroupMapping.getGroupId())) {
throw new RuntimeException("该羊已在此分组，无需修改");
}
return basSheepGroupMappingMapper.updateBasSheepGroupMapping(basSheepGroupMapping);
}
@ -100,4 +113,77 @@ public class BasSheepGroupMappingServiceImpl implements IBasSheepGroupMappingSer
return basSheepGroupMappingMapper.deleteBasSheepGroupMappingById(id);
}
@Override
public AjaxResult addByEarTags(List<String> earTags, Long groupId) {
// 1. 参数判空
if (earTags == null || earTags.isEmpty()) {
return AjaxResult.error("耳号列表不能为空");
}
// 2. 根据耳号查询羊只（manage_tags -> id）
List<Map<String, Object>> sheepList = basSheepGroupMappingMapper.selectSheepIdsByEarTags(earTags);
Map<String, Long> tagToId = new HashMap<>();
for (Map<String, Object> s : sheepList) {
tagToId.put((String) s.get("manage_tags"), ((Number) s.get("id")).longValue());
}
// 3. 不存在的耳号
List<String> missing = new ArrayList<>();
for (String tag : earTags) {
if (!tagToId.containsKey(tag)) {
missing.add(tag);
}
}
if (!missing.isEmpty()) {
Map<String, Object> res = new HashMap<>();
res.put("success", false);
res.put("missing", missing);
return AjaxResult.success(res);
}
// 4. 查询该分组下已存在的羊只ID
List<BasSheepGroupMapping> existingRows = basSheepGroupMappingMapper.selectListByGroupId(groupId);
System.out.println("🔍 existingRows 类型 = " + existingRows.getClass());
Set<Long> existingIds = existingRows.stream()
.map(BasSheepGroupMapping::getSheepId)
.collect(Collectors.toSet());
System.out.println("🔍 existingIds = " + existingIds);
// 5. 过滤出未在该分组的羊只
List<BasSheepGroupMapping> toInsert = new ArrayList<>();
for (Map.Entry<String, Long> e : tagToId.entrySet()) {
Long sheepId = e.getValue();
if (!existingIds.contains(sheepId)) {
BasSheepGroupMapping m = new BasSheepGroupMapping();
m.setSheepId(sheepId);
m.setGroupId(groupId);
toInsert.add(m);
}
}
if (toInsert.isEmpty()) {
return AjaxResult.success("所选羊只已全部在该分组中");
}
// 6. 批量插入
int rows = basSheepGroupMappingMapper.batchInsert(toInsert);
Map<String, Object> res = new HashMap<>();
res.put("success", true);
res.put("inserted", rows);
return AjaxResult.success(res);
}
private boolean existsInGroup(Long sheepId, Long groupId) {
BasSheepGroupMapping param = new BasSheepGroupMapping();
List<Map<String, Object>> list = basSheepGroupMappingMapper
.selectBasSheepGroupMappingList(sheepId, groupId, null);
return !list.isEmpty();
}
}

61
zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
View File

@ -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<SheepFile> selectSheepFileList(SheepFile sheepFile)
{
public List<SheepFile> 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);
}
}

12
zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java
View File

@ -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)

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java
View File

@ -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));
}

57
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java
View File

@ -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<SwMedicineUsageDetails> 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<SwMedicineUsageDetails> getSwMedicineUsageDetailsList()
{
return swMedicineUsageDetailsList;
}
public void setSwMedicineUsageDetailsList(List<SwMedicineUsageDetails> 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();
}
}

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsageDetails.java
View File

@ -22,7 +22,7 @@ public class SwMedicineUsageDetails extends BaseEntity
/** 药品使用记录id */
@Excel(name = "药品使用记录id")
private Long mediUsage;
private Integer mediUsage;
/** 药品id */
@Excel(name = "药品id")

12
zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java
View File

@ -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<String> 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<SwMedicineUsageDetails> usageDetails;

6
zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/SwMedicineUsageMapper.java
View File

@ -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);
}

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/TreatmentMapper.java
View File

@ -59,4 +59,6 @@ public interface TreatmentMapper
* @return 结果
*/
public int deleteTreatmentByIds(Long[] ids);
int insertTreatmentList(List<Treatment> treatments);
}

4
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ISwMedicineUsageService.java
View File

@ -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);
}

2
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/ITreatmentService.java
View File

@ -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);
/**
* 修改治疗记录
*

8
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java
View File

@ -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<SwMedicineUsageDetails> swMedicineUsageDetailsList = swMedicineUsage.getSwMedicineUsageDetailsList();
Long id = swMedicineUsage.getId();
Integer id = swMedicineUsage.getId();
if (StringUtils.isNotNull(swMedicineUsageDetailsList))
{
List<SwMedicineUsageDetails> list = new ArrayList<SwMedicineUsageDetails>();

70
zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java
View File

@ -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<Treatment> 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);
}

37
zhyc-module/src/main/resources/mapper/base/BasSheepGroupMappingMapper.xml
View File

@ -52,19 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupId != null"> AND m.group_id = #{groupId}</if>
<if test="bsManageTags != null and bsManageTags.size > 0">
AND s.bs_manage_tags IN
<foreach collection="bsManageTags" item="bsManageTag " open="(" separator="," close=")">
#{bsManageTag}
<foreach collection="bsManageTags" item="tag" open="(" separator="," close=")">
#{tag}
</foreach>
</if>
</where>
ORDER BY m.id
</select>
<select id="selectBasSheepGroupMappingById" parameterType="Long" resultMap="BasSheepGroupMappingResult">
<include refid="selectBasSheepGroupMappingVo"/>
@ -102,4 +97,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<!-- 根据耳号查询羊只ID -->
<select id="selectSheepIdsByEarTags" parameterType="list" resultType="map">
SELECT id, manage_tags
FROM bas_sheep
WHERE manage_tags IN
<foreach collection="earTags" item="tag" open="(" separator="," close=")">
#{tag}
</foreach>
</select>
<!-- 批量插入 -->
<insert id="batchInsert" parameterType="java.util.List">
INSERT INTO bas_sheep_group_mapping (sheep_id, group_id)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.sheepId}, #{item.groupId})
</foreach>
</insert>
<select id="selectListByGroupId"
resultMap="BasSheepGroupMappingResult">
SELECT id, sheep_id, group_id
FROM bas_sheep_group_mapping
WHERE group_id = #{groupId}
</select>
</mapper>

221
zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
View File

@ -94,223 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSheepFileVo"/>
where id = #{id}
</select>
<insert id="insertSheepFile" parameterType="SheepFile">
insert into sheep_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="bsManageTags != null">bs_manage_tags,</if>
<if test="ranchId != null">ranch_id,</if>
<if test="drRanch != null">dr_ranch,</if>
<if test="sheepfoldId != null">sheepfold_id,</if>
<if test="sheepfoldName != null">sheepfold_name,</if>
<if test="electronicTags != null">electronic_tags,</if>
<if test="varietyId != null">variety_id,</if>
<if test="variety != null">variety,</if>
<if test="family != null">family,</if>
<if test="name != null">name,</if>
<if test="gender != null">gender,</if>
<if test="birthday != null">birthday,</if>
<if test="dayAge != null">day_age,</if>
<if test="monthAge != null">month_age,</if>
<if test="parity != null">parity,</if>
<if test="birthWeight != null">birth_weight,</if>
<if test="weaningDate != null">weaning_date,</if>
<if test="statusId != null">status_id,</if>
<if test="weaningWeight != null">weaning_weight,</if>
<if test="currentWeight != null">current_weight,</if>
<if test="breedStatusId != null">breed_status_id,</if>
<if test="breed != null">breed,</if>
<if test="bsFatherId != null">bs_father_id,</if>
<if test="fatherManageTags != null">father_manage_tags,</if>
<if test="bsMotherId != null">bs_mother_id,</if>
<if test="motherManageTags != null">mother_manage_tags,</if>
<if test="receptorId != null">receptor_id,</if>
<if test="receptorManageTags != null">receptor_manage_tags,</if>
<if test="fatherFatherId != null">father_father_id,</if>
<if test="grandfatherManageTags != null">grandfather_manage_tags,</if>
<if test="fatherMotherId != null">father_mother_id,</if>
<if test="grandmotherManageTags != null">grandmother_manage_tags,</if>
<if test="fatherId != null">father_id,</if>
<if test="maternalGrandfatherManageTags != null">maternal_grandfather_manage_tags,</if>
<if test="motherId != null">mother_id,</if>
<if test="maternalGrandmotherManageTags != null">maternal_grandmother_manage_tags,</if>
<if test="matingDate != null">mating_date,</if>
<if test="matingTypeId != null">mating_type_id,</if>
<if test="pregDate != null">preg_date,</if>
<if test="lambingDate != null">lambing_date,</if>
<if test="lambingDay != null">lambing_day,</if>
<if test="matingDay != null">mating_day,</if>
<if test="gestationDay != null">gestation_day,</if>
<if test="expectedDate != null">expected_date,</if>
<if test="postLambingDay != null">post_lambing_day,</if>
<if test="lactationDay != null">lactation_day,</if>
<if test="anestrousDay != null">anestrous_day,</if>
<if test="matingCounts != null">mating_counts,</if>
<if test="matingTotal != null">mating_total,</if>
<if test="miscarriageCounts != null">miscarriage_counts,</if>
<if test="comment != null">comment,</if>
<if test="controlled != null">controlled,</if>
<if test="body != null">body,</if>
<if test="breast != null">breast,</if>
<if test="source != null">source,</if>
<if test="sourceDate != null">source_date,</if>
<if test="sourceRanchId != null">source_ranch_id,</if>
<if test="sourceRanch != null">source_ranch,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="isDelete != null">is_delete,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="bsManageTags != null">#{bsManageTags},</if>
<if test="ranchId != null">#{ranchId},</if>
<if test="drRanch != null">#{drRanch},</if>
<if test="sheepfoldId != null">#{sheepfoldId},</if>
<if test="sheepfoldName != null">#{sheepfoldName},</if>
<if test="electronicTags != null">#{electronicTags},</if>
<if test="varietyId != null">#{varietyId},</if>
<if test="variety != null">#{variety},</if>
<if test="family != null">#{family},</if>
<if test="name != null">#{name},</if>
<if test="gender != null">#{gender},</if>
<if test="birthday != null">#{birthday},</if>
<if test="dayAge != null">#{dayAge},</if>
<if test="monthAge != null">#{monthAge},</if>
<if test="parity != null">#{parity},</if>
<if test="birthWeight != null">#{birthWeight},</if>
<if test="weaningDate != null">#{weaningDate},</if>
<if test="statusId != null">#{statusId},</if>
<if test="weaningWeight != null">#{weaningWeight},</if>
<if test="currentWeight != null">#{currentWeight},</if>
<if test="breedStatusId != null">#{breedStatusId},</if>
<if test="breed != null">#{breed},</if>
<if test="bsFatherId != null">#{bsFatherId},</if>
<if test="fatherManageTags != null">#{fatherManageTags},</if>
<if test="bsMotherId != null">#{bsMotherId},</if>
<if test="motherManageTags != null">#{motherManageTags},</if>
<if test="receptorId != null">#{receptorId},</if>
<if test="receptorManageTags != null">#{receptorManageTags},</if>
<if test="fatherFatherId != null">#{fatherFatherId},</if>
<if test="grandfatherManageTags != null">#{grandfatherManageTags},</if>
<if test="fatherMotherId != null">#{fatherMotherId},</if>
<if test="grandmotherManageTags != null">#{grandmotherManageTags},</if>
<if test="fatherId != null">#{fatherId},</if>
<if test="maternalGrandfatherManageTags != null">#{maternalGrandfatherManageTags},</if>
<if test="motherId != null">#{motherId},</if>
<if test="maternalGrandmotherManageTags != null">#{maternalGrandmotherManageTags},</if>
<if test="matingDate != null">#{matingDate},</if>
<if test="matingTypeId != null">#{matingTypeId},</if>
<if test="pregDate != null">#{pregDate},</if>
<if test="lambingDate != null">#{lambingDate},</if>
<if test="lambingDay != null">#{lambingDay},</if>
<if test="matingDay != null">#{matingDay},</if>
<if test="gestationDay != null">#{gestationDay},</if>
<if test="expectedDate != null">#{expectedDate},</if>
<if test="postLambingDay != null">#{postLambingDay},</if>
<if test="lactationDay != null">#{lactationDay},</if>
<if test="anestrousDay != null">#{anestrousDay},</if>
<if test="matingCounts != null">#{matingCounts},</if>
<if test="matingTotal != null">#{matingTotal},</if>
<if test="miscarriageCounts != null">#{miscarriageCounts},</if>
<if test="comment != null">#{comment},</if>
<if test="controlled != null">#{controlled},</if>
<if test="body != null">#{body},</if>
<if test="breast != null">#{breast},</if>
<if test="source != null">#{source},</if>
<if test="sourceDate != null">#{sourceDate},</if>
<if test="sourceRanchId != null">#{sourceRanchId},</if>
<if test="sourceRanch != null">#{sourceRanch},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="isDelete != null">#{isDelete},</if>
</trim>
</insert>
<update id="updateSheepFile" parameterType="SheepFile">
update sheep_file
<trim prefix="SET" suffixOverrides=",">
<if test="bsManageTags != null">bs_manage_tags = #{bsManageTags},</if>
<if test="ranchId != null">ranch_id = #{ranchId},</if>
<if test="drRanch != null">dr_ranch = #{drRanch},</if>
<if test="sheepfoldId != null">sheepfold_id = #{sheepfoldId},</if>
<if test="sheepfoldName != null">sheepfold_name = #{sheepfoldName},</if>
<if test="electronicTags != null">electronic_tags = #{electronicTags},</if>
<if test="varietyId != null">variety_id = #{varietyId},</if>
<if test="variety != null">variety = #{variety},</if>
<if test="family != null">family = #{family},</if>
<if test="name != null">name = #{name},</if>
<if test="gender != null">gender = #{gender},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="dayAge != null">day_age = #{dayAge},</if>
<if test="monthAge != null">month_age = #{monthAge},</if>
<if test="parity != null">parity = #{parity},</if>
<if test="birthWeight != null">birth_weight = #{birthWeight},</if>
<if test="weaningDate != null">weaning_date = #{weaningDate},</if>
<if test="statusId != null">status_id = #{statusId},</if>
<if test="weaningWeight != null">weaning_weight = #{weaningWeight},</if>
<if test="currentWeight != null">current_weight = #{currentWeight},</if>
<if test="breedStatusId != null">breed_status_id = #{breedStatusId},</if>
<if test="breed != null">breed = #{breed},</if>
<if test="bsFatherId != null">bs_father_id = #{bsFatherId},</if>
<if test="fatherManageTags != null">father_manage_tags = #{fatherManageTags},</if>
<if test="bsMotherId != null">bs_mother_id = #{bsMotherId},</if>
<if test="motherManageTags != null">mother_manage_tags = #{motherManageTags},</if>
<if test="receptorId != null">receptor_id = #{receptorId},</if>
<if test="receptorManageTags != null">receptor_manage_tags = #{receptorManageTags},</if>
<if test="fatherFatherId != null">father_father_id = #{fatherFatherId},</if>
<if test="grandfatherManageTags != null">grandfather_manage_tags = #{grandfatherManageTags},</if>
<if test="fatherMotherId != null">father_mother_id = #{fatherMotherId},</if>
<if test="grandmotherManageTags != null">grandmother_manage_tags = #{grandmotherManageTags},</if>
<if test="fatherId != null">father_id = #{fatherId},</if>
<if test="maternalGrandfatherManageTags != null">maternal_grandfather_manage_tags = #{maternalGrandfatherManageTags},</if>
<if test="motherId != null">mother_id = #{motherId},</if>
<if test="maternalGrandmotherManageTags != null">maternal_grandmother_manage_tags = #{maternalGrandmotherManageTags},</if>
<if test="matingDate != null">mating_date = #{matingDate},</if>
<if test="matingTypeId != null">mating_type_id = #{matingTypeId},</if>
<if test="pregDate != null">preg_date = #{pregDate},</if>
<if test="lambingDate != null">lambing_date = #{lambingDate},</if>
<if test="lambingDay != null">lambing_day = #{lambingDay},</if>
<if test="matingDay != null">mating_day = #{matingDay},</if>
<if test="gestationDay != null">gestation_day = #{gestationDay},</if>
<if test="expectedDate != null">expected_date = #{expectedDate},</if>
<if test="postLambingDay != null">post_lambing_day = #{postLambingDay},</if>
<if test="lactationDay != null">lactation_day = #{lactationDay},</if>
<if test="anestrousDay != null">anestrous_day = #{anestrousDay},</if>
<if test="matingCounts != null">mating_counts = #{matingCounts},</if>
<if test="matingTotal != null">mating_total = #{matingTotal},</if>
<if test="miscarriageCounts != null">miscarriage_counts = #{miscarriageCounts},</if>
<if test="comment != null">comment = #{comment},</if>
<if test="controlled != null">controlled = #{controlled},</if>
<if test="body != null">body = #{body},</if>
<if test="breast != null">breast = #{breast},</if>
<if test="source != null">source = #{source},</if>
<if test="sourceDate != null">source_date = #{sourceDate},</if>
<if test="sourceRanchId != null">source_ranch_id = #{sourceRanchId},</if>
<if test="sourceRanch != null">source_ranch = #{sourceRanch},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="isDelete != null">is_delete = #{isDelete},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSheepFileById" parameterType="Long">
delete from sheep_file where id = #{id}
</delete>
<delete id="deleteSheepFileByIds" parameterType="String">
delete from sheep_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectSheepByManageTags" parameterType="String" resultMap="SheepFileResult">
<include refid="selectSheepFileVo"/>
where bs_manage_tags = #{tags}
</select>
</mapper>

4
zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml
View File

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectSwMedicineUsageById" parameterType="Long" resultMap="SwMedicineUsageSwMedicineUsageDetailsResult">
<select id="selectSwMedicineUsageById" parameterType="Integer" resultMap="SwMedicineUsageSwMedicineUsageDetailsResult">
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"
</foreach>
</delete>
<delete id="deleteSwMedicineUsageDetailsByMediUsage" parameterType="Long">
<delete id="deleteSwMedicineUsageDetailsByMediUsage" parameterType="Integer">
delete from sw_medicine_usage_details where medi_usage = #{mediUsage}
</delete>

27
zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="diagId" column="diag_id" />
<result property="sheepId" column="sheep_id" />
<result property="sheepNo" column="manage_tags"/>
<result property="variety" column="variety" />
<result property="sheepType" column="sheep_type" />
<result property="monthAge" column="month_age" />
@ -18,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="gestDay" column="gest_day" />
<result property="datetime" column="datetime" />
<result property="diseaseId" column="disease_id" />
<result property="diseaseName" column="disease_name"/>
<result property="diseasePid" column="disease_pid" />
<result property="veterinary" column="veterinary" />
<result property="usageId" column="usage_id" />
@ -29,7 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTreatmentVo">
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
</sql>
<select id="selectTreatmentList" parameterType="Treatment" resultMap="TreatmentResult">
@ -44,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTreatmentById" parameterType="Long" resultMap="TreatmentResult">
<include refid="selectTreatmentVo"/>
where id = #{id}
where t.id = #{id}
</select>
<insert id="insertTreatment" parameterType="Treatment" useGeneratedKeys="true" keyProperty="id">
@ -95,6 +102,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<insert id="insertTreatmentList" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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
<foreach collection="list" item="t" separator=",">
(#{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})
</foreach>
</insert>
<update id="updateTreatment" parameterType="Treatment">
update sw_treatment
<trim prefix="SET" suffixOverrides=",">

98
zhyc-module/src/main/resources/mapper/dairyProducts/NpFreshMilkInspMapper.xml
View File

@ -1,62 +1,61 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.dairyProducts.mapper.NpFreshMilkInspMapper">
<resultMap type="NpFreshMilkInsp" id="NpFreshMilkInspResult">
<result property="id" column="id" />
<result property="source" column="source" />
<result property="datetime" column="datetime" />
<result property="fat" column="fat" />
<result property="protein" column="protein" />
<result property="nonFat" column="non_fat" />
<result property="acidity" column="acidity" />
<result property="bacterialColony1" column="bacterial_colony_1" />
<result property="bacterialColony2" column="bacterial_colony_2" />
<result property="bacterialColony3" column="bacterial_colony_3" />
<result property="bacterialColony4" column="bacterial_colony_4" />
<result property="bacterialColony5" column="bacterial_colony_5" />
<result property="coli" column="coli" />
<result property="lactoferrin" column="lactoferrin" />
<result property="ig" column="ig" />
<result property="commnet" column="commnet" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="id" column="id" />
<result property="source" column="source" />
<result property="datetime" column="datetime" />
<result property="fat" column="fat" />
<result property="protein" column="protein" />
<result property="nonFat" column="non_fat" />
<result property="acidity" column="acidity" />
<result property="bacterialColony1" column="bacterial_colony_1" />
<result property="bacterialColony2" column="bacterial_colony_2" />
<result property="bacterialColony3" column="bacterial_colony_3" />
<result property="bacterialColony4" column="bacterial_colony_4" />
<result property="bacterialColony5" column="bacterial_colony_5" />
<result property="coli" column="coli" />
<result property="lactoferrin" column="lactoferrin" />
<result property="ig" column="ig" />
<result property="commnet" column="commnet" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectNpFreshMilkInspVo">
select id, source, datetime, fat, protein, non_fat, acidity, bacterial_colony_1, bacterial_colony_2, bacterial_colony_3, bacterial_colony_4, bacterial_colony_5, coli, lactoferrin, ig, commnet, create_by, create_time from np_fresh_milk_insp
SELECT
id, source, datetime, fat, protein, non_fat, acidity,
bacterial_colony_1, bacterial_colony_2, bacterial_colony_3,
bacterial_colony_4, bacterial_colony_5, coli, lactoferrin,
ig, commnet, create_by, create_time
FROM np_fresh_milk_insp
</sql>
<!-- 查询列表（已修改为只按来源和日期查询） -->
<select id="selectNpFreshMilkInspList" parameterType="NpFreshMilkInsp" resultMap="NpFreshMilkInspResult">
<include refid="selectNpFreshMilkInspVo"/>
<where>
<if test="source != null and source != ''"> and source = #{source}</if>
<if test="datetime != null "> and datetime = #{datetime}</if>
<if test="fat != null "> and fat = #{fat}</if>
<if test="protein != null "> and protein = #{protein}</if>
<if test="nonFat != null "> and non_fat = #{nonFat}</if>
<if test="acidity != null "> and acidity = #{acidity}</if>
<if test="bacterialColony1 != null "> and bacterial_colony_1 = #{bacterialColony1}</if>
<if test="bacterialColony2 != null "> and bacterial_colony_2 = #{bacterialColony2}</if>
<if test="bacterialColony3 != null "> and bacterial_colony_3 = #{bacterialColony3}</if>
<if test="bacterialColony4 != null "> and bacterial_colony_4 = #{bacterialColony4}</if>
<if test="bacterialColony5 != null "> and bacterial_colony_5 = #{bacterialColony5}</if>
<if test="coli != null "> and coli = #{coli}</if>
<if test="lactoferrin != null "> and lactoferrin = #{lactoferrin}</if>
<if test="ig != null "> and ig = #{ig}</if>
<if test="commnet != null and commnet != ''"> and commnet = #{commnet}</if>
<where>
<if test="source != null and source != ''">
AND source LIKE CONCAT('%', #{source}, '%')
</if>
<if test="datetime != null">
AND datetime = #{datetime}
</if>
</where>
</select>
<!-- 根据ID查询 -->
<select id="selectNpFreshMilkInspById" parameterType="Long" resultMap="NpFreshMilkInspResult">
<include refid="selectNpFreshMilkInspVo"/>
where id = #{id}
WHERE id = #{id}
</select>
<!-- 新增 -->
<insert id="insertNpFreshMilkInsp" parameterType="NpFreshMilkInsp" useGeneratedKeys="true" keyProperty="id">
insert into np_fresh_milk_insp
INSERT INTO np_fresh_milk_insp
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="source != null">source,</if>
<if test="datetime != null">datetime,</if>
@ -75,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="commnet != null">commnet,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="source != null">#{source},</if>
<if test="datetime != null">#{datetime},</if>
@ -94,11 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="commnet != null">#{commnet},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</trim>
</insert>
<!-- 修改 -->
<update id="updateNpFreshMilkInsp" parameterType="NpFreshMilkInsp">
update np_fresh_milk_insp
UPDATE np_fresh_milk_insp
<trim prefix="SET" suffixOverrides=",">
<if test="source != null">source = #{source},</if>
<if test="datetime != null">datetime = #{datetime},</if>
@ -115,18 +115,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lactoferrin != null">lactoferrin = #{lactoferrin},</if>
<if test="ig != null">ig = #{ig},</if>
<if test="commnet != null">commnet = #{commnet},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
WHERE id = #{id}
</update>
<!-- 单个删除 -->
<delete id="deleteNpFreshMilkInspById" parameterType="Long">
delete from np_fresh_milk_insp where id = #{id}
DELETE FROM np_fresh_milk_insp WHERE id = #{id}
</delete>
<!-- 批量删除 -->
<delete id="deleteNpFreshMilkInspByIds" parameterType="String">
delete from np_fresh_milk_insp where id in
DELETE FROM np_fresh_milk_insp WHERE id IN
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

10
zhyc-module/src/main/resources/mapper/dairyProducts/NpYogurtInspMapper.xml
View File

@ -26,7 +26,11 @@
</resultMap>
<sql id="selectNpYogurtInspVo">
select id, source, datetime, fat, protein, non_fat, acidity, bacterial_colony_1, bacterial_clony_2, bacterial_clony_3, bacterial_clony_4, bacterial_clony_5, yeast, mould, lacto, comment, create_by, create_time from np_yogurt_insp
select id, source, datetime, fat, protein, non_fat,
acidity, bacterial_colony_1, bacterial_clony_2,
bacterial_clony_3, bacterial_clony_4, bacterial_clony_5,
yeast, mould, lacto, comment, create_by, create_time
from np_yogurt_insp
</sql>
<select id="selectNpYogurtInspList" parameterType="NpYogurtInsp" resultMap="NpYogurtInspResult">
@ -40,7 +44,7 @@
</if>
</where>
</select>
<select id="selectNpYogurtInspById" parameterType="Long" resultMap="NpYogurtInspResult">
<include refid="selectNpYogurtInspVo"/>
where id = #{id}
@ -117,7 +121,7 @@
</delete>
<delete id="deleteNpYogurtInspByIds" parameterType="String">
delete from np_yogurt_insp where id in
delete from np_yogurt_insp where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>