|
|
@@ -353,7 +353,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public TOrderTaskDetailBo orderTaskDetail(String id) {
|
|
|
+ public TOrderTaskDetailBo orderTaskDetail(Integer id) {
|
|
|
TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(id);
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
|
|
|
||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.TECH_ADMIN)
|
|
|
@@ -1201,9 +1201,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
|
|
|
+ public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
|
|
|
Date date =new Date();
|
|
|
- TOrderTask tOrderTask = tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
+ TOrderTaskBo tOrderTask = (TOrderTaskBo) tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
tOrderTask.setSplitStatus(1);
|
|
|
tOrderTask.setSplitAid(TokenManager.getAdminId());
|
|
|
tOrderTask.setSplitTime(date);
|
|
|
@@ -1220,14 +1220,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
i++;
|
|
|
tOrderTask.setSplitId(i);
|
|
|
tOrderTask.setCommodityQuantity(1);
|
|
|
+ tOrderTask.setTaskComment(taskComment);
|
|
|
tOrderTaskMapper.insertSelective(tOrderTask);
|
|
|
TTaskMember t = tTaskMemberMapper.selectByTid(tid);
|
|
|
- if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
|
|
|
+ if (t.getServiceLife()!=null||t.getYearSum()!=null||t.getContractTerm()!=null||serviceYear!=null){
|
|
|
TTaskMember ttm=new TTaskMember();
|
|
|
ttm.setId(null);
|
|
|
ttm.setTid(tOrderTask.getId());
|
|
|
if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
|
|
|
- if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
|
|
|
+ ttm.setServiceYear(serviceYear);
|
|
|
+ tOrderTask.setServiceYear(serviceYear);
|
|
|
if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
|
|
|
if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
|
|
|
tTaskMemberMapper.insertSelective(ttm);
|
|
|
@@ -1235,7 +1237,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
|
|
|
addMemberLog(tOrderTask.getId(),0,"新增会员项目");
|
|
|
addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
|
|
|
- return 1;
|
|
|
+ return tOrderTask;
|
|
|
}
|
|
|
public void addNoticMember(Integer type, String orderNo,Integer shiroType,Integer result) {
|
|
|
TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);
|