From a748a14e2a7290600401584063b672d6e414caba Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 18 Aug 2022 15:06:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsReportDetailEOController.java | 21 +++++++------ .../cert/report/vo/ParamsReportDetailVO.java | 2 ++ .../LawsMonthlyReportManageEOServiceImpl.java | 2 ++ .../enums/ModuleTypeFlagEnum.java | 30 +++++++++++++++++++ 4 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 0a0b444a8..ffda2322b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -79,24 +80,26 @@ public class ParamsReportDetailEOController extends JeroController queryList(ParamsReportDetailEO paramsReportDetailEO, + public Result queryList(ParamsReportDetailVO paramsReportDetailVO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, @RequestParam(name = "cut") String cut) { - if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { - paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getNioNumber())) { + paramsReportDetailVO.setNioNumber(paramsReportDetailVO.getNioNumber().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getParamsName())) { - paramsReportDetailEO.setParamsName(paramsReportDetailEO.getParamsName().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getParamsName())) { + paramsReportDetailVO.setParamsName(paramsReportDetailVO.getParamsName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getSdt())) { - paramsReportDetailEO.setSdt(paramsReportDetailEO.getSdt().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getSdtName())) { + paramsReportDetailVO.setSdt(paramsReportDetailVO.getSdtName().replace("%","\\%")); } - if (StringUtils.isNotEmpty(paramsReportDetailEO.getDre())) { - paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%")); + if (StringUtils.isNotEmpty(paramsReportDetailVO.getDreName())) { + paramsReportDetailVO.setDre(paramsReportDetailVO.getDreName().replace("%","\\%")); } IPage page = new Page(pageNo, pageSize); + ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO(); + BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO); IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java index d93101f2b..ae6b8e521 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -25,10 +25,12 @@ public class ParamsReportDetailVO { /**工程接口人*/ @ApiModelProperty(value = "工程接口人") private String sdt; + private String sdtName; // 用于搜索条件 /**填写人*/ @ApiModelProperty(value = "填写人") private String dre; + private String dreName; // 用于搜索条件 @ApiModelProperty(value = "参数清单id") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 2665e9642..e6c1db550 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -19,6 +19,7 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.util.StringUtils; import org.apache.shiro.SecurityUtils; @@ -249,6 +250,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Thu, 18 Aug 2022 15:16:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/whole.vue | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 12fe07c90..e8bd0c041 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -231,15 +231,20 @@ } }, titleClick(item) { - let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', - query: { - id: item.id.slice(0, 32), - title: item.title, - serial_number: item.serial_number - } - }) - window.open(newUrl.href, '_blank') + console.log(item) + if (item.module_type_flag == 'FGYB') { + this.monthlyReportClick(item) + } else { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.id.slice(0, 32), + title: item.title, + serial_number: item.serial_number + } + }) + window.open(newUrl.href, '_blank') + } } } }