|
@@ -1501,16 +1501,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
|
|
TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
|
|
|
BigDecimal count = BigDecimal.ZERO;
|
|
BigDecimal count = BigDecimal.ZERO;
|
|
|
count=count.add(BigDecimal.valueOf(in.getDuration()));
|
|
count=count.add(BigDecimal.valueOf(in.getDuration()));
|
|
|
|
|
+ List<String> peopleList = new ArrayList<>();
|
|
|
|
|
+ int timesCount=0;
|
|
|
for (PublicRelease e : list) {
|
|
for (PublicRelease e : list) {
|
|
|
if (e.getDuration()!=null){
|
|
if (e.getDuration()!=null){
|
|
|
count=count.add(BigDecimal.valueOf(e.getDuration()));
|
|
count=count.add(BigDecimal.valueOf(e.getDuration()));
|
|
|
|
|
+ if (!peopleList.contains(e.getAid())){
|
|
|
|
|
+ peopleList.add(e.getAid());
|
|
|
|
|
+ }
|
|
|
|
|
+ timesCount++;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
Map map=new HashMap();
|
|
Map map=new HashMap();
|
|
|
CheckOrderNoOut data= new CheckOrderNoOut();
|
|
CheckOrderNoOut data= new CheckOrderNoOut();
|
|
|
|
|
+ data.setTimesCount(timesCount);
|
|
|
|
|
+ data.setPeopleCount(peopleList.size());
|
|
|
data.setUserName(t.getUserName());
|
|
data.setUserName(t.getUserName());
|
|
|
data.setContractNo(t.getContractNo());
|
|
data.setContractNo(t.getContractNo());
|
|
|
data.setAdminName(t.getSalesmanName());
|
|
data.setAdminName(t.getSalesmanName());
|
|
|
|
|
+ data.setDurationCount(count);
|
|
|
// 0=0-1 1=1-3 2=3-5 3=5-10 4=10以上
|
|
// 0=0-1 1=1-3 2=3-5 3=5-10 4=10以上
|
|
|
if (t.getTotalAmount().compareTo(BigDecimal.valueOf(1)) < 0) {
|
|
if (t.getTotalAmount().compareTo(BigDecimal.valueOf(1)) < 0) {
|
|
|
data.setAmountType(0);
|
|
data.setAmountType(0);
|