|
|
@@ -1,6 +1,5 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
-import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.OrderExamineBo;
|
|
|
@@ -398,10 +397,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void completeChange(String remarks, NewOrderChangeBo nb ) {
|
|
|
+ @Transactional
|
|
|
+ public void completeChange(String remarks, NewOrderChangeBo nb ) {
|
|
|
nb.setStatus(4);
|
|
|
addOrderChangeLog(remarks, 2, nb.getOrderNo(), nb.getId());
|
|
|
-
|
|
|
pushCompleteOrderChange(nb);
|
|
|
}
|
|
|
|
|
|
@@ -456,9 +455,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
|
|
|
/**
|
|
|
* 咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
|
|
|
- * @param nb
|
|
|
* @param type 0正常审核 1跨流程需要通知
|
|
|
- * @return
|
|
|
*/
|
|
|
@Override
|
|
|
public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
|
|
|
@@ -513,7 +510,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if(status==2)type=NoticeStatus.ORDER_CHANGE_YES.getCode();
|
|
|
if(status==3)type=NoticeStatus.ORDER_CHANGE_NO.getCode();
|
|
|
//获取发起人与发起人部门
|
|
|
- AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
+// AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
//获取客户信息
|
|
|
TOrderNewBo o=tOrderNewMapper.getSaleIdByOno(nb.getOrderNo());
|
|
|
//获取接收者
|
|
|
@@ -589,7 +586,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
*
|
|
|
* @param orderNo 订单编号
|
|
|
* @param i 0咨询师 1咨询师经理
|
|
|
- * @return
|
|
|
*/
|
|
|
private List<String> addOrderExamine(String orderNo, Integer i) {
|
|
|
List<String> list=new ArrayList<>();
|
|
|
@@ -679,16 +675,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Override
|
|
|
public boolean checkOderNo(String orderNo) {
|
|
|
int i=newOrderChangeMapper.checkOderNo(orderNo);
|
|
|
- if (i>0) {
|
|
|
- return true;
|
|
|
- }
|
|
|
- return false;
|
|
|
- }
|
|
|
+ return i > 0;
|
|
|
+ }
|
|
|
@Override
|
|
|
public List<OrderChangeLogBo> selectOrderChangeLogList(String changeId) {
|
|
|
return orderChangeLogMapper.selectOrderChangeLogList(changeId);
|
|
|
}
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
|
String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|