项目当前登陆的建设单位以及组织机构代码

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

@@ -112,7 +112,7 @@ public class ProjectController extends BaseController {
 	 * @param sequenceNbr 主键
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表")
 	public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) {
@@ -126,7 +126,7 @@ public class ProjectController extends BaseController {
 	 * @param current 每页大小
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "项目信息表分页查询",  notes = "项目信息表分页查询")
 	public ResponseModel<Page<ProjectDto>> queryForPage(
@@ -266,5 +266,17 @@ public class ProjectController extends BaseController {
 	public ResponseModel<ProjectDto> getDetail(Long sequenceNbr){
 		return ResponseHelper.buildResponse(projectServiceImpl.getDetail(sequenceNbr));
 	}
+
+
+	/**
+	 * 查询当前登陆的建设单位和组织机构代码
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "查询当前登陆的建设单位和组织机构代码", notes = "查询当前登陆的建设单位和组织机构代码")
+	@GetMapping(value = "/getConstructionInfo")
+	public ResponseModel <Map> getConstructionInfo(){
+		return ResponseHelper.buildResponse(orgServiceImpl.getConstructionInfo());
+	}
 }
 

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

@@ -18,6 +18,9 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnSer
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -29,6 +32,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 
 import java.util.*;
@@ -229,6 +233,18 @@ public class OrgServiceImpl {
         }
         return map;
     }
+    /**
+     * 获取当前登陆人的建设单位和建设单位的组织机构代码
+     * @return
+     */
+    @BusinessIdentify
+    public Map getConstructionInfo(){
+        ReginParams reginParams = getReginParams();
+        ReginParams.BusinessInfo businessInfo = reginParams.getBusinessInfo();
+        Long companySequenceNbr = businessInfo.getCompanySequenceNbr();
+        return getdetialInfo(String.valueOf(companySequenceNbr));
+    }
+
 
     /**
      * 获取当前登陆人所在公司/单位/企业 下的 所有焊工人员