|
|
@@ -69,8 +69,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
List<Map<String,Object >> list=new ArrayList<>();
|
|
|
TaskDetails taskDetails=null;
|
|
|
//获取项目服务年份算出平均值
|
|
|
- List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
|
|
|
+ List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
int yearSum=1;
|
|
|
for (TOrderTaskBo e : collect) {
|
|
|
if (e.getYearSum()>yearSum){
|
|
|
@@ -83,7 +84,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
//如果是会员
|
|
|
TOrderTaskBo thisTask = null;
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ for (TOrderTaskBo e : collect2) {
|
|
|
if (e.getId().equals(id)){
|
|
|
thisTask=e;
|
|
|
break;
|
|
|
@@ -94,7 +95,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
serviceYear=serviceYear.replace("(赠)", "");
|
|
|
}
|
|
|
Integer tid=null;
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ for (TOrderTaskBo e : collect2) {
|
|
|
e.getServiceLife();
|
|
|
if (e.getServiceYear().equals(serviceYear)){
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
@@ -142,7 +143,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
//如果是会员
|
|
|
TOrderTaskBo thisTask = null;
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ for (TOrderTaskBo e : collect2) {
|
|
|
if (e.getId().equals(id)){
|
|
|
thisTask=e;
|
|
|
break;
|
|
|
@@ -153,7 +154,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
serviceYear=serviceYear.replace("(赠)", "");
|
|
|
}
|
|
|
Integer tid=null;
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ for (TOrderTaskBo e : collect2) {
|
|
|
if (e.getServiceYear().equals(serviceYear)){
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
map.put("serviceYear", e.getServiceYear());
|
|
|
@@ -166,8 +167,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
res.setUserName(mid.getBuyerName());
|
|
|
res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
res.setContractNo(tOrderNew.getContractNo());
|
|
|
@@ -442,5 +441,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Object deleteTaskFeature(Integer id) {
|
|
|
+ return taskFeatureMapper.deleteById(id);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|