|
|
@@ -114,7 +114,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially) {
|
|
|
+ public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially,String remarks) {
|
|
|
TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
|
|
|
t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
|
|
|
t.setTaskAllocator(TokenManager.getAdminId());
|
|
|
@@ -127,11 +127,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
insetLog(taskId, taskReceiverId);
|
|
|
//0-经理 (经理分派会创建子项目)1 管理员或经理转交
|
|
|
if (specially==1) {
|
|
|
- addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode());
|
|
|
+ addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode(),remarks);
|
|
|
t.setManagerId(taskReceiverId);
|
|
|
t.setConsultantId(null);
|
|
|
}else if (specially==0) {
|
|
|
- addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode());
|
|
|
+ addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode(),remarks);
|
|
|
t.setConsultantId(taskReceiverId);
|
|
|
}else if(specially==2) { //咨询师推给咨询师经理
|
|
|
t.setConsultantId(null);
|
|
|
@@ -148,11 +148,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
|
|
|
return t;
|
|
|
}
|
|
|
- public void addOrderLog(String orderNo, Integer code) {
|
|
|
+ public void addOrderLog(String orderNo, Integer code,String remarks) {
|
|
|
TOrderLog tl=new TOrderLog();
|
|
|
tl.setOrderNo(orderNo);
|
|
|
tl.setProcess(code);
|
|
|
tl.setAid(TokenManager.getAdminId());
|
|
|
+ if(null!=remarks)tl.setRemarks(remarks);
|
|
|
tOrderLogMapper.insertSelective(tl);
|
|
|
|
|
|
}
|
|
|
@@ -187,7 +188,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus,
|
|
|
- String adminName,Integer specially, String depId, String contractNo,Integer projectStatus ,Integer pageNo, Integer pageSize,Integer outsource) {
|
|
|
+ String adminName,Integer specially, String depId, String contractNo,Integer projectStatus , Integer approval,Integer pageNo, Integer pageSize,Integer outsource) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -199,6 +200,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
|
|
|
if (projectStatus !=null ) params.put("projectStatus", projectStatus);
|
|
|
if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
+ if (approval !=null) params.put("approval", approval);
|
|
|
if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
params.put("outsource", outsource==null?0:outsource);
|
|
|
@@ -426,7 +428,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tb.setOrderNo(task.getOrderNo());
|
|
|
if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()) {
|
|
|
tb.setBonusSubject(21);//项目已提交
|
|
|
- addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode());
|
|
|
+ addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode(),null);
|
|
|
}
|
|
|
if (task.getProjectStatus()==ProjectNewStage.LS.getCode())tb.setBonusSubject(23);//项目立项
|
|
|
if (task.getProjectStatus()==ProjectNewStage.GS.getCode())tb.setBonusSubject(24);//项目公示
|