增加地图接口

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

@@ -916,5 +916,12 @@ public class ProjectController extends BaseController {
 		return ResponseHelper.buildResponse(projectServiceImpl.queryUserByRoleId(roleId));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/getProjectWeld")
+	@ApiOperation(httpMethod = "get", value = "项目和焊口信息", notes = "项目和焊口信息")
+	public ResponseModel<Map<String,Object>> getProjectWeld(@RequestParam("projectId") String projectId){
+		return ResponseHelper.buildResponse(projectServiceImpl.getProjectWeld(projectId));
+	}
+
 }
 

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

@@ -18,10 +18,7 @@ import com.yeejoin.amos.boot.module.ugp.api.Enum.WhetherItPassEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.SuperviseRuleMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.*;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectService;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -61,6 +58,9 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     ProjectMapper projectMapper;
 
     @Autowired
+    WeldMapper weldMapper;
+
+    @Autowired
     ProjectResourceServiceImpl projectResourceService;
 
     @Autowired
@@ -1005,4 +1005,16 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         }
         return list;
     }
+
+    public Map<String,Object> getProjectWeld(String projectId) {
+        HashMap<String, Object> maps = new HashMap<>();
+        Project project = projectMapper.selectById(projectId);
+        maps.put("project",project);
+        LambdaQueryWrapper<Weld> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(Weld::getProjectId,projectId);
+        List<Weld> weldList = weldMapper.selectList(objectLambdaQueryWrapper);
+        maps.put("weld",weldList);
+        return maps;
+    }
+
 }
\ No newline at end of file