From c3ac3882d82b6b30ce40fe573062c46b2fccfdb8 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 23 Dec 2025 17:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E9=A1=B9=E7=9B=AE=E5=AF=B9=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/lis/XmReqitemVsReportitem.java | 2 ++ .../controller/dict/XmInfoController.java | 29 +++++++++++++++++++ .../dict/XmReqitemVsReportitemController.java | 13 +++++---- .../dict/XmReqitemVsReportitemMapper.java | 3 ++ .../czlis/liswork/service/XmInfoService.java | 8 +++++ .../service/XmReqitemVsReportitemService.java | 2 ++ .../service/impl/XmInfoServiceImpl.java | 27 +++++++++++++++++ .../impl/XmReqitemVsReportitemImpl.java | 25 +++++++++++++++- .../mapper/XmReqitemVsReportitemMapper.xml | 24 +++++++++------ 9 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java index c174b1e..f0469b5 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java @@ -18,4 +18,6 @@ public class XmReqitemVsReportitem { private String tdh; private String mrz; private String def; + private String xmmc; + private String sl; } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java new file mode 100644 index 0000000..f3d7d31 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java @@ -0,0 +1,29 @@ +package com.czlis.liswork.controller.dict; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; +import com.czlis.liswork.service.XmInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 老的xm_info数据查询 + */ +@Api(tags = "老的xm_info数据查询") +@RestController +@RequestMapping("/oldxminfo") +public class XmInfoController { + + @Autowired + private XmInfoService xmInfoService; + + @ApiOperation("查询数据") + @GetMapping("/query") + public Result query(XmInfo xmInfo) { + return xmInfoService.query(xmInfo); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java index e8efc42..00a4be3 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java @@ -11,10 +11,7 @@ import com.czlis.liswork.service.XmReqitemVsReportitemService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,7 +27,13 @@ public class XmReqitemVsReportitemController extends BaseController { private XmReqitemVsReportitemService xmReqitemVsReportitemService; @ApiOperation("查询收费项目报告项目对照") - @PostMapping("/query") + @GetMapping("/queryList") + public Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem){ + return xmReqitemVsReportitemService.queryList(xmReqitemVsReportitem); + } + + @ApiOperation("查询收费项目报告项目对照") + @GetMapping("/query") public TableDataInfo query(XmReqitemVsReportitem xmReqitemVsReportitem){ startPage(); List xmReqitemVsReportitemList = xmReqitemVsReportitemService.query(xmReqitemVsReportitem); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java index 82cb14d..16b9d67 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java @@ -4,6 +4,8 @@ import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; +import java.util.Objects; public interface XmReqitemVsReportitemMapper { List query(XmReqitemVsReportitem xmReqitemVsReportitem); @@ -11,4 +13,5 @@ public interface XmReqitemVsReportitemMapper { void delete(@Param("sqxmdh") String sqxmdh,@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("tdh") String tdh); void update(XmReqitemVsReportitem xmReqitemVsReportitem); + List> queryList(XmReqitemVsReportitem xmReqitemVsReportitem); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java new file mode 100644 index 0000000..ef029b3 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java @@ -0,0 +1,8 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; + +public interface XmInfoService { + Result query(XmInfo xmInfo); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java b/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java index 99b7a58..bfc9013 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java @@ -10,4 +10,6 @@ public interface XmReqitemVsReportitemService { Result add(XmReqitemVsReportitem xmReqitemVsReportitem); Result delete(String sqxmdh, String yq, String xmdh, String tdh); Result update(XmReqitemVsReportitem xmReqitemVsReportitem); + + Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java new file mode 100644 index 0000000..d492d08 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java @@ -0,0 +1,27 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; +import com.czlis.interfaceCommon.mapper.XmInfoMapper; +import com.czlis.liswork.service.XmInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class XmInfoServiceImpl implements XmInfoService { + + @Autowired + XmInfoMapper xmInfoMapper; + + @Override + public Result query(XmInfo xmInfo) { + if(xmInfo == null) return new Result("-1","入参不能为空"); + if(xmInfo.getYq() == null || xmInfo.getYq().equals("")) return new Result("-1","入参yq不能为空！"); + List xmInfoList = xmInfoMapper.getXmInfoList(xmInfo.getYq()); + return new Result("0","获取数据成功！",xmInfoList); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java index e0e9bd0..4bcf5bb 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java @@ -10,6 +10,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Service @Slf4j @@ -26,7 +29,12 @@ public class XmReqitemVsReportitemImpl implements XmReqitemVsReportitemService { @Transactional(rollbackFor = Exception.class) @Override public Result add(XmReqitemVsReportitem xmReqitemVsReportitem) { - xmReqitemVsReportitemMapper.add(xmReqitemVsReportitem); + List xmReqitemVsReportitemList = xmReqitemVsReportitemMapper.query(xmReqitemVsReportitem); + if(xmReqitemVsReportitemList.size() > 0){ + xmReqitemVsReportitemMapper.update(xmReqitemVsReportitem); + }else { + xmReqitemVsReportitemMapper.add(xmReqitemVsReportitem); + } return new Result("0","添加项目成功！"); } @@ -43,4 +51,19 @@ public class XmReqitemVsReportitemImpl implements XmReqitemVsReportitemService { xmReqitemVsReportitemMapper.update(xmReqitemVsReportitem); return new Result("0","修改项目成功！"); } + + @Override + public Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem) { + log.info("xmReqitemVsReportitem:{}",xmReqitemVsReportitem); + List> xmReqitemVsReportitemList = xmReqitemVsReportitemMapper.queryList(xmReqitemVsReportitem); + if(xmReqitemVsReportitem.getSl() != null ){ + //过滤数据，只看仪器对照收费项目 + if(xmReqitemVsReportitem.getSl().equals("1")){ + List> collect = xmReqitemVsReportitemList.stream().filter(item -> item.get("sl").toString().equals("1")).collect(Collectors.toList()); + return new Result("0","获取数据成功！",collect); + } + } + + return new Result("0","获取数据成功！",xmReqitemVsReportitemList); + } } diff --git a/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml b/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml index ca559cb..afc60d0 100644 --- a/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml +++ b/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml @@ -4,16 +4,17 @@ @@ -57,5 +58,10 @@ and tdh = #{tdh} + +