|
|
@@ -91,21 +91,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- String serviceYear = thisTask.getServiceYear();
|
|
|
- if (serviceYear.contains("(赠)")){
|
|
|
- serviceYear=serviceYear.replace("(赠)", "");
|
|
|
- }
|
|
|
+ String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
Integer tid=null;
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
//添加判定去掉赠字比对
|
|
|
- String serviceYear2 = null;
|
|
|
- if (StringUtils.isEmpty(e.getServiceYear())){
|
|
|
- serviceYear2 = "";
|
|
|
- }else{
|
|
|
- if (e.getServiceYear().contains("(赠)")){
|
|
|
- serviceYear2=e.getServiceYear().replace("(赠)", "");
|
|
|
- }
|
|
|
- }
|
|
|
+ String serviceYear2 =getServiceYer(e.getServiceYear());
|
|
|
if (serviceYear2.contains("(赠)")){
|
|
|
serviceYear2=serviceYear2.replace("(赠)", "");
|
|
|
}
|
|
|
@@ -125,7 +115,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
list.add(map);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
}
|
|
|
@@ -135,16 +124,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setTaskList(list);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=null;
|
|
|
- if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
- lvl="A";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))<1){
|
|
|
- lvl="AA";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
- lvl="AAA";
|
|
|
- }
|
|
|
+ String lvl=getOrderLvl(totalAmount);
|
|
|
res.setMemberLvl(lvl);
|
|
|
- res.setTaskList(list);
|
|
|
res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
if (tid==null&&taskDetails!=null){
|
|
|
tid=taskDetails.getTid();
|
|
|
@@ -163,29 +144,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- String serviceYear = thisTask.getServiceYear();
|
|
|
- if (serviceYear.contains("(赠)")){
|
|
|
- serviceYear=serviceYear.replace("(赠)", "");
|
|
|
- }
|
|
|
+ String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
Integer tid=null;
|
|
|
- for (TOrderTaskBo e : collect2) {
|
|
|
- //添加判定去掉赠字比对
|
|
|
- String serviceYear2 = null;
|
|
|
- if (StringUtils.isEmpty(e.getServiceYear())){
|
|
|
- serviceYear2 = "";
|
|
|
- }else{
|
|
|
- if (e.getServiceYear().contains("(赠)")){
|
|
|
- serviceYear2=e.getServiceYear().replace("(赠)", "");
|
|
|
- }
|
|
|
- }
|
|
|
- if (serviceYear.equals(serviceYear2)){
|
|
|
- Map<String,Object> map=new HashMap<>();
|
|
|
- map.put("serviceYear", e.getServiceYear());
|
|
|
- map.put("taskName", e.getCommodityName());
|
|
|
- map.put("id",e.getId());
|
|
|
- list.add(map);
|
|
|
- }
|
|
|
- }
|
|
|
+ list=addOrderList(collect2,serviceYear);
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
}
|
|
|
@@ -195,14 +156,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setTaskList(list);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=null;
|
|
|
- if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
- lvl="A";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))<1){
|
|
|
- lvl="AA";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
- lvl="AAA";
|
|
|
- }
|
|
|
+ String lvl=getOrderLvl(totalAmount);
|
|
|
res.setMemberLvl(lvl);
|
|
|
res.setTaskList(list);
|
|
|
if (taskDetails!=null&&taskDetails.getTid()!=null){
|
|
|
@@ -212,7 +166,29 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ private String getServiceYer(String serviceYear) {
|
|
|
+ String serviceYear2=null;
|
|
|
+ if (StringUtils.isEmpty(serviceYear)){
|
|
|
+ serviceYear2 = "";
|
|
|
+ }else{
|
|
|
+ if (serviceYear.contains("(赠)")){
|
|
|
+ serviceYear2 = serviceYear.replace("(赠)", "");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return serviceYear2;
|
|
|
+ }
|
|
|
|
|
|
+ private String getOrderLvl(BigDecimal totalAmount) {
|
|
|
+ String lvl=null;
|
|
|
+ if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
+ lvl ="A";
|
|
|
+ }else if (totalAmount.compareTo(new BigDecimal("8"))<1){
|
|
|
+ lvl ="AA";
|
|
|
+ }else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
+ lvl ="AAA";
|
|
|
+ }
|
|
|
+ return lvl;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|
|
|
@@ -449,15 +425,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
if (serviceYear.contains("(赠)")){
|
|
|
serviceYear=serviceYear.replace("(赠)", "");
|
|
|
}
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
- if (e.getServiceYear().equals(serviceYear)){
|
|
|
- Map<String,Object> map=new HashMap<>();
|
|
|
- map.put("serviceYear", e.getServiceYear());
|
|
|
- map.put("taskName", e.getCommodityName());
|
|
|
- map.put("id",e.getId());
|
|
|
- list.add(map);
|
|
|
- }
|
|
|
- }
|
|
|
+ list=addOrderList(tOrderTaskBos, serviceYear);
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties(log, res);
|
|
|
}
|
|
|
@@ -467,20 +435,27 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setTaskList(list);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
- String lvl=null;
|
|
|
- if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
- lvl="A";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))<1){
|
|
|
- lvl="AA";
|
|
|
- }else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
- lvl="AAA";
|
|
|
- }
|
|
|
+ String lvl=getOrderLvl(totalAmount);
|
|
|
res.setMemberLvl(lvl);
|
|
|
res.setTaskList(list);
|
|
|
res.setFeatureList(taskFeatureLogMapper.selectByTdlid(id));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ private List<Map<String, Object>> addOrderList(List<TOrderTaskBo> tOrderTaskBos, String serviceYear) {
|
|
|
+ List<Map<String, Object>> list =new ArrayList<>();
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ if (e.getServiceYear().equals(serviceYear)){
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ map.put("serviceYear", e.getServiceYear());
|
|
|
+ map.put("taskName", e.getCommodityName());
|
|
|
+ map.put("id",e.getId());
|
|
|
+ list.add(map);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public Object deleteTaskFeature(Integer id) {
|
|
|
return taskFeatureMapper.deleteById(id);
|