Browse Source

返利汇总统计集团、事业部、分公司分页列表

master
dimengzhe 2 weeks ago
parent
commit
3d71373db2
  1. 8
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java
  2. 32
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/SybVo.java
  3. 18
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/YearAllVo.java
  4. 2
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java
  5. 11
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml
  6. 8
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java
  7. 9
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

8
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java

@ -20,14 +20,18 @@ import java.util.Map;
path = "v1/factoryDailyReport",
fallback = FactoryDaliyReportFeignFallback.class)
public interface FactoryDaliyReportFeign {
@PostMapping("pageList1")
@PostMapping("/pageList")
@ResponseBody
ResultBean<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
@PostMapping("pageList")
@PostMapping("/pageList1")
@ResponseBody
ResultBean<Map<String, Object>> pageList(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
@PostMapping("/syb")
@ResponseBody
ResultBean<SybVo> getSybList();
}

32
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/SybVo.java

@ -0,0 +1,32 @@
package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/21
**/
@Data
public class SybVo {
private String title;
private List<YearAllVo> row1;
private List<String> row2;
private List<String> row3;
private List<String> row4;
private List<String> row5;
private List<String> row6;
private List<String> row7;
private List<String> row8;
private List<String> row9;
private List<String> row10;
private List<String> row11;
}

18
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/YearAllVo.java

@ -0,0 +1,18 @@
package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/21
**/
@Data
public class YearAllVo {
private String name;
private String colspan;
private String linkSid;
}

2
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java

@ -19,4 +19,6 @@ public interface FactoryDaliyReportMapper {
List<FactoryDaliyReportVo> selectRecordList(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<FactoryDaliyReportVo> qw);
int selectRecordCount(@Param(Constants.WRAPPER)QueryWrapper<FactoryDaliyReportVo> qw);
List<String> getSybSidList();
}

11
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml

@ -134,4 +134,15 @@
</where>
group by year)a where a.year != '' and a.year is not null
</select>
<select id="getSybSidList" resultType="java.lang.String">
SELECT orgPath FROM (
SELECT orgPath FROM scm_veh_rebate
UNION
SELECT orgPath FROM scm_special_rebate
UNION
SELECT orgPath FROM scm_collection_rebate
) AS combined
ORDER BY orgPath DESC;
</select>
</mapper>

8
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java

@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportFeign;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -38,4 +39,11 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
Map<String,Object> map = factoryDaliyReportService.pageList(pagerQuery);
return rb.success().setData(map);
}
@Override
public ResultBean<SybVo> getSybList() {
return factoryDaliyReportService.getSybList();
}
}

9
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

@ -9,9 +9,11 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportAppPagerQuery;
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.UnUploadVo;
import com.yxt.anrui.reportcenter.config.DecimalUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -158,4 +160,11 @@ public class FactoryDaliyReportService {
reportMap.put("records", recordList);
return reportMap;
}
public ResultBean<SybVo> getSybList() {
ResultBean<SybVo> rb = ResultBean.fireFail();
//先查询有哪些事业部以及事业部下的年份
List<String> orgSidList = factoryDaliyReportMapper.getSybSidList();
return null;
}
}

Loading…
Cancel
Save