anderx лет назад: 2
Родитель
Сommit
0f10c319d0

+ 20 - 9
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1272,11 +1272,17 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 
-
+	/**
+	 * 财务通过走3个逻辑   还有复审 停留不发送邮件   复审也审核了 ,看是否特批,特批走
+	 * @param in
+	 * @return
+	 */
 	@Override
 	public int pushExamineMemberProject(InputMenber in) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
 		Integer status=1;
+		//是否财务审核加复审
+		boolean flag=false;
 		TOrderTask nt=new TOrderTask();
 		nt.setId(task.getId());
 		Integer result=0;
@@ -1300,13 +1306,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						count++;
 					}
 				}
+				if(count==list.size()){
+					flag=true;
+				}
 				if (task.getMemberType()==1||task.getMemberType()==2){
-					if(count==list.size()){
+					if (flag){
 						nt.setProcessStatus(2);
 					}
 					status=1;
 				}else if (task.getMemberType()==0){
-					if(count==list.size()){
+					if(flag){
 						nt.setProcessStatus(3);
 						status=3;
 						result=1;
@@ -1315,7 +1324,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					}
 
 				}
-				if(count==list.size()){
+				if(flag){
 					subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
 				}
 			}else if(in.getType()==1){
@@ -1323,8 +1332,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				nt.setProcessStatus(3);
 				status=3;
 				result=1;
+				flag=true;
 			}
-
 		}else if (in.getResult()==0){
 			status=2;
 			nt.setProcessStatus(4);
@@ -1336,13 +1345,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 
 		}
-		addNoticMember(notice, ono, in.getType(),result);
 		addMemberLog(in.getId(),status,in.getRemarks());
-		if (nt.getProcessStatus()==null&&nt.getProcessStatus()==3){
+		if (nt.getProcessStatus()!=null&&nt.getProcessStatus()==3){
 			tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
 		}
-
-		return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
+		if (flag){
+			addNoticMember(notice, ono, in.getType(),result);
+			tOrderTaskMapper.updateByPrimaryKeySelective(nt);
+		}
+		return 1;
 	}
 
 	/**