diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java index 87ceb2ac2..7116dd170 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java @@ -67,13 +67,29 @@ public class ProjectEnterpriseController { return Result.success(pageList); } + @ApiOperation(value = "分页列表查询项目关联的劳务公司信息", notes = "分页列表查询项目关联的劳务公司信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "enterpriseTypeId", value = "企业类型ID", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "enterpriseName", value = "劳务公司名称", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目sn或企业sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "cbsProjectType", value = "项目类型(字典)", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "isCountMainEnterprise", value = "1是总包", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/allList") + public Result> queryPageListAll(@RequestBody Map map) { + IPage pageList = projectEnterpriseService.selectProjectEnterprisePage(map); + return Result.success(pageList); + } + @ApiOperation(value = "列表查询项目关联的劳务公司信息", notes = "列表查询项目关联的劳务公司信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "enterpriseName", value = "劳务公司名称", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "sn", value = "项目sn或企业sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectList") - public Result> selectProjectEnterpriseList(@RequestBody Map map) { + public Result> selectProjectEnterpriseList(@RequestBody Map map) { List pageList = projectEnterpriseService.selectProjectEnterpriseList(map); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 1157a8fa8..a8e2ba0e7 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -80,6 +80,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() //请求路径允许访问 + .antMatchers("/xmgl/projectEnterprise/allList").permitAll() .antMatchers("/xmgl/constructionEquipmentTool/flow/add").permitAll() .antMatchers("/xmgl/xzSupplierQualificationApply/flow/start/token").permitAll() .antMatchers("/xmgl/xzSupplierQualificationApply/flow/saveInfo").permitAll() diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 9aabe7f6d..907bb84f3 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -100,3 +100,5 @@ magic-api.resource.location=C:/jxj/prod/backEnd/itbgpImage/data/magic-api upload.image.url.prefix=http://182.90.224.237:51234/image/ #内网的服务图片的url前缀 xingzong.inner.upload.image.url.prefix=http://10.168.2.104:9809/image/ +#承包商重新提交申请链接(点击链接补充资质) +supplierResubmitApplicationUrl=http://192.168.34.175:88/#/workspace/contractorApply