|
|
@@ -60,16 +60,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public TaskDetailsBo getByTid(Integer id) {
|
|
|
+ public TaskDetailsBo upshByTid(Integer id) {
|
|
|
TaskDetailsBo res = new TaskDetailsBo();
|
|
|
- TOrderTask tOrderTask = tOrderTaskMapper.selectById(id);
|
|
|
+ TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.queryById(id);
|
|
|
+ TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
+ List<Map<String,Object >> list=new ArrayList<>();
|
|
|
TaskDetails taskDetails=null;
|
|
|
if (tOrderTask.getProgressTid()==null){
|
|
|
taskDetails=taskDetailsMapper.selectByTid(id);
|
|
|
//首先直接查找,找不到的情况下找订单
|
|
|
- TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
- TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
- List<Map<String,Object >> list=new ArrayList<>();
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
//如果是会员
|
|
|
TOrderTaskBo thisTask = null;
|
|
|
@@ -118,9 +118,60 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setMemberLvl(lvl);
|
|
|
res.setTaskList(list);
|
|
|
res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
+ if (tid==null){
|
|
|
+ tid=taskDetails.getTid();
|
|
|
+ TOrderTask update =new TOrderTask();
|
|
|
+ update.setId(id);
|
|
|
+ update.setProgressTid(tid);
|
|
|
+ tOrderTaskMapper.update(update);
|
|
|
+ }
|
|
|
}else {
|
|
|
taskDetails=taskDetailsMapper.selectByTid(tOrderTask.getProgressTid());
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
+ //如果是会员
|
|
|
+ TOrderTaskBo thisTask = null;
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ if (e.getId().equals(id)){
|
|
|
+ thisTask=e;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String serviceYear = thisTask.getServiceYear();
|
|
|
+ if (serviceYear.contains("(赠)")){
|
|
|
+ serviceYear=serviceYear.replace("(赠)", "");
|
|
|
+ }
|
|
|
+ Integer tid=null;
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (taskDetails !=null){
|
|
|
+ BeanUtils.copyProperties(taskDetails, res);
|
|
|
+ }
|
|
|
+ res.setUserName(mid.getBuyerName());
|
|
|
+ res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
+ res.setContractNo(tOrderNew.getContractNo());
|
|
|
+ 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";
|
|
|
+ }
|
|
|
+ res.setMemberLvl(lvl);
|
|
|
+ res.setTaskList(list);
|
|
|
+ res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -287,7 +338,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
public Result export(Integer id) {
|
|
|
OutTaskDetailsBo res = new OutTaskDetailsBo();
|
|
|
NewExcelUtil<OutTaskDetailsBo> excel=new NewExcelUtil<>(OutTaskDetailsBo.class);
|
|
|
- TaskDetailsBo byTid = getByTid(id);
|
|
|
+ TaskDetailsBo byTid = upshByTid(id);
|
|
|
BeanUtils.copyProperties(byTid,res);
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
byTid.getTaskList().forEach(e->{
|
|
|
@@ -328,7 +379,54 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
public Object logDetails(Integer id) {
|
|
|
TaskDetailsLog log = taskDetailsLogMapper.selectById(id);
|
|
|
TaskDetails taskDetails = taskDetailsMapper.selectById(log.getTdid());
|
|
|
- return null;
|
|
|
+ Integer tid = taskDetails.getTid();
|
|
|
+ TaskDetailsBo res = new TaskDetailsBo();
|
|
|
+ TOrderNew tOrderNew = tOrderNewMapper.selectByTid(tid);
|
|
|
+ TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
+ List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
+ //如果是会员
|
|
|
+ TOrderTaskBo thisTask = null;
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ if (e.getId().equals(id)){
|
|
|
+ thisTask=e;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String serviceYear = thisTask.getServiceYear();
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (taskDetails !=null){
|
|
|
+ BeanUtils.copyProperties(log, res);
|
|
|
+ }
|
|
|
+ res.setUserName(mid.getBuyerName());
|
|
|
+ res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
+ res.setContractNo(tOrderNew.getContractNo());
|
|
|
+ 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";
|
|
|
+ }
|
|
|
+ res.setMemberLvl(lvl);
|
|
|
+ res.setTaskList(list);
|
|
|
+ res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
|