|
|
@@ -101,6 +101,7 @@ import com.goafanti.order.enums.TaskState;
|
|
|
import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
+import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
|
|
|
@Service
|
|
|
@EnableAsync
|
|
|
@@ -522,8 +523,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tl.setAid(TokenManager.getAdminId());
|
|
|
if (orderStatus==OrderNewState.QDSHTG.getCode()) {
|
|
|
t.setOutsource(outsource);
|
|
|
- if (t2.getApproval()==ApprovalNewState.FTP.getCode()||
|
|
|
- t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
|
|
|
+ //外包单给外包审核员 否则给财务专员
|
|
|
if(outsource==0) {
|
|
|
t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
//如果是转的暂时不删除外包信息
|
|
|
@@ -538,12 +538,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
addOrderLog(tl,reason);
|
|
|
|
|
|
}
|
|
|
- }else {
|
|
|
- t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
- for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
|
|
|
- aids.add(admin.getId());
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
type=NoticeStatus.ORDER_YES.getCode();
|
|
|
tl.setOrderNo(orderNo);
|
|
|
tl.setProcess(OrderLogProcess.SH.getCode());
|
|
|
@@ -754,15 +749,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tl.setOrderNo(orderNo);
|
|
|
if (confirm==2) {
|
|
|
t.setApproval(2);
|
|
|
- if(t2.getOutsource()==0) {
|
|
|
- t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
- aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
|
|
|
- }else {
|
|
|
- t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
|
|
|
- for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
|
|
|
+ t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
+ OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
|
|
|
+ t.setFinanceId(oo.getFinanceId());
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
|
|
|
aids.add(admin.getId());
|
|
|
}
|
|
|
- }
|
|
|
type=NoticeStatus.ORDER_APPROVA_YES.getCode();
|
|
|
tl.setProcess(OrderLogProcess.TP.getCode());
|
|
|
} else {
|