From 7efeca72f6a12dc51fb521b4d4f2900d87508469 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 18 Dec 2025 16:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dict/ReportItemController.java | 11 ++++++-- .../liswork/mapper/dict/ReportItemMapper.java | 10 +++++-- .../liswork/service/ReportItemService.java | 4 ++- .../service/impl/ReportItemServiceImpl.java | 26 ++++++++++++++++--- .../resources/mapper/ReportItemMapper.xml | 20 ++++++++++---- 5 files changed, 57 insertions(+), 14 deletions(-) diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 937da91..4eaa2c5 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java @@ -1,6 +1,6 @@ package com.czlis.liswork.controller.dict; -import com.czlis.common.annotation.Anonymous; + import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; @@ -117,7 +117,7 @@ public class ReportItemController extends BaseController { @Log(title = SysLogConstants.XMLOT_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增试剂维护数据") @PostMapping("/addXmLot") - public Result addXmLot(@RequestBody XmLot xmLot){ + public Result addXmLot(@RequestBody List xmLot){ return reportItemService.addXmLot(xmLot); } @@ -195,4 +195,11 @@ public class ReportItemController extends BaseController { return reportItemService.delXmRefNew(xmRefNew); } + + @ApiOperation("获取试剂厂家") + @GetMapping("/querySjcs") + public Result getSjcs(String yq){ + if(yq == null || yq.equals("")) return new Result("-1","参数不能为空！"); + return reportItemService.getSjcs(yq); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java index aa2040c..fdb72a2 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java @@ -4,6 +4,8 @@ import com.czlis.common.core.domain.entity.lis.*; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; +import java.util.Objects; public interface ReportItemMapper { List query(XmInfoNew xmInfoNew); @@ -47,7 +49,7 @@ public interface ReportItemMapper { void deleteXmFilter(@Param("yq") String yq,@Param("lgph") String lgph); - List getXmLot(); + List getXmLot(XmLot xmLot); void addXmLot(XmLot xmLot); @@ -67,5 +69,9 @@ public interface ReportItemMapper { void addBatch(@Param("xmInfoNewList") List xmInfoNewList); - void delBatch(@Param("xmInfoNewList") List xmInfoNewList); + void delBatch(XmInfoNew xmInfoNew); + + void updateXmLot(XmLot xmLot); + + List> getSjcs(String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java index 70dab39..ef25e5b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -28,7 +28,7 @@ public interface ReportItemService { Result getXmLot(); - Result addXmLot(XmLot xmLot); + Result addXmLot(List xmLot); Result deleteXmLot(String yq, String sjph); @@ -53,4 +53,6 @@ public interface ReportItemService { Result delBatch(List xmInfoNewList); Result delXmRefNew(XmRefNew xmRefNew); + + Result getSjcs(String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java index b5297d1..892463f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java @@ -13,6 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.Objects; @Service @Slf4j @@ -296,13 +298,21 @@ public class ReportItemServiceImpl implements ReportItemService { @Override public Result getXmLot() { - List lotList = reportItemMapper.getXmLot(); + List lotList = reportItemMapper.getXmLot(null); return new Result("0","查询成功！",lotList); } @Override - public Result addXmLot(XmLot xmLot) { - reportItemMapper.addXmLot(xmLot); + public Result addXmLot(List xmLotList) { + for (XmLot xmLot : xmLotList) { + List xmlotList = reportItemMapper.getXmLot(xmLot); + if(xmlotList.size() > 0){ + reportItemMapper.updateXmLot(xmLot); + }else{ + reportItemMapper.addXmLot(xmLot); + } + } + return new Result("0","新增成功！"); } @@ -391,8 +401,10 @@ public class ReportItemServiceImpl implements ReportItemService { @Override public Result delBatch(List xmInfoNewList) { + for (XmInfoNew xmInfoNew : xmInfoNewList) { + reportItemMapper.delBatch(xmInfoNew); + } - reportItemMapper.delBatch(xmInfoNewList); return new Result("0","批量删除数据成功！"); } @@ -402,5 +414,11 @@ public class ReportItemServiceImpl implements ReportItemService { return new Result("0","删除成功！"); } + @Override + public Result getSjcs(String yq) { + List> sjcsList = reportItemMapper.getSjcs(yq); + return new Result("0","获取数据成功！",sjcsList); + } + } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index 5a10186..34bc68b 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -528,10 +528,19 @@ insert into xm_lot( yq,sjph,sjcs,yxq,csff )values( - #{yq},#{sjph},#{yxq},#{csff} + #{yq},#{sjph},#{sjcs},#{yxq},#{csff} ) + + update xm_lot set + sjcs = #{sjcs}, + yxq = #{yxq}, + csff = #{csff}, + sjph = #{sjph} + where yq = #{yq} and sjph = #{sjph} + + delete from xm_lot where yq = #{yq} and sjph = #{sjph} @@ -597,9 +606,10 @@ - delete from xm_info_vs where (yq,xmid) in - - (#{xmInfoNew.yq},#{xmInfoNew.xmid}) - + delete from xm_info_vs where yq = #{yq} and xmid = #{xmid} + +