|
@@ -2246,7 +2246,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
actualDuration=actualDuration.add(BigDecimal.valueOf(in.getDuration()));
|
|
actualDuration=actualDuration.add(BigDecimal.valueOf(in.getDuration()));
|
|
|
frequency++;
|
|
frequency++;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
for (PublicRelease e : list) {
|
|
for (PublicRelease e : list) {
|
|
|
//新增直接计算
|
|
//新增直接计算
|
|
|
if (in.getId()==null){
|
|
if (in.getId()==null){
|
|
@@ -2317,7 +2316,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
useOyd = yearMaxDurationList.get(i);
|
|
useOyd = yearMaxDurationList.get(i);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
data.setDurationMax(useOyd.getMaxDuration());
|
|
data.setDurationMax(useOyd.getMaxDuration());
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
@@ -2371,7 +2369,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
map.put("code",true);
|
|
map.put("code",true);
|
|
|
map.put("data",null);
|
|
map.put("data",null);
|
|
|
}else {
|
|
}else {
|
|
|
-
|
|
|
|
|
if (actualDuration.compareTo(data.getDurationMax())<1){
|
|
if (actualDuration.compareTo(data.getDurationMax())<1){
|
|
|
map.put("code",true);
|
|
map.put("code",true);
|
|
|
map.put("data",null);
|
|
map.put("data",null);
|
|
@@ -2380,11 +2377,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
map.put("data",data);
|
|
map.put("data",data);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
return map;
|
|
return map;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
@Override
|
|
@Override
|
|
|
public Map checkOrderNoDuration( InputPublicRelease in){
|
|
public Map checkOrderNoDuration( InputPublicRelease in){
|