|
|
|
@ -46,6 +46,7 @@ import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Stream; |
|
|
|
@ -317,7 +318,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
} |
|
|
|
|
|
|
|
public int updateAuditStateBySid(int i, String sid) { |
|
|
|
return baseMapper.updateAuditStateBySid(i,sid); |
|
|
|
return baseMapper.updateAuditStateBySid(i, sid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(String ysSid) { |
|
|
|
@ -350,15 +351,27 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
qw.eq("createBySid", userSid); |
|
|
|
} |
|
|
|
//查询没有认完的车辆sid
|
|
|
|
List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); |
|
|
|
/* List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid); |
|
|
|
stringList.removeAll(Collections.singleton(null)); |
|
|
|
if(!stringList.isEmpty()){ |
|
|
|
qw.notIn("receivablesSid",stringList); |
|
|
|
} |
|
|
|
List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw,params.getName()); |
|
|
|
/*if (collList.isEmpty()) { |
|
|
|
}*/ |
|
|
|
List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw, params.getName()); |
|
|
|
if (collList.isEmpty()) { |
|
|
|
collList = baseMapper.selectPageList(qw, ""); |
|
|
|
for (FinSelectReceivablesDetailedVo record : collList) { |
|
|
|
BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney()); |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney()); |
|
|
|
if(currentMoney.compareTo(BigDecimal.ZERO)<=0){ |
|
|
|
record.setReveivableMoney("0"); |
|
|
|
}else{ |
|
|
|
BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney); |
|
|
|
if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){ |
|
|
|
record.setReveivableMoney("0"); |
|
|
|
}else{ |
|
|
|
record.setReveivableMoney(bigDecimal1.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
record.setSubscribedOf(1); |
|
|
|
String busVinSid = record.getBusVinSid(); |
|
|
|
ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid); |
|
|
|
@ -366,20 +379,20 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
String vinNo = resultBean.getData().getLinkNo(); |
|
|
|
String vinSid = resultBean.getData().getLinkSid(); |
|
|
|
String temporaryNo = resultBean.getData().getTemporaryNo(); |
|
|
|
record.setVin(vinNo); |
|
|
|
record.setVIN(vinNo); |
|
|
|
if (StringUtils.isNotBlank(vinNo)) { |
|
|
|
record.setVin(vinNo.substring(vinNo.length() - 8)); |
|
|
|
record.setVIN(vinNo.substring(vinNo.length() - 8)); |
|
|
|
} else { |
|
|
|
if ("2".equals(record.getPayTypeKey())) { |
|
|
|
record.setVin(temporaryNo.substring(temporaryNo.length() - 2)); |
|
|
|
record.setVIN(temporaryNo.substring(temporaryNo.length() - 2)); |
|
|
|
} else { |
|
|
|
record.setVin(temporaryNo); |
|
|
|
record.setVIN(temporaryNo); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) { |
|
|
|
collList = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); |
|
|
|
collList = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
for (FinSelectReceivablesDetailedVo record : collList) { |
|
|
|
@ -390,28 +403,28 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
String vinNo = resultBean.getData().getLinkNo(); |
|
|
|
String vinSid = resultBean.getData().getLinkSid(); |
|
|
|
String temporaryNo = resultBean.getData().getTemporaryNo(); |
|
|
|
record.setVin(vinNo); |
|
|
|
record.setVIN(vinNo); |
|
|
|
if (StringUtils.isNotBlank(vinNo)) { |
|
|
|
record.setVin(vinNo.substring(vinNo.length() - 8)); |
|
|
|
record.setVIN(vinNo.substring(vinNo.length() - 8)); |
|
|
|
} else { |
|
|
|
if ("2".equals(record.getPayTypeKey())) { |
|
|
|
record.setVin(temporaryNo.substring(temporaryNo.length() - 2)); |
|
|
|
record.setVIN(temporaryNo.substring(temporaryNo.length() - 2)); |
|
|
|
} else { |
|
|
|
record.setVin(temporaryNo); |
|
|
|
record.setVIN(temporaryNo); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) { |
|
|
|
List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); |
|
|
|
List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); |
|
|
|
collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
//将collList根据sid去重
|
|
|
|
collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() |
|
|
|
-> new TreeSet<>(Comparator.comparing(FinSelectReceivablesDetailedVo::getSid))), ArrayList::new)); |
|
|
|
//根据合同编号倒序排序
|
|
|
|
// collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList());
|
|
|
|
collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractNo).reversed()).collect(Collectors.toList()); |
|
|
|
//分页
|
|
|
|
IPage<FinSelectReceivablesDetailedVo> page1 = new Page<>(); |
|
|
|
page1.setRecords(collList); |
|
|
|
|
fanzongzhe
2 years ago