From e35fd3a93d076201bab10c639e3be518a4ddc48b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 10:07:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- .../service/impl/SarStandardsInfoServiceImpl.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 4174ac54..c9c2c199 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4648,7 +4648,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page, "0"); - if(sarlist.isEmpty()){ - page.setStandName(page.getStandNumber()); - page.setStandNumber(null); - rowCount = dao.getSarStandardsInfoCount(page); - page.getPager().setRowCount(rowCount); - sarlist = dao.getSarStandardsInfoPage(page, "0"); - } attrInfoCollect(sarlist); return sarlist; } From c649f1f208f4be2c06b32473307787c9de59a84d Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 11:39:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=86=E5=88=86=20=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 44 ++++++++++++++ .../service/ISarStandardsInfoService.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 60 +++++++++++++++++++ 3 files changed, 106 insertions(+) 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 3b5a5454..4d5e6efc 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 @@ -139,6 +139,50 @@ public class SarStandardsInfoController extends BaseController return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/getSarStandardsInfoSplitPage") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> getSarStandardsInfoSplitPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + //不改传参强行置换 +// searchList.forEach(sarAdvanceSearchVO -> { +// if ("TXLB".equals(sarAdvanceSearchVO.getField())){ +// sarAdvanceSearchVO.setField("STAND_SYSTEM"); +// } +// }); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.getSarStandardsInfoSplitPage(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPageByWk1") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") 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 c7b725b6..219c3856 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 @@ -78,4 +78,6 @@ public interface ISarStandardsInfoService extends IService { List listQuery2(SarStandardsInfoEOPage page); ResponseMessage fileNameTranslation(); + + List getSarStandardsInfoSplitPage(SarStandardsInfoEOPage page); } 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 6b67dcd8..88613a8e 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 @@ -87,6 +87,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.SneakyThrows; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -3781,5 +3782,64 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoSplitPage(SarStandardsInfoEOPage page){ + //查询当前登录人角色拥有权限的菜单 + if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) { + String treeType = page.getTreeType(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID", page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if (children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)) { +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } else if (!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } else if (page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())) { +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iSarMenuStandardService.getChildMenuList(page.getSarMsMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page, "0"); + if(sarlist.isEmpty()){ + page.setStandName(page.getStandNumber()); + page.setStandNumber(null); + rowCount = dao.getSarStandardsInfoCount(page); + page.getPager().setRowCount(rowCount); + sarlist = dao.getSarStandardsInfoPage(page, "0"); + } + attrInfoCollect(sarlist); + return sarlist; + } + } From 6c1801d71f0deb0580cdb4011487a43e61c444ff Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 16 May 2023 13:50:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E7=9A=84?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 3778955d..45d38e8c 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -651,6 +651,6 @@ From b418feda13aadfec886bc7d4bccf53f8b450b671 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 15:05:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=B5=B7=E8=8D=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java index aedda55a..8754f049 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java @@ -37,10 +37,10 @@ public class importExcelDTO { private String wgLeaderName; - @Excel(name = "工作组组长" , orderNum = "6", width = 20.0) + @Excel(name = "技术委员会评审负责人" , orderNum = "6", width = 20.0) private String wgLeader; - @Excel(name = "计划初稿完成日期" , orderNum = "7", width = 20.0) + @Excel(name = "计划标准初稿完成日期" , orderNum = "7", width = 20.0) private String draftTime; @Excel(name = "计划标准发布时间", orderNum = "8", width = 18.0) From 4a6794ec9fc73260fd6f830e7a8d9e5bbee64286 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 16 May 2023 17:37:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE=E5=BA=93=20GTM+8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=97=B6=E9=97=B4=E4=B8=BA=E4=B8=AD?= =?UTF-8?q?=E5=9B=BD=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 7e91731a..c2495387 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username = root spring.datasource.password = hzwlsoft.com