From 267eaac2202b3cb51237bd66adab1949fe2d607d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 3 Jun 2025 09:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/factoryDailyReport/FactoryDaliyReportFeign.java | 5 +++-- .../api/factoryDailyReport/FactoryDaliyReportQuery.java | 1 + .../api/factoryDailyReport/FactoryDaliyReportVo.java | 2 ++ .../biz/factoryDailyReport/FactoryDaliyReportRest.java | 4 ++-- .../biz/factoryDailyReport/FactoryDaliyReportService.java | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java index 546aeb6099..adfabdac99 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java @@ -18,10 +18,10 @@ import java.util.Map; path = "v1/factoryDailyReport", fallback = FactoryDaliyReportFeignFallback.class) public interface FactoryDaliyReportFeign { - @PostMapping("/pageList") + /* @PostMapping("/pageList") @ResponseBody ResultBean pageList1(@RequestBody PagerQuery pagerQuery); - +*/ @PostMapping("/pageList1") @ResponseBody ResultBean> pageList(@RequestBody PagerQuery pagerQuery); @@ -41,6 +41,7 @@ public interface FactoryDaliyReportFeign { @GetMapping("/list4") @ResponseBody ResultBean list4(@RequestParam("linkSid") String linkSid); + } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportQuery.java index b2b603ea04..d144595faa 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportQuery.java @@ -15,5 +15,6 @@ public class FactoryDaliyReportQuery implements Query { private String orgPath; //jt-查集团，syb-事业部，空字符串 分公司 + @ApiModelProperty("jt-集团、syb-事业部、空字符串分公司") private String type; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java index 98871f4085..003e2a4f3c 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java @@ -42,6 +42,8 @@ public class FactoryDaliyReportVo { @JsonIgnore private String offset_payment; + //仅分公司下返回 + @ApiModelProperty("分公司sid#年份") private String linkSid; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java index 6e33f4e77d..b644ba3883 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java @@ -23,12 +23,12 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign { @Autowired private FactoryDaliyReportService factoryDaliyReportService; - @Override + /* @Override public ResultBean pageList1(PagerQuery pagerQuery) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = factoryDaliyReportService.pageList1(pagerQuery); return rb.success().setData(pv); - } + }*/ @Override public ResultBean> pageList(PagerQuery pagerQuery) { diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java index 5b753fabc0..d3161942fd 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java @@ -87,6 +87,7 @@ public class FactoryDaliyReportService { List orgSidList = Arrays.asList(orgPath.split("/")); String type = query.getType(); String name = ""; + //type=syb 为事业部名称 type=空 为分公司名称 jt为集团 if (StringUtils.isNotBlank(type)) { if ("syb".equals(type)) { // 取事业部（前两级） @@ -97,7 +98,7 @@ public class FactoryDaliyReportService { SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sybSid).getData(); name = sysOrganization.getName(); - reportMap.put("linkSid", sybSid); + reportMap.put("linkSid", sybSid);//跳转品牌所需要的sid/仅 type=syb生效 qw.like("orgPath", orgPathPrefix); } @@ -144,6 +145,7 @@ public class FactoryDaliyReportService { unUploadVo.setFeeUnPaid(factoryDaliyReportVo.getPending_payment()); factoryDaliyReportVo.setUnUpload(unUploadVo); if(StringUtils.isBlank(type)){ + //分公司sid#年份/仅分公司下返回 String orgSid = orgSidList.get(2); factoryDaliyReportVo.setLinkSid(orgSid+"#"+factoryDaliyReportVo.getYear()); }