Browse Source

订单审核负责人开发

anderx 3 years ago
parent
commit
7baabc40dc

+ 5 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -911,8 +911,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 					//如果是转的暂时不删除外包信息
 					aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
-
-
 				} else if(outsource==1) {
 					for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
 						aids.add(admin.getId());
@@ -952,7 +950,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		t.setOrderStatus(orderStatus);
 		//设置审核人员名称
-		pushExamineName(t2);
+		pushExamineName(t);
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		if (aids.isEmpty()) {
 			throw new BusinessException(new Error( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误"));
@@ -1000,6 +998,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			admins.forEach(e ->{
 				str.append(e.getName()).append(",");
 			});
+		}else if (t.getProcessStatus()==ProcessStatus.YPYXY.getCode()){
+			t.setExamineName("");
+		} else {
+			t.setExamineName("");
 		}
 		if (StringUtils.isNotBlank(str))t.setExamineName(str.substring(0,str.length()-1));
 

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

@@ -281,7 +281,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TOrderNew tNew=new TOrderNew();
 		tNew.setOrderNo(orderNo);
 		tNew.setProcessStatus(getOrderProcessStatus(orderNo));
-
+		tNew.setExamineName("");
 		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
 	}