|
|
@@ -129,9 +129,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
bo.setServiceYear(serviceYear);
|
|
|
bo.setMemberStatus(mid.getProjectType());
|
|
|
bo.setTaskList(list);
|
|
|
- BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=getOrderLvl(totalAmount);
|
|
|
- bo.setMemberLvl(lvl);
|
|
|
+ if (bo.getMemberStatus()==null){
|
|
|
+ BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
+ Integer lvl=getOrderLvl(totalAmount);
|
|
|
+ bo.setMemberLvl(lvl);
|
|
|
+ }
|
|
|
bo.setFeatureList(taskFeatureMapper.selectByTdId(bo.getId()));
|
|
|
}
|
|
|
|
|
|
@@ -149,14 +151,14 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return serviceYear2;
|
|
|
}
|
|
|
|
|
|
- private String getOrderLvl(BigDecimal totalAmount) {
|
|
|
- String lvl=null;
|
|
|
+ private Integer getOrderLvl(BigDecimal totalAmount) {
|
|
|
+ Integer lvl=null;
|
|
|
if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
- lvl ="A";
|
|
|
+ lvl =1;
|
|
|
}else if (totalAmount.compareTo(new BigDecimal("8"))<1){
|
|
|
- lvl ="AA";
|
|
|
+ lvl =2;
|
|
|
}else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
- lvl ="AAA";
|
|
|
+ lvl =3;
|
|
|
}
|
|
|
return lvl;
|
|
|
}
|
|
|
@@ -319,8 +321,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
}
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=getOrderLvl(totalAmount);
|
|
|
-// bo.setMemberLvl(lvl);
|
|
|
+ Integer lvl=getOrderLvl(totalAmount);
|
|
|
+ taskDetails.setMemberLvl(lvl);
|
|
|
}
|
|
|
|
|
|
private BigDecimal getBigDecimal(BigDecimal rdSalesAmount, BigDecimal rdBudget, TaskDetails taskDetails) {
|
|
|
@@ -462,8 +464,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setTaskList(list);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
- String lvl=getOrderLvl(totalAmount);
|
|
|
- res.setMemberLvl(lvl);
|
|
|
+ if (res.getMemberLvl()==null){
|
|
|
+ Integer lvl=getOrderLvl(totalAmount);
|
|
|
+ res.setMemberLvl(lvl);
|
|
|
+ }
|
|
|
res.setTaskList(list);
|
|
|
res.setFeatureList(taskFeatureLogMapper.selectByTdlid(id));
|
|
|
return res;
|