From 8c72debb051386dc1adad58fe8bd0d1b10388c71 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 22 Dec 2021 11:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=92=8C=E6=97=A5=E5=8E=86=E4=BF=AE=E6=94=B9=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SapMeetingController.java | 6 +++ .../SarStandProjectLibraryServiceImpl.java | 18 ++----- .../controller/SarStandFileEOController.java | 2 + .../standardSplit/dao/SarStandFileEODao.java | 2 + .../entity/SarStandFileEOPage.java | 3 ++ .../service/SarStandFileEOService.java | 2 + .../impl/SarStandFileEOServiceImpl.java | 5 ++ .../standardSplit/SarStandFileEOMapper.xml | 50 +++++++++++++++++++ 8 files changed, 75 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java index 7ec0369e..da312a7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java @@ -66,4 +66,10 @@ public class SapMeetingController extends BaseController { public int addMeeting(@RequestBody SapMeeting sapMeeting){ return sapMeetingService.addMeeting(sapMeeting); } + + @ApiOperation(value = "修改会议") + @PostMapping("/updateMeeting") + public boolean updateMeeting(@RequestBody SapMeeting sapMeeting){ + return sapMeetingService.updateById(sapMeeting); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 36142a40..bed9d1ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -419,13 +419,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList1 = SarStandardsInfoDao.selectList(wrapper1); QueryWrapper wrapper2 = new QueryWrapper<>(); @@ -516,24 +512,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + Integer count = sarStandFileEOService.getStandFileListByPageCount(page); + page.getPager().setRowCount(count); for (SarStandFileEO one:rows) { one.setAttId(one.getAttId1()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java index 7bdbbe20..6e33be7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java @@ -32,6 +32,8 @@ public interface SarStandFileEODao extends BaseMapper { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + int queryStandFileListByCount(SarStandFileEOPage stand); List queryByPage(SarStandFileEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java index 02332e62..96d10cca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_FILE SarStandFileEOPage
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandFileEOPage extends BasePage { private String modifyTime; @@ -36,6 +38,7 @@ public class SarStandFileEOPage extends BasePage { private String standName; private String fileType; private String standFileClassify; + private int rowCount; public String getModifyTime() { return this.modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 78c760dc..7c6f42e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -9,6 +9,8 @@ public interface SarStandFileEOService { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + List queryByPage(SarStandFileEOPage page); List queryByList(SarStandFileEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 4214ede6..cac6a18f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -37,6 +37,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEODao.getStandFileListByPage(stand); } + @Override + public Integer getStandFileListByPageCount(SarStandFileEOPage stand){ + return sarStandFileEODao.getStandFileListByPageCount(stand); + } + @Override public List queryByPage(SarStandFileEOPage page){ return sarStandFileEODao.queryByPage(page); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index c36b52f1..ea868ac2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -312,6 +312,56 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + +