Merge branch 'dev_thirdplatform' into dev_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2411,31 +2411,39 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		switch (formDTO.getStatus()) {
 			case NumConstant.ONE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待处理");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.TWO_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待核实");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.THREE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("已上报");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.FOUR_STR:
 				projectSubProcessDTO.setExternalStatusDesc("已完结");
-				projectSubProcessDTO.setInternalStatus(NumConstant.ONE_STR);
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.CLOSED);
 				break;
 			case NumConstant.FIVE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("处理中");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.SIX_STR:
 				projectSubProcessDTO.setExternalStatusDesc("待分发");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.SEVEN_STR:
 				projectSubProcessDTO.setExternalStatusDesc("归档");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.EIGHT_STR:
 				projectSubProcessDTO.setExternalStatusDesc("催办");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			case NumConstant.NINE_STR:
 				projectSubProcessDTO.setExternalStatusDesc("超时");
+				projectSubProcessDTO.setInternalStatus(ProjectConstant.PENDING);
 				break;
 			default:
 				break;