From d02b73e2dd3a9d839a87e1d373bc826a5b95d390 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 27 Oct 2021 13:39:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=E5=92=8C=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=20=E5=81=9A=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=A0=87=E5=BF=97=E4=BD=8D=E7=9A=84=E5=8C=BA=E5=88=86?= =?UTF-8?q?=20=E7=9B=AE=E7=9A=84=E6=98=AF=E4=B8=BA=E4=BA=86=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E6=A0=87=E5=87=86=E5=BA=93=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandItemsServiceImpl.java | 2 +- .../SarStandardsInfoController.java | 4 +- .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 8 +++- .../SarLawsAttrDetailedListMapper.xml | 41 ++++++++++++------- 5 files changed, 37 insertions(+), 20 deletions(-) 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 4cc9288f..fe2fab56 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 @@ -155,7 +155,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; try { - pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page).getData().getList(); + pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page,"1").getData().getList(); } catch (Exception e) { e.printStackTrace(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index f465caf7..33caf3c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -91,7 +91,7 @@ public class SarStandardsInfoController extends BaseController @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPage") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") - public ResponseMessage> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { + public ResponseMessage> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { int isNull = -1; if (null != page.getNowOrderBy()) { switch (page.getNowOrderBy()) { @@ -179,7 +179,7 @@ public class SarStandardsInfoController extends BaseController if(page.getUserId() == null || page.getUserId().equals("")){ page.setUserId(LoginUserUtil.getUserId()); } - List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); + List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page,mark); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 1878823f..b95e4e77 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -19,7 +19,7 @@ public interface ISarStandardsInfoService extends IService { // void reverseQueryStand(List ids, String standName,String type); - List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception; void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 4b065fee..72ba2d21 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -284,7 +284,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl */ - public List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { + public List getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception { //查询当前登录人角色拥有权限的菜单 if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ QueryWrapper qw = new QueryWrapper<>(); @@ -307,7 +307,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page); - attrInfoCollect(sarlist); + if ("0".equals(mark)) { + attrInfoCollect(sarlist); + }else { + attrInfo(sarlist); + } return sarlist; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 007ef002..0984ff19 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -159,20 +159,27 @@ left join sar_stand_items ssi on ssi.stand_id = a.id + and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) - and + - ssi.FILE_TYPE = #{fileType} and + and + ssi.FILE_TYPE = #{fileType} - a.STAND_TYPE = #{standType} and + and + a.STAND_TYPE = #{standType} + + + + and + a.ID IN + + #{item} + - a.ID IN - - #{item} - UNION SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ, @@ -182,21 +189,27 @@ a.ID = b.STAND_ID left join sar_stand_items ssi on ssi.stand_id = a.id + 1=1 + and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) - and - ssi.FILE_TYPE = #{fileType} and + and + ssi.FILE_TYPE = #{fileType} - a.STAND_TYPE = #{standType} and + and + a.STAND_TYPE = #{standType} + + + and + a.ID IN + + #{item} + - a.ID IN - - #{item} -