From a49a4a0359fe0253b3104be350efaef8a0d7e6ec Mon Sep 17 00:00:00 2001 From: zyh <2066096076@qq.com> Date: Mon, 8 Dec 2025 19:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=BB=E7=B2=BE=E5=86=BB=E8=83=9A=E7=9A=84?= =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frozen/controller/DdFeController.java | 61 ++++++++++++------- .../zhyc/module/frozen/mapper/DdFeMapper.java | 2 + .../frozen/service/impl/DdFeServiceImpl.java | 4 ++ .../resources/mapper/frozen/DdFeMapper.xml | 29 +++++---- 4 files changed, 61 insertions(+), 35 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java index 979b92c..3c8c9c4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.StringUtils; +import com.zhyc.module.frozen.mapper.DdFeMapper; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,24 +21,24 @@ import com.zhyc.common.core.page.TableDataInfo; /** * 冻胚库存Controller - * + * * @author ruoyi * @date 2025-11-29 */ @RestController @RequestMapping("/frozen/embryo") -public class DdFeController extends BaseController -{ +public class DdFeController extends BaseController { @Autowired private IDdFeService ddFeService; + @Autowired + private DdFeMapper ddFeMapper; /** * 查询冻胚库存列表 */ @PreAuthorize("@ss.hasPermi('frozen:embryo:list')") @GetMapping("/list") - public TableDataInfo list(DdFe ddFe) - { + public TableDataInfo list(DdFe ddFe) { startPage(); List list = ddFeService.selectDdFeList(ddFe); return getDataTable(list); @@ -49,8 +50,7 @@ public class DdFeController extends BaseController @PreAuthorize("@ss.hasPermi('frozen:embryo:export')") @Log(title = "冻胚库存", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DdFe ddFe) - { + public void export(HttpServletResponse response, DdFe ddFe) { List list = ddFeService.selectDdFeList(ddFe); ExcelUtil util = new ExcelUtil(DdFe.class); util.exportExcel(response, list, "冻胚库存数据"); @@ -61,8 +61,7 @@ public class DdFeController extends BaseController */ @PreAuthorize("@ss.hasPermi('frozen:embryo:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(ddFeService.selectDdFeById(id)); } @@ -72,8 +71,7 @@ public class DdFeController extends BaseController @PreAuthorize("@ss.hasPermi('frozen:embryo:add')") @Log(title = "冻胚库存", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DdFe ddFe) - { + public AjaxResult add(@RequestBody DdFe ddFe) { ddFe.setCreateBy(SecurityUtils.getUsername()); return toAjax(ddFeService.insertDdFe(ddFe)); } @@ -84,8 +82,7 @@ public class DdFeController extends BaseController @PreAuthorize("@ss.hasPermi('frozen:embryo:edit')") @Log(title = "冻胚库存", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DdFe ddFe) - { + public AjaxResult edit(@RequestBody DdFe ddFe) { return toAjax(ddFeService.updateDdFe(ddFe)); } @@ -94,9 +91,8 @@ public class DdFeController extends BaseController */ @PreAuthorize("@ss.hasPermi('frozen:embryo:remove')") @Log(title = "冻胚库存", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(ddFeService.deleteDdFeByIds(ids)); } @@ -126,13 +122,26 @@ public class DdFeController extends BaseController Integer qty; switch (grade) { - case "A": qty = (Integer) flush.getOrDefault("gradeA", 0); break; - case "B": qty = (Integer) flush.getOrDefault("gradeB", 0); break; - case "C": qty = (Integer) flush.getOrDefault("gradeC", 0); break; - case "D": qty = (Integer) flush.getOrDefault("gradeD", 0); break; - case "囊胚": qty = (Integer) flush.getOrDefault("cell24", 0); break; - case "桑椹胚": qty = (Integer) flush.getOrDefault("cell8", 0); break; - default: qty = 0; + case "A": + qty = (Integer) flush.getOrDefault("gradeA", 0); + break; + case "B": + qty = (Integer) flush.getOrDefault("gradeB", 0); + break; + case "C": + qty = (Integer) flush.getOrDefault("gradeC", 0); + break; + case "D": + qty = (Integer) flush.getOrDefault("gradeD", 0); + break; + case "囊胚": + qty = (Integer) flush.getOrDefault("cell24", 0); + break; + case "桑椹胚": + qty = (Integer) flush.getOrDefault("cell8", 0); + break; + default: + qty = 0; } return success(qty); } @@ -153,4 +162,10 @@ public class DdFeController extends BaseController }); return success(); } + + // 唯一性校验 + @GetMapping("/checkCode") + public AjaxResult exist(@RequestParam String code) { + return success(ddFeMapper.existsByCode(code) > 0); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/mapper/DdFeMapper.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/mapper/DdFeMapper.java index ded9e82..1e5c4a1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/mapper/DdFeMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/mapper/DdFeMapper.java @@ -72,4 +72,6 @@ public interface DdFeMapper * 废弃更新（只改状态、出库日期、废弃原因、更新人） */ int updateDiscard(DdFe dto); + // 唯一性校验 + int existsByCode(@Param("code") String code); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java index 306a8e6..1165680 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.StringUtils; import com.zhyc.module.produce.breed.domain.ScEmbryoFlush; @@ -65,6 +66,9 @@ public class DdFeServiceImpl implements IDdFeService @Override public int insertDdFe(DdFe ddFe) { + if (ddFeMapper.existsByCode(ddFe.getCode()) > 0) { + throw new ServiceException("胚胎编号已存在，请勿重复录入"); + } ddFe.setCreateTime(DateUtils.getNowDate()); return ddFeMapper.insertDdFe(ddFe); } diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml index 496d875..682d1f3 100644 --- a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml +++ b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml @@ -59,8 +59,10 @@ and code like concat('%', #{code}, '%') and grade = #{grade} and status = #{status} - and tech = #{tech} - and out_date = #{outDate} + + AND tech LIKE CONCAT('%', #{tech}, '%') + + and out_date = #{outDate} and freeze_date between #{params.beginFreezeDate} and #{params.endFreezeDate} @@ -164,23 +166,26 @@ UPDATE dd_fe - SET status = #{status}, + SET status = #{status}, discard_txt = #{discardTxt} WHERE id = #{id} + + \ No newline at end of file