|
|
@@ -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
|
|
|
@@ -1309,6 +1309,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
Integer status=1;
|
|
|
+ boolean appFlag=false;
|
|
|
//是否财务审核加复审
|
|
|
boolean flag=false;
|
|
|
TOrderTask nt=new TOrderTask();
|
|
|
@@ -1333,7 +1334,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 +1349,23 @@ 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);
|
|
|
+ //判定无特批直接完成新增日志
|
|
|
+ appFlag=true;
|
|
|
+ }else {
|
|
|
+ nt.setProcessStatus(2);
|
|
|
+ }
|
|
|
}
|
|
|
status=1;
|
|
|
}else if (task.getMemberType()==0){
|
|
|
@@ -1386,7 +1398,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),2);
|
|
|
}
|
|
|
}
|
|
|
- addMemberLog(in.getId(),status,in.getRemarks());
|
|
|
+ addMemberLog(in.getId(),status,in.getRemarks(),TokenManager.getAdminId());
|
|
|
if (nt.getProcessStatus()!=null&&nt.getProcessStatus()==3){
|
|
|
tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
|
|
|
}
|
|
|
@@ -1394,6 +1406,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (flag){
|
|
|
addNoticMember(notice, ono, in.getType(),result);
|
|
|
}
|
|
|
+ if(appFlag)addMemberLog(in.getId(),status,"未设置特批账号,跳过特批审核",null);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -1429,7 +1442,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
public int updateMemberProject(InputAddTask t) {
|
|
|
TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
if(task.getProcessStatus()!=4)throw new BusinessException("审核状态错误,无法提交。");
|
|
|
- addMemberLog(t.getId(),0,"修改重新发起");
|
|
|
+ addMemberLog(t.getId(),0,"修改重新发起",TokenManager.getAdminId());
|
|
|
t.setProcessStatus(1);
|
|
|
TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
|
|
|
addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0,task);
|
|
|
@@ -1442,12 +1455,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public void addMemberLog(Integer id,Integer status ,String remarks){
|
|
|
+ public void addMemberLog(Integer id,Integer status ,String remarks,String aid){
|
|
|
MemberLog log = new MemberLog();
|
|
|
log.setPid(id);
|
|
|
log.setStatus(status);
|
|
|
log.setRemarks(remarks);
|
|
|
- log.setAid(TokenManager.getAdminId());
|
|
|
+ log.setAid(aid);
|
|
|
memberLogMapper.insertSelective(log);
|
|
|
}
|
|
|
|
|
|
@@ -1471,15 +1484,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderTask.setProcessStatus(1);
|
|
|
tOrderTask.setMemberType(memberType);
|
|
|
tOrderTask.setPictureUrl(pictureUrl);
|
|
|
- if(memberType==1||memberType==2){
|
|
|
- //判定项目省内外
|
|
|
- Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
|
|
|
- if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
|
|
|
- tOrderTask.setApproval(2);
|
|
|
- }else {
|
|
|
- tOrderTask.setApproval(1);
|
|
|
- }
|
|
|
- }
|
|
|
+// if(memberType==1||memberType==2){
|
|
|
+// //判定项目省内外
|
|
|
+// Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
|
|
|
+// if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
|
|
|
+// tOrderTask.setApproval(2);
|
|
|
+// }else {
|
|
|
+// tOrderTask.setApproval(1);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
Integer i=tOrderTaskMapper.getSplitCount(tid);
|
|
|
i++;
|
|
|
@@ -1507,7 +1520,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
|
|
|
//处理主项目本次派单年份
|
|
|
tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
|
|
|
- addMemberLog(tOrderTask.getId(),0,"新增会员项目");
|
|
|
+ addMemberLog(tOrderTask.getId(),0,"新增会员项目",TokenManager.getAdminId());
|
|
|
if(memberType!=null){
|
|
|
addMemberExamine(tOrderTask);
|
|
|
addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask,null,0);
|
|
|
@@ -1537,7 +1550,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
examineType=2;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
tOrderTask.setExamineType(examineType);
|
|
|
+ }else {
|
|
|
+ throw new BusinessException("部门未设置财务专员。");
|
|
|
}
|
|
|
tOrderTask.setId(t.getId());
|
|
|
|