|
|
@@ -30,6 +30,7 @@ import org.apache.commons.collections4.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -1203,7 +1204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
|
|
|
Date date =new Date();
|
|
|
- TOrderTaskBo tOrderTask = (TOrderTaskBo) tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
tOrderTask.setSplitStatus(1);
|
|
|
tOrderTask.setSplitAid(TokenManager.getAdminId());
|
|
|
tOrderTask.setSplitTime(date);
|
|
|
@@ -1223,21 +1224,24 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderTask.setTaskComment(taskComment);
|
|
|
tOrderTaskMapper.insertSelective(tOrderTask);
|
|
|
TTaskMember t = tTaskMemberMapper.selectByTid(tid);
|
|
|
+ TOrderTaskBo tb=new TOrderTaskBo();
|
|
|
+ BeanUtils.copyProperties(tOrderTask,tb);
|
|
|
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());
|
|
|
ttm.setServiceYear(serviceYear);
|
|
|
- tOrderTask.setServiceYear(serviceYear);
|
|
|
+ tb.setServiceYear(serviceYear);
|
|
|
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());
|
|
|
addMemberLog(tOrderTask.getId(),0,"新增会员项目");
|
|
|
addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
|
|
|
- return tOrderTask;
|
|
|
+ return tb;
|
|
|
}
|
|
|
public void addNoticMember(Integer type, String orderNo,Integer shiroType,Integer result) {
|
|
|
TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);
|