root/nd_hh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:处理看板数据为null情况

Browse Source
This commit is contained in:
songxiaopeng
2024-04-24 17:41:15 +08:00
parent de871c3947
commit f4fff048aa
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java
View File

@@ -1,7 +1,10 @@
package org.nl.wms.cockpit.service.dao; package org.nl.wms.cockpit.service.dao;
import cn.hutool.core.util.ObjectUtil;
import jodd.util.StringUtil;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@@ -13,4 +16,20 @@ public class SortingLineRes {
private List<RgSortingLineVo> rgSortingLine; private List<RgSortingLineVo> rgSortingLine;
private String rgPlanQty; private String rgPlanQty;
private String rgRealQty; private String rgRealQty;
public List<SortingLineVo> getSortingLines() {
return ObjectUtil.isEmpty(sortingLines) ? new ArrayList<>() : sortingLines;
}
public List<RgSortingLineVo> getRgSortingLine() {
return ObjectUtil.isEmpty(rgSortingLine) ? new ArrayList<>() : rgSortingLine;
}
public String getRgPlanQty() {
return StringUtil.isEmpty(rgPlanQty) ? "0" : rgPlanQty;
}
public String getRgRealQty() {
return StringUtil.isEmpty(rgRealQty) ? "0" : rgRealQty;
}
} }

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -120,8 +120,10 @@ public class CockpitServiceImpl implements CockpitService {
List<SortingLineVo> sortingLine = cockPitMapper.getSortingLine(); List<SortingLineVo> sortingLine = cockPitMapper.getSortingLine();
List<RgSortingLineVo> rgSortingLine = cockPitMapper.getRgSortingLineVo(); List<RgSortingLineVo> rgSortingLine = cockPitMapper.getRgSortingLineVo();
SortingLineRes sortCount = cockPitMapper.selectRgSortCount(); SortingLineRes sortCount = cockPitMapper.selectRgSortCount();
res.setRgRealQty(sortCount.getRgRealQty()); if (null != sortCount) {
res.setRgPlanQty(sortCount.getRgPlanQty()); res.setRgRealQty(sortCount.getRgRealQty());
res.setRgPlanQty(sortCount.getRgPlanQty());
}
res.setRgSortingLine(rgSortingLine); res.setRgSortingLine(rgSortingLine);
res.setSortingLines(sortingLine); res.setSortingLines(sortingLine);
return res; return res;