Browse Source

Merge branch 'test'

# Conflicts:
#	src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
anderx 3 years ago
parent
commit
dd8bb16322

+ 2 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -172,9 +172,9 @@ public class AsyncUtils {
 			tOrderNewMapper.updateExamineName(ProcessStatus.YPZXSGLY.getCode(),depId,null,names);
 			newOrderChangeMapper.updateExamineName(OrderChangeProcess.JSZJ.getCode(),depId,null,names);
 		}else if (type==5){
-			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),2);
+			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),OrderChangeProcess.JSY.getCode());
 		}else if (type==6){
-			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),3);
+			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),OrderChangeProcess.JSJL.getCode());
 		}
 	}
 

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

@@ -197,8 +197,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if (type==4){
 			orderExamineMapper.updateBack(aid,taskReceiverId);
 		}
-		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,2);
-		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,3);
+		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,OrderChangeProcess.JSY.getCode());
+		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,OrderChangeProcess.JSJL.getCode());
 	}
 
 	private void projectDistributionPushUserMid(TOrderNew tn) {