From 280ab37eaae62b5a1ee0fab3d71b76596cacc8a0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 31 Oct 2022 09:40:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=90=8C=E6=AD=A5=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=BA=93=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=A7=92=E8=89=B2=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsCollectManifestEOController.java | 3 +-- .../collect/service/IParamsCollectManifestEOService.java | 2 +- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index b9da4fa4e..349d8ced7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -56,9 +56,8 @@ public class ParamsCollectManifestEOController extends JeroController>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, @RequestParam(name = "flag") String flag, - @RequestParam(name = "userType", required = false) String userType, @RequestParam(name = "cut") String cut) { - List> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, userType, cut); + List> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 16249bc07..8904cd11c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -83,7 +83,7 @@ public interface IParamsCollectManifestEOService extends IService> getHeader(String paramsManifestId, String flag, String userType, String cut); + List> getHeader(String paramsManifestId, String flag, String cut); /** * 提交 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 34349bfc1..c33947e1c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -749,7 +749,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> getHeader(String paramsManifestId, String flag, String userType, String cut) { + public List> getHeader(String paramsManifestId, String flag, String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7 if (fieldList.size() != 0) { //过滤列表字段(is_show_list-->列表是否显示0否 1是) @@ -772,10 +772,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); String dbFieldName = onlCgformField.getDbFieldName(); - if ("report_time".equals(dbFieldName) - && (CollectManifestUserTypeEnum.SDT.getValue().equals(userType) || CollectManifestUserTypeEnum.DRE.getValue().equals(userType))) { - continue; - } if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { map.put("click5", true); if("nio_number".equals(dbFieldName)) { From b0dee96efa1bff6273edba1bced03dab99839896 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 31 Oct 2022 10:06:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=90=8C=E6=AD=A5=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=BA=93=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=A7=92=E8=89=B2=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 0f1cd2343..0ee777753 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -639,8 +639,7 @@ } let params = { paramsManifestId: paramsManifestid, - flag: '7', - userType: userType + flag: '7' } getAction(url, params).then((res) => { if (res.success) {