|
|
@@ -387,13 +387,18 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
|
|
|
@Override
|
|
|
public List<InvSource> getRecivableList(InvSourceQueryVo invSourceQueryVo) {
|
|
|
- String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
- invSourceQueryVo.setSigningTimeStartTime(split[0]);
|
|
|
- invSourceQueryVo.setSigningTimeEndTime(split[1]);
|
|
|
-
|
|
|
- String[] split1 = invSourceQueryVo.getClearingTime().split(",");
|
|
|
- invSourceQueryVo.setClearingTimeStartTime(split1[0]);
|
|
|
- invSourceQueryVo.setClearingTimeEndTime(split1[1]);
|
|
|
+ if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime()))
|
|
|
+ {
|
|
|
+ String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
+ invSourceQueryVo.setSigningTimeStartTime(split[0]);
|
|
|
+ invSourceQueryVo.setSigningTimeEndTime(split[1]);
|
|
|
+ }
|
|
|
+ if(invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime()))
|
|
|
+ {
|
|
|
+ String[] split1 = invSourceQueryVo.getClearingTime().split(",");
|
|
|
+ invSourceQueryVo.setClearingTimeStartTime(split1[0]);
|
|
|
+ invSourceQueryVo.setClearingTimeEndTime(split1[1]);
|
|
|
+ }
|
|
|
|
|
|
List<InvSource> pageData = invSourceMapper.getRecivableList(invSourceQueryVo);
|
|
|
pageData.forEach(x->{
|