Browse Source

台帐

contract
15989082884@163.com 2 years ago
parent
commit
ca92a19cd6
  1. 8
      src/main/java/com/qs/serve/common/model/dto/HeaderOption.java
  2. 2
      src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java
  3. 46
      src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java

8
src/main/java/com/qs/serve/common/model/dto/HeaderOption.java

@ -3,6 +3,8 @@ package com.qs.serve.common.model.dto;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.PageUtil;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @author YenHex * @author YenHex
* @since 2023/5/17 * @since 2023/5/17
@ -14,8 +16,10 @@ public class HeaderOption {
// private String width; // private String width;
// private String prefix; // private String prefix;
// private String suffix; // private String suffix;
// private Boolean isSum; private Boolean isSum;
// private Integer decimalLength; private Integer decimalLength;
private String align;
private List<HeaderOption> children;
public HeaderOption(String name){ public HeaderOption(String name){
this.name = name; this.name = name;

2
src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java

@ -13,7 +13,7 @@ import java.util.Map;
@Data @Data
public class BirReportVo { public class BirReportVo {
private List<Map<String,Object>> itemList; private List<List<Map<String,Object>>> itemList;
private List<HeaderOption> headerList; private List<HeaderOption> headerList;

46
src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java

@ -15,7 +15,9 @@ import com.qs.serve.modules.bir.mapper.BirRoiRateMapper;
import com.qs.serve.modules.bir.service.BirReportAccountBookService; import com.qs.serve.modules.bir.service.BirReportAccountBookService;
import com.qs.serve.modules.bir.service.BirRoiRateService; import com.qs.serve.modules.bir.service.BirRoiRateService;
import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplier;
import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
import com.qs.serve.modules.bms.service.BmsRegionService;
import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo; import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper; import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.common.TbsCenterType;
@ -42,6 +44,7 @@ import java.util.stream.Collectors;
public class BirReportAccountBookServiceImpl implements BirReportAccountBookService { public class BirReportAccountBookServiceImpl implements BirReportAccountBookService {
private final BirReportAccountBookMapper birReportAccountBookMapper; private final BirReportAccountBookMapper birReportAccountBookMapper;
private final BmsRegionService bmsRegionService;
@Override @Override
public BirReportVo getReportAccountBookData(String type){ public BirReportVo getReportAccountBookData(String type){
@ -53,14 +56,51 @@ public class BirReportAccountBookServiceImpl implements BirReportAccountBookServ
birReportAccountBookMapper.getReportHeader(map); birReportAccountBookMapper.getReportHeader(map);
String headerString = map.get("result"); String headerString = map.get("result");
List<HeaderOption> headerOptions = Arrays.stream(headerString.split(",")).map(a->new HeaderOption(a)).collect(Collectors.toList()); List<HeaderOption> headerOptions = Arrays.stream(headerString.split(",")).map(a->{
String temp = a.trim();
if(temp.contains("as")){
temp = a.split("as")[1].trim();
}
return new HeaderOption(temp);
}).collect(Collectors.toList());
vo.setHeaderList(headerOptions);
List<List<Map<String,Object>>> list = new ArrayList<>();
if(type.equals(TbsCenterType.saleRegion.name())){ if(type.equals(TbsCenterType.saleRegion.name())){
vo.setItemList(birReportAccountBookMapper.reportAccountBookRegion()); List<Map<String,Object>> itemList = birReportAccountBookMapper.reportAccountBookRegion();
//
// List<BmsRegionTreeVo> regionList = bmsRegionService.getTree(false);
// List<List<Map<String,Object>>> regionDataList = regionList.stream().map(a->
// itemList.stream().filter(i->i.get("成本中心编码").toString().startsWith(a.getCode())).collect(Collectors.toList())
// ).filter(p->p.size()!=0).collect(Collectors.toList());
//
// headerOptions = headerOptions.stream().map(a->{
// if(a.getName().startsWith("成本中心")){
//
// }else{
//// a.setIsSum(true);
// a.setDecimalLength(2);
// a.setAlign("right");
// }
// return a;
// }).collect(Collectors.toList());
//
// list = regionDataList;
list.add(itemList);
}else if(type.equals(TbsCenterType.bizRegion.name())){
List<Map<String,Object>> itemList = birReportAccountBookMapper.reportAccountBookBizRegion();
list.add(itemList);
}else if(type.equals(TbsCenterType.customer.name())){
List<Map<String,Object>> itemList = birReportAccountBookMapper.reportAccountBookCustomer();
list.add(itemList);
}else if(type.equals(TbsCenterType.center.name())){
List<Map<String,Object>> itemList = birReportAccountBookMapper.reportAccountBookCenter();
list.add(itemList);
} }
vo.setHeaderList(headerOptions);
vo.setItemList(list);
return vo; return vo;
} }
} }

Loading…
Cancel
Save