Merge remote-tracking branch 'origin/invest-dev-hxy' into invest-dev-hxy

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectController.java

@@ -88,7 +88,15 @@ public class ProjectController extends BaseController
                     if(StringUtils.isNotEmpty(n.getInvestType()))n.setInvestType(dictDataService.selectDictLabel("INVEST_TYPE",n.getInvestType()));
                     if(StringUtils.isNotEmpty(n.getInvestPloy()))n.setInvestPloy(dictDataService.selectDictLabel("INVEST_PLOY",n.getInvestPloy()));
                     if(StringUtils.isNotEmpty(n.getInvestWorth()))n.setInvestWorth(dictDataService.selectDictLabel("INVEST_WORTH",n.getInvestWorth()));
-                    if(StringUtils.isNotEmpty(n.getProjectStage()))n.setProjectStage(dictDataService.selectDictLabel("PROJECT_STAGE",n.getProjectStage()));
+                    if(StringUtils.isNotEmpty(n.getProjectStage())) {
+                        if (StringUtils.isNotEmpty(n.getProjectStatus())&&"1".equals(n.getProjectStatus())) {
+                            n.setProjectStage("终止");
+                        } else if (StringUtils.isNotEmpty(n.getProjectStatus())&&"2".equals(n.getProjectStatus())) {
+                            n.setProjectStage("观望");
+                        } else {
+                            n.setProjectStage(dictDataService.selectDictLabel("PROJECT_STAGE", n.getProjectStage()));
+                        }
+                    }
                     if(StringUtils.isNotEmpty(n.getProjectState()))n.setProjectState(dictDataService.selectDictLabel("PROJECT_STATE",n.getProjectState()));
                     return n;
                 })