java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.报表bug修复

dev
zhenghaoyu 3 weeks ago
parent
a8a54fa419
commit
390cf35318
3 changed files with 43 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
  2. 5
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java
  3. 1
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDeptIncomingNumVO.java

59
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
Unescape View File

@ -103,7 +103,7 @@
YEAR(lww.document_making_time) timeStr,
</if>
<if test="param.type != null and param.type == 2">
CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr,
CONCAT(YEAR(lww.document_making_time),'-Q',QUARTER(lww.document_making_time)) timeStr,
</if>
<if test="param.type != null and param.type == 3">
CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr,
@ -274,7 +274,7 @@
YEAR(lww.document_making_time) timeStr,
</if>
<if test="param.type != null and param.type == 2">
CONCAT(YEAR(lww.document_making_time),'-',QUARTER(lww.document_making_time)) timeStr,
CONCAT(YEAR(lww.document_making_time),'-Q',QUARTER(lww.document_making_time)) timeStr,
</if>
<if test="param.type != null and param.type == 3">
CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr,
@ -437,8 +437,15 @@
<if test="param.brands == null or param.brands.size() == 0 ">
'全部' brand,
</if>
YEAR(lww.document_making_time) nian,
MONTH(lww.document_making_time) yue,
<if test="param.type != null and param.type == 1">
YEAR(lww.document_making_time) timeStr,
</if>
<if test="param.type != null and param.type == 2">
CONCAT(YEAR(lww.document_making_time),'-Q',QUARTER(lww.document_making_time)) timeStr,
</if>
<if test="param.type != null and param.type == 3">
CONCAT(YEAR(lww.document_making_time),'-',MONTH(lww.document_making_time)) timeStr,
</if>
count(lww.id) waybillNum,
sum(lww.total_count) num,
sum(IFNULL(lww.total_weight,0)) weight,
@ -487,22 +494,34 @@
<if test="param.endTime != null ">
and lww.document_making_time &lt;= #{param.endTime}
</if>
group by YEAR(lww.document_making_time),
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id,
lww.departure_warehouse_name,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id,
lww.destination_warehouse_name,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand,
</if>
MONTH(lww.document_making_time)
group by
<trim suffixOverrides=",">
<if test="param.type != null and param.type == 1">
YEAR(lww.document_making_time),
</if>
<if test="param.type != null and param.type == 2">
YEAR(lww.document_making_time),
QUARTER(lww.document_making_time),
</if>
<if test="param.type != null and param.type == 3">
YEAR(lww.document_making_time),
MONTH(lww.document_making_time),
</if>
<if test="param.businessLines != null and param.businessLines.size() > 0 ">
waw.business_line,
</if>
<if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0 ">
lww.departure_warehouse_id,
lww.departure_warehouse_name,
</if>
<if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
lww.destination_warehouse_id,
lww.destination_warehouse_name,
</if>
<if test="param.brands != null and param.brands.size() > 0 ">
lww.brand,
</if>
</trim>
</select>
<select id="consigineeIncomingPage" resultType="com.logpm.report.vo.ReportDeptIncomingVO">

5
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportIncomingServiceImpl.java
Unescape View File

@ -527,7 +527,7 @@ public class ReportIncomingServiceImpl implements IReportIncomingService {
List<ReportDeptIncomingNumVO> ls = reportIncomingMapper.findIncomingNumNew(reportIncomingDTO);
//把ls转化为以businessLine，brand，departureWarehouseName，destinationWarehouseName为key的map
Map<String, ReportDeptIncomingNumVO> map = ls.stream()
.collect(Collectors.toMap(t-> t.getBusinessLine()+"&&"+t.getBrand()+"&&"+t.getDepartureWarehouseName()+"&&"+t.getDestinationWarehouseName()+"&&"+t.getNian()+"&&"+t.getYue(), reportDeptIncomingNumVO -> reportDeptIncomingNumVO));
.collect(Collectors.toMap(t-> t.getBusinessLine()+"&&"+t.getBrand()+"&&"+t.getDepartureWarehouseName()+"&&"+t.getDestinationWarehouseName()+"&&"+t.getTimeStr(), reportDeptIncomingNumVO -> reportDeptIncomingNumVO));
List<ReportDeptIncomingVO> records = iPage.getRecords();
// String finalTimeStr = timeStr;
@ -538,8 +538,9 @@ public class ReportIncomingServiceImpl implements IReportIncomingService {
String destinationWarehouseName = reportDeptIncomingVO.getDestinationWarehouseName();
String nian = reportDeptIncomingVO.getNian();
String yue = reportDeptIncomingVO.getYue();
String timeStr = reportDeptIncomingVO.getTimeStr();
// reportDeptIncomingVO.setTimeStr(finalTimeStr);
ReportDeptIncomingNumVO reportDeptIncomingNumVO = map.get(businessLine + "&&" + brand + "&&" + departureWarehouseName + "&&" + destinationWarehouseName+"&&"+nian+"&&"+yue);
ReportDeptIncomingNumVO reportDeptIncomingNumVO = map.get(businessLine + "&&" + brand + "&&" + departureWarehouseName + "&&" + destinationWarehouseName+"&&"+timeStr);
if(!Objects.isNull(reportDeptIncomingNumVO)){
reportDeptIncomingVO.setStockNum(reportDeptIncomingNumVO.getStockNum());
reportDeptIncomingVO.setSignNum(reportDeptIncomingNumVO.getSignNum());

1
blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDeptIncomingNumVO.java
Unescape View File

@ -14,6 +14,7 @@ public class ReportDeptIncomingNumVO implements Serializable {
private String consignee;//收货单位
private String nian;//年
private String yue;//月
private String timeStr;//时间
private Integer stockNum;
private Integer signNum;

Write Preview
Loading…
Cancel
Save