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 adfabdac99..65a75e15a0 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 @@ -42,6 +42,14 @@ public interface FactoryDaliyReportFeign { @ResponseBody ResultBean list4(@RequestParam("linkSid") String linkSid); + + + //--------------------------PC接口 + //集团跳转事业部 + + + + } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsDetailVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsDetailVo.java index 9b129d071b..e9f451d051 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsDetailVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsDetailVo.java @@ -27,4 +27,6 @@ public class FgsDetailVo { private List row9; private List row10; private List row11; + //row1的所有colspan数量相加 + private String colTotal; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java index 2821e4909c..968e0729d8 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java @@ -35,4 +35,10 @@ public interface FactoryDaliyReportMapper { List getRow2(String divisionSid); List getFgsList(String divisionSid); + + List getFsg(@Param("fgsSid") String fgsSid, @Param("year") String year); + + List getFsg2(@Param("fgsSid") String fgsSid, @Param("year") String year); + + List getBrandNameList2(@Param("fgsSid") String fgsSid, @Param("year") String year); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml index 29d74b3053..236b2da3b2 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml @@ -611,4 +611,169 @@ ORDER BY a.division_name desc, a.year DESC; + + + + + + \ No newline at end of file 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 d3161942fd..fd9d33060c 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 @@ -334,7 +334,12 @@ public class FactoryDaliyReportService { public ResultBean list4(String linkSid) { ResultBean rb = ResultBean.fireFail(); FgsDetailVo fgsDetailVo = new FgsDetailVo(); - + List stringList = Arrays.asList(linkSid.split("#")); + String fgsSid = stringList.get(0); + String year = stringList.get(1); + List yearAllVos = factoryDaliyReportMapper.getFsg(fgsSid,year); + List brandList = factoryDaliyReportMapper.getBrandNameList2(fgsSid,year); + List factoryDaliyReportVoList = factoryDaliyReportMapper.getFsg2(fgsSid,year); return null; } }