|
|
@@ -15,10 +15,7 @@ import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.time.LocalDate;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 项目申报详情(TaskDetails)表服务实现类
|
|
|
@@ -54,11 +51,24 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Object getByTid(Integer id) {
|
|
|
- TaskDetails taskDetails = queryById(id);
|
|
|
- TaskDetailsBo res = new TaskDetailsBo();
|
|
|
- BeanUtils.copyProperties(taskDetails, res);
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
+ TaskDetails taskDetails=new TaskDetails();
|
|
|
+ //如果是会员
|
|
|
+ if (mid.getProjectType()==1){
|
|
|
+ List<TOrderTaskBo> list =new ArrayList<>();
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ //
|
|
|
+ if (e.getcSort()==6){
|
|
|
+ taskDetails = queryById(id);
|
|
|
+ if (taskDetails!=null) break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ TaskDetailsBo res = new TaskDetailsBo();
|
|
|
+ BeanUtils.copyProperties(taskDetails, res);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
String lvl=null;
|
|
|
if (totalAmount.compareTo(new BigDecimal("3"))<0){
|
|
|
@@ -72,10 +82,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setContractNo(tOrderNew.getContractNo());
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setMemberLvl(lvl);
|
|
|
- List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
- res.setTaskList(tOrderTaskBos);
|
|
|
-
|
|
|
|
|
|
+ res.setTaskList(tOrderTaskBos);
|
|
|
return res;
|
|
|
}
|
|
|
|