|
|
@@ -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);
|
|
|
}
|
|
|
|
|
|
@@ -443,24 +442,29 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
date.setTime(date.getTime()+100);
|
|
|
addOrderChangeLog("无咨询师自动通过", 2, nb.getOrderNo(), nb.getId(), date);
|
|
|
}
|
|
|
- pushZXSJL(nb,date,1);
|
|
|
+ if (Objects.equals(nb.getType(), OrderChangeType.CB.getCode())){
|
|
|
+ nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
+ } else if (Objects.equals(nb.getType(), OrderChangeType.JXMBG.getCode())){
|
|
|
+ nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
+ }else {
|
|
|
+ pushZXSJL(nb,date,1);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 咨询师经理,跳过就返回x=1,在后续添加日志放到先审核,后添加日志
|
|
|
- * @param nb
|
|
|
* @param type 0正常审核 1跨流程需要通知
|
|
|
- * @return
|
|
|
*/
|
|
|
@Override
|
|
|
public void pushZXSJL(NewOrderChangeBo nb,Date date,Integer type) {
|
|
|
int zxsjl=orderExamineMapper.checkCountStatus(nb.getOrderNo(),1,0);
|
|
|
- if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
|
|
|
- nb.getType()==OrderChangeType.TDTK.getCode()||
|
|
|
- nb.getType()==OrderChangeType.TDBTK.getCode()||
|
|
|
- nb.getType()==OrderChangeType.CB.getCode()||
|
|
|
- nb.getType()==OrderChangeType.JXMBG.getCode()){
|
|
|
+ if (Objects.equals(nb.getType(), OrderChangeType.XMJJEBG.getCode()) ||
|
|
|
+ Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) ||
|
|
|
+ Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode()) ||
|
|
|
+ Objects.equals(nb.getType(), OrderChangeType.CB.getCode()) ||
|
|
|
+ Objects.equals(nb.getType(), OrderChangeType.JXMBG.getCode())){
|
|
|
if (zxsjl>0){
|
|
|
nb.setProcessState(OrderChangeProcess.JSJL.getCode());
|
|
|
}else {
|
|
|
@@ -469,7 +473,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
addOrderChangeLog("无咨询师经理自动通过", 2, nb.getOrderNo(), nb.getId(),date);
|
|
|
}
|
|
|
//重报 没有技术员跳入财务
|
|
|
- if (nb.getType()==OrderChangeType.CB.getCode()){
|
|
|
+ if (Objects.equals(nb.getType(), OrderChangeType.CB.getCode())){
|
|
|
nb.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
//项目变更没有跳入技术总监
|
|
|
}else{
|
|
|
@@ -506,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());
|
|
|
//获取接收者
|
|
|
@@ -582,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<>();
|
|
|
@@ -672,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) {
|
|
|
@@ -715,7 +714,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
|
|
|
//财务专员有财务经理查看财务专员的权限
|
|
|
- if(processState==OrderChangeProcess.CWZY.getCode()&&TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
+ if(processState.equals(OrderChangeProcess.CWZY.getCode()) &&TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
parameter.put("aids", adminMapper.selectBySuperId(TokenManager.getAdminId()));
|
|
|
}else {
|
|
|
parameter.put("aid", TokenManager.getAdminId());
|
|
|
@@ -866,11 +865,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.CWZY.getCode()){
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.CWZY.getCode())){
|
|
|
TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
|
|
|
noc.setExamineName(dep.getFinanceName());
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.CWZJ.getCode()){
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.CWZJ.getCode())){
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.FINANCE_ADMIN);
|
|
|
for (Admin a : admins) {
|
|
|
@@ -878,20 +877,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
|
|
|
- }else if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()
|
|
|
- ||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()
|
|
|
- ||noc.getProcessState()== OrderChangeProcess.FZC.getCode()){
|
|
|
+ }else if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())
|
|
|
+ || Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())
|
|
|
+ || Objects.equals(noc.getProcessState(), OrderChangeProcess.FZC.getCode())){
|
|
|
if(noc.getStatus()==1){
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
- if (noc.getProcessState()== OrderChangeProcess.TPSH.getCode()){
|
|
|
+ StringBuilder str=new StringBuilder();
|
|
|
+ if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())){
|
|
|
Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
|
|
|
Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
|
|
|
- str=str.append(a.getName()).append(",");
|
|
|
- }else if(noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
|
|
|
+ str.append(a.getName()).append(",");
|
|
|
+ }else if(Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())){
|
|
|
List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);
|
|
|
for (Admin a : admins) {
|
|
|
- str=str.append(a.getName()).append(",");
|
|
|
- }
|
|
|
+ str.append(a.getName()).append(",");
|
|
|
+ }
|
|
|
}
|
|
|
if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
|
|
|
} else if(noc.getStatus()==2){
|