ugp接口提交

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

@@ -71,6 +71,8 @@ public class ProjectController extends BaseController {
 	EquipmentServiceImpl equipmentService;
 	@Autowired
 	AttachmentServiceImpl attachmentServiceImpl;
+	@Autowired
+	ProjectResourceServiceImpl projectResourceServiceImpl;
 
 
 	/**
@@ -409,6 +411,23 @@ public class ProjectController extends BaseController {
 		return ResponseHelper.buildResponse(projectServiceImpl.projectSchedule());
 	}
 
+	/**
+	 * 项目进度
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "项目进度", notes = "项目进度")
+	@GetMapping(value = "/getProjectNumber")
+	public ResponseModel<Map> getProjectNumber(){
+		Map<String, Integer> map = new HashMap<>();
+		map.put("num",0);
+		List<Project> projects = projectResourceServiceImpl.getProjectList();
+		if(!ValidationUtil.isEmpty(projects)){
+			map.put("num",projects.size());
+		}
+		return ResponseHelper.buildResponse(map);
+	}
+
 
 	/**
 	 * 项目概况

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

@@ -216,9 +216,9 @@ public class WeldController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @GetMapping(value = "/getWeldList")
+    @GetMapping(value = "/getWeldList/{projectId}")
     @ApiOperation(httpMethod = "GET", value = "获取焊口定位信息", notes = "获取焊口定位信息")
-    public ResponseModel<List<Weld>> getWeldList(@RequestParam( value = "projectId",required = false )String projectId){
+    public ResponseModel<List<Weld>> getWeldList(@PathVariable( value = "projectId")String projectId){
         return ResponseHelper.buildResponse(weldServiceImpl.list(new LambdaQueryWrapper<Weld>().eq(Weld::getProjectId,projectId)));
     }