|
|
@@ -49,6 +49,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
private TaskFeatureMapper taskFeatureMapper;
|
|
|
@Resource
|
|
|
private TaskFeatureLogMapper taskFeatureLogMapper;
|
|
|
+ @Resource
|
|
|
+ private TTaskMemberMapper ttaskMemberMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -118,8 +120,51 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Object detailsList(InputTaskDetailsBo in) {
|
|
|
-// findPage("selectTaskDetailsList","selectTaskDetailsCount",in);
|
|
|
- return null;
|
|
|
+ in.setAid(TokenManager.getUserId());
|
|
|
+ Pagination<?> page = findPage("selectTaskDetailsList", "selectTaskDetailsCount", in);
|
|
|
+ List<TaskDetails> list = (List<TaskDetails>) page.getList();
|
|
|
+ List<TaskDetailsBo> list2=new ArrayList<>();
|
|
|
+ for (TaskDetails e : list) {
|
|
|
+ TaskDetailsBo bo=new TaskDetailsBo();
|
|
|
+ BeanUtils.copyProperties(e,bo);
|
|
|
+ addOrderInformation(bo);
|
|
|
+ list2.add(bo);
|
|
|
+ }
|
|
|
+ page.setList(list2);
|
|
|
+ return page;
|
|
|
+ }
|
|
|
+
|
|
|
+ private void addOrderInformation(TaskDetailsBo bo) {
|
|
|
+ TOrderNew tOrderNew = tOrderNewMapper.selectByTid(bo.getTid());
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.queryById(bo.getTid());
|
|
|
+ TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
+ List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+ TaskDetails taskDetails=null;
|
|
|
+ //获取项目服务年份算出平均值
|
|
|
+ List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
|
|
|
+ List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
|
|
|
+ List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
+ int yearSum=1;
|
|
|
+ for (TOrderTaskBo e : collect) {
|
|
|
+ if (e.getYearSum()>yearSum){
|
|
|
+ yearSum=e.getYearSum();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ TTaskMember tTaskMember = ttaskMemberMapper.selectByTid(tOrderTask.getId());
|
|
|
+ String serviceYear = getServiceYer(tTaskMember.getServiceYear());
|
|
|
+ list=addOrderList(collect2,serviceYear);
|
|
|
+ bo.setUserName(mid.getBuyerName());
|
|
|
+ bo.setOrderNo(tOrderNew.getOrderNo());
|
|
|
+ bo.setContractNo(tOrderNew.getContractNo());
|
|
|
+ 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 (taskDetails!=null&&taskDetails.getTid()!=null){
|
|
|
+ bo.setFeatureList(taskFeatureMapper.selectByTdId(taskDetails.getId()));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private String getServiceYer(String serviceYear) {
|