优化资料提交时的提示语

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
@@ -356,7 +357,15 @@ public class ProjectController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "添加附件", notes = "添加附件")
 	@PostMapping(value = "/saveOrUpdateFile")
 	public ResponseModel<String> saveOrUpdateFile(@RequestBody JSONObject jsonObject){
-		return ResponseHelper.buildResponse(projectServiceImpl.saveOrUpdateFile(jsonObject));
+		String type = projectServiceImpl.saveOrUpdateFile(jsonObject);
+		if ("over".equals(type)) {
+			CommonResponseUtil.success(type,"提交成功！");
+		} else if ("fail".equals(type)) {
+			CommonResponseUtil.failure("资料尚未添加完成，不能提交！");
+		} else {
+			return CommonResponseUtil.success(type,"保存成功！");
+		}
+		return ResponseHelper.buildResponse(type);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -249,10 +249,14 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             }
         }
 
+        //若为null则为保存 不执行流程
         String type = jsonObject.getString("type");
-        if (type != null) {
+        if (!ValidationUtil.isEmpty(type)) {
             if (design && install) {
                 projectInitiationService.execute(project.getInstanceId(), projectDto, "1");
+                return "over";
+            }else {
+                return "fail";
             }
         }
         return "ok";