From 80263690cd91bd978f20578a97fea632a3468777 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 20:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E6=AC=BE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/controller/SarStandItemsController.java | 2 +- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 3 --- .../controller/SarFileSplitItemsEOController.java | 1 + .../da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java | 2 +- .../standardSplit/service/SarFileSplitItemsEOService.java | 2 ++ .../service/impl/SarFileSplitItemsEOServiceImpl.java | 5 +++++ .../mapper/standardSplit/SarFileSplitItemsEOMapper.xml | 4 ++-- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 80257943..d6df0d61 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -89,7 +89,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ - List rows = ServiceImpl.selectByName(page.getItemsName()); + List rows = ServiceImpl.querySarItemAndInterpretation(page); PageInfo pageInfo = getPageInfo(page.getPager(), rows); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index e52b885e..52bd0a87 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -441,7 +441,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectByName(String itemsName) { - return sarFileSplitItemsEODao.selectByName(itemsName); - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 4b2805de..d605b272 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -85,6 +85,7 @@ public class SarFileSplitItemsEOController extends BaseController> page(SarFileSplitItemsEOPage page) throws Exception { //6-18 端哥已做修改 + sarFileSplitItemsEOService.selectByName(page.getItemsName()); Map map = sarFileSplitItemsEOService.getByPage(page); page.getPager().setRowCount((Integer) map.get("count")); return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 64be1000..5fd4821a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -64,5 +64,5 @@ public interface SarFileSplitItemsEODao extends BaseMapper @Select("select ID from sar_file_split_info where ID=#{infoId}") String selectByInfoId(String infoId); - List selectByName(String itemsName); + void selectByName(String itemsName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java index be30efc7..aa3a9f2d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java @@ -48,4 +48,6 @@ public interface SarFileSplitItemsEOService { void combineItems(String ids); List queryByList2(SarFileSplitItemsEOPage page); + + void selectByName(String itemsName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 927607e5..a135ef0f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -867,6 +867,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic return sarFileSplitItemsEODao.queryByList2(page); } + @Override + public void selectByName(String itemsName) { + sarFileSplitItemsEODao.selectByName(itemsName); + } + public void changeInfos (StringBuilder resultContent,String reaultItemId,List delMenuIds,List delIds,List resultValList) { //1.更新最终合并的条款内容 if (resultContent != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 16fbf7ba..576a602e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -630,8 +630,8 @@ ${pager.orderCondition} - + select ITEMS_NAME from sar_file_split_items where ITEMS_NAME like "%" #{itemsName} "%";