|
|
@@ -1603,22 +1603,25 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
|
|
|
+ public TOrderTask addMemberSonProject(InputSonProject in ) {
|
|
|
Date date =new Date();
|
|
|
- TOrderTask tOrderTask = tOrderTaskMapper.queryById(tid);
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.queryById(in.getTid());
|
|
|
tOrderTask.setSplitStatus(1);
|
|
|
tOrderTask.setSplitAid(TokenManager.getAdminId());
|
|
|
tOrderTask.setSplitTime(date);
|
|
|
tOrderTask.setProjectStatus(1);
|
|
|
- tOrderTaskMapper.update(tOrderTask);
|
|
|
- tOrderTask.setId(null);
|
|
|
- tOrderTask.setSplitStatus(2);
|
|
|
- tOrderTask.setSplitSuper(tid);
|
|
|
- tOrderTask.setProjectStatus(0);
|
|
|
- if (memberType!=null){
|
|
|
- tOrderTask.setProcessStatus(1);
|
|
|
- tOrderTask.setMemberType(memberType);
|
|
|
- tOrderTask.setPictureUrl(pictureUrl);
|
|
|
+
|
|
|
+ TOrderTask newT=new TOrderTask();
|
|
|
+ BeanUtils.copyProperties(tOrderTask,newT);
|
|
|
+ newT.setId(null);
|
|
|
+ newT.setSplitStatus(2);
|
|
|
+ newT.setSplitSuper(in.getTid());
|
|
|
+ newT.setProjectStatus(0);
|
|
|
+ if (in.getMemberType()!=null){
|
|
|
+ newT.setProcessStatus(1);
|
|
|
+ newT.setMemberType(in.getMemberType());
|
|
|
+ newT.setPictureUrl(in.getPictureUrl());
|
|
|
+
|
|
|
// if(memberType==1||memberType==2){
|
|
|
// //判定项目省内外
|
|
|
// Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
|
|
|
@@ -1629,41 +1632,57 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
// }
|
|
|
// }
|
|
|
}
|
|
|
- Integer i=tOrderTaskMapper.getSplitCount(tid);
|
|
|
+ Integer i=tOrderTaskMapper.getSplitCount(in.getTid());
|
|
|
i++;
|
|
|
- tOrderTask.setSplitId(i);
|
|
|
- tOrderTask.setCommodityQuantity(1);
|
|
|
- tOrderTask.setTaskComment(taskComment);
|
|
|
- tOrderTask.setMain(0);
|
|
|
- tOrderTask.setCommodityPrice(new BigDecimal(0));
|
|
|
- tOrderTaskMapper.insertSelective(tOrderTask);
|
|
|
-
|
|
|
- TTaskMember t = tTaskMemberMapper.selectByTid(tid);
|
|
|
+ newT.setSplitId(i);
|
|
|
+ newT.setCommodityQuantity(1);
|
|
|
+ newT.setTaskComment(in.getTaskComment());
|
|
|
+ newT.setMain(0);
|
|
|
+ if (in.getHtMember()!=null)newT.setHtMember(in.getHtMember());
|
|
|
+ if (in.getAdditionalDeduction()!=null)newT.setAdditionalDeduction(in.getAdditionalDeduction());
|
|
|
+ if (in.getRdAwardsubsidy()!=null)newT.setRdAwardsubsidy(in.getRdAwardsubsidy());
|
|
|
+ newT.setCommodityPrice(new BigDecimal(0));
|
|
|
+ tOrderTaskMapper.insertSelective(newT);
|
|
|
+ pushFatherTask(tOrderTask);
|
|
|
+ tOrderTaskMapper.update(tOrderTask);
|
|
|
+ TTaskMember t = tTaskMemberMapper.selectByTid(in.getTid());
|
|
|
TOrderTaskBo tb=new TOrderTaskBo();
|
|
|
- BeanUtils.copyProperties(tOrderTask,tb);
|
|
|
- if (t.getServiceLife()!=null||t.getYearSum()!=null||t.getContractTerm()!=null||serviceYear!=null){
|
|
|
+ BeanUtils.copyProperties(newT,tb);
|
|
|
+ if (t.getServiceLife()!=null||t.getYearSum()!=null||t.getContractTerm()!=null||in.getServiceYear()!=null){
|
|
|
TTaskMember ttm=new TTaskMember();
|
|
|
ttm.setId(null);
|
|
|
- ttm.setTid(tOrderTask.getId());
|
|
|
+ ttm.setTid(newT.getId());
|
|
|
if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
|
|
|
- ttm.setServiceYear(serviceYear);
|
|
|
- tb.setServiceYear(serviceYear);
|
|
|
+ ttm.setServiceYear(in.getServiceYear());
|
|
|
+ tb.setServiceYear(in.getServiceYear());
|
|
|
if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
|
|
|
if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
|
|
|
tTaskMemberMapper.insertSelective(ttm);
|
|
|
}
|
|
|
- orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
|
|
|
+ orderNewService.addTaskMid(newT.getId(),newT.getCommodityId(), newT.getOrderNo());
|
|
|
//处理主项目本次派单年份
|
|
|
- tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
|
|
|
- addMemberLog(tOrderTask.getId(),0,"新增会员项目",TokenManager.getAdminId());
|
|
|
- if(memberType!=null){
|
|
|
- addMemberExamine(tOrderTask);
|
|
|
- addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask,null,0);
|
|
|
- addFinanceCountMember(tOrderTask.getOrderNo(),date);
|
|
|
+ tTaskMemberMapper.updateServiceYearBySplitSuper(in.getTid());
|
|
|
+ addMemberLog(newT.getId(),0,"新增会员项目",TokenManager.getAdminId());
|
|
|
+ if(in.getMemberType()!=null){
|
|
|
+ addMemberExamine(newT);
|
|
|
+ addNoticMember(NoticeStatus.MENBER_START.getCode(),newT,null,0);
|
|
|
+ addFinanceCountMember(newT.getOrderNo(),date);
|
|
|
}
|
|
|
return tb;
|
|
|
}
|
|
|
|
|
|
+ private void pushFatherTask(TOrderTask tOrderTask) {
|
|
|
+ List<TOrderTaskListBo> listBos = tOrderTaskMapper.splitProjectList(tOrderTask.getId(), 1);
|
|
|
+ int htMember=0,additionalDeduction=0,rdAwardsubsidy=0;
|
|
|
+ for (TOrderTaskListBo e : listBos) {
|
|
|
+ if (e.getHtMember()==1)htMember=1;
|
|
|
+ if (e.getAdditionalDeduction()==1)additionalDeduction=1;
|
|
|
+ if (e.getRdAwardsubsidy()==1)rdAwardsubsidy=1;
|
|
|
+ }
|
|
|
+ tOrderTask.setHtMember(htMember);
|
|
|
+ tOrderTask.setAdditionalDeduction(additionalDeduction);
|
|
|
+ tOrderTask.setRdAwardsubsidy(rdAwardsubsidy);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
private void addMemberExamine(TOrderTask t) {
|