|
|
@@ -7,6 +7,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
+import com.goafanti.techproject.bo.OutTaskDetailsBo;
|
|
|
import com.goafanti.techproject.bo.TaskDetailsBo;
|
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -57,11 +58,14 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public TaskDetailsBo getByTid(Integer id) {
|
|
|
+ TaskDetailsBo res = new TaskDetailsBo();
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
List<Map<String,Object >> list=new ArrayList<>();
|
|
|
TaskDetails taskDetails=taskDetailsMapper.selectByTid(id);
|
|
|
+ LocalDate now = LocalDate.now();
|
|
|
+
|
|
|
//如果是会员
|
|
|
TOrderTaskBo thisTask = null;
|
|
|
for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
@@ -87,10 +91,20 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
list.add(map);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- TaskDetailsBo res = new TaskDetailsBo();
|
|
|
if (taskDetails != null) {
|
|
|
+ int year = now.getYear();
|
|
|
+ List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), year);
|
|
|
+ for (TaskAnnualReport e : taskAnnualReports) {
|
|
|
+ if (e.getYear()==(year-1)){
|
|
|
+ res.setLastYear(e.getYear().toString());
|
|
|
+ res.setLastSalesAmount(e.getSalesAmount());
|
|
|
+ res.setLastRdBudget(e.getResearchAmount());
|
|
|
+ }else if (e.getYear()==(year-2)){
|
|
|
+ res.setBeforeLastYear(e.getYear().toString());
|
|
|
+ res.setBeforeLastSalesAmount(e.getSalesAmount());
|
|
|
+ res.setBeforeLastRdBudget(e.getResearchAmount());
|
|
|
+ }
|
|
|
+ }
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
}
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
@@ -102,6 +116,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}else if (totalAmount.compareTo(new BigDecimal("8"))>0){
|
|
|
lvl="AAA";
|
|
|
}
|
|
|
+ res.setUserName(mid.getBuyerName());
|
|
|
res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
res.setContractNo(tOrderNew.getContractNo());
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
@@ -241,9 +256,18 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Object export(Integer id) {
|
|
|
- NewExcelUtil<TaskDetailsBo> excel=new NewExcelUtil<TaskDetailsBo>(TaskDetailsBo.class);
|
|
|
+ OutTaskDetailsBo res = new OutTaskDetailsBo();
|
|
|
+ NewExcelUtil<OutTaskDetailsBo> excel=new NewExcelUtil<>(OutTaskDetailsBo.class);
|
|
|
TaskDetailsBo byTid = getByTid(id);
|
|
|
-
|
|
|
- return excel.exportTaskDetailsExcel(byTid,uploadPath);
|
|
|
+ BeanUtils.copyProperties(byTid,res);
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
+ byTid.getTaskList().forEach(e->{
|
|
|
+ if (res.getServiceyear()==null){
|
|
|
+ res.setServiceyear((String) e.get("serviceYear"));
|
|
|
+ }
|
|
|
+ sb.append(e.get("taskName")).append(" ;");
|
|
|
+ });
|
|
|
+ res.setServiceProject(sb.toString());
|
|
|
+ return excel.exportTaskDetailsExcel(res,"项目进度表",uploadPath);
|
|
|
}
|
|
|
}
|