|
|
@@ -1261,11 +1261,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if(in.getStatus()!=null) map.put("status", in.getStatus());
|
|
|
if(in.getShiroType()!=null) map.put("shiroType", in.getShiroType());
|
|
|
map.put("aid",TokenManager.getAdminId());
|
|
|
- if (TokenManager.hasRole(AFTConstants.VICE_CED)){
|
|
|
- map.put("approvalType",2);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.CED)){
|
|
|
- map.put("approvalType",1);
|
|
|
- }
|
|
|
+// if (TokenManager.hasRole(AFTConstants.VICE_CED)){
|
|
|
+// map.put("approvalType",2);
|
|
|
+// }else if (TokenManager.hasRole(AFTConstants.CED)){
|
|
|
+// map.put("approvalType",1);
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1333,7 +1333,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
});
|
|
|
OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(task.getOrderNo());
|
|
|
int examineType =task.getExamineType();
|
|
|
-
|
|
|
+ //判定谁审核的财务审核,
|
|
|
if (aid.equals(dep.getFinanceId())){
|
|
|
if (examineType==3){
|
|
|
examineType=2;
|
|
|
@@ -1348,12 +1348,21 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
}
|
|
|
nt.setExamineType(examineType);
|
|
|
+ //全都已经审核的情况下
|
|
|
if(examineType==4){
|
|
|
flag=true;
|
|
|
}
|
|
|
+
|
|
|
+ //需要特批的情况下
|
|
|
if (task.getMemberType()==1||task.getMemberType()==2){
|
|
|
if (flag){
|
|
|
- nt.setProcessStatus(2);
|
|
|
+ Department department = tOrderNewMapper.selectDepByOrderNo(task.getOrderNo());
|
|
|
+ //部门设置无需特批的情况下直接完成,否则走正常流程
|
|
|
+ if (department.getApproval()==0){
|
|
|
+ nt.setProcessStatus(3);
|
|
|
+ }else {
|
|
|
+ nt.setProcessStatus(2);
|
|
|
+ }
|
|
|
}
|
|
|
status=1;
|
|
|
}else if (task.getMemberType()==0){
|
|
|
@@ -1367,6 +1376,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
}
|
|
|
if(flag){
|
|
|
+
|
|
|
subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
|
|
|
}
|
|
|
}else if(in.getType()==1){
|
|
|
@@ -1489,6 +1499,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderTask.setMain(0);
|
|
|
tOrderTask.setCommodityPrice(new BigDecimal(0));
|
|
|
tOrderTaskMapper.insertSelective(tOrderTask);
|
|
|
+
|
|
|
TTaskMember t = tTaskMemberMapper.selectByTid(tid);
|
|
|
TOrderTaskBo tb=new TOrderTaskBo();
|
|
|
BeanUtils.copyProperties(tOrderTask,tb);
|