企业管理列表优化

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

@@ -161,11 +161,11 @@ public class CompanyController extends BaseController {
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@PostMapping(value = "/page")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
 	public ResponseModel<IPage<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,@RequestBody Company company) {
+                    (value = "size") int size, Company company) {
 		return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,company));
 	}
 

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

@@ -386,5 +386,9 @@ public class ProjectController extends BaseController {
 	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/CompanyServiceImpl.java

@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
+import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.SuperviseRuleMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
@@ -51,6 +55,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
 
     @Autowired
     OrgServiceImpl orgServiceImpl;
+    @Autowired
+    private SuperviseRuleMapper superviseRuleMapper;
 
     /**
      * 列表查询 示例
@@ -64,11 +70,55 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
      * 分页查询+筛选
      */
     @Override
+    @BusinessIdentify
     public IPage<CompanyDto> queryCompanyPage(int current, int size, Company company) {
-        IPage<CompanyDto> page = new Page<>();
+        IPage<Company> page = new Page<>();
         page.setSize(size);
         page.setCurrent(current);
-        return companyMapper.queryCompanyPage(page,company);
+        IPage<CompanyDto> page1 = new Page<>();
+        page1.setSize(size);
+        page1.setCurrent(current);
+        ArrayList<CompanyDto> list = Lists.newArrayList( );
+        String companyType = orgService.getReginParams( ).getBusinessInfo( ).getCompanyType( );
+        Long companySequenceNbr = orgService.getReginParams( ).getBusinessInfo( ).getCompanySequenceNbr( );
+        LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>( );
+        if (!ValidationUtil.isEmpty(companyType)) {
+            if (OrgEnum.监察部门.getKey().equals(companyType)) {
+                wrapper.eq(SuperviseRule::getSuperviseDeptId,companySequenceNbr);
+                List<SuperviseRule> superviseRules = superviseRuleMapper.selectList(wrapper);
+                superviseRules.forEach(s->{
+                    LambdaQueryWrapper<Company> wrapper1 = new LambdaQueryWrapper<>( );
+                    wrapper1.eq(Company::getRegionCode,s.getAdminRegionCode())
+                            .like(!ValidationUtil.isEmpty(company.getName()),Company::getName,company.getName());
+                    IPage<Company> companyIPage = companyMapper.selectPage(page, wrapper1);
+                    companyIPage.getRecords().forEach(company1 -> {
+                        CompanyDto companyDto = new CompanyDto( );
+                        BeanUtils.copyProperties(company1,companyDto);
+                        list.add(companyDto);
+                    });
+                });
+              page1.setRecords(list);
+              return page1;
+            }else if (OrgEnum.监检机构.getKey().equals(companyType)){
+                wrapper.eq(SuperviseRule::getInspectionUnitId,companySequenceNbr);
+                List<SuperviseRule> superviseRules = superviseRuleMapper.selectList(wrapper);
+                superviseRules.forEach(s->{
+                    LambdaQueryWrapper<Company> wrapper1 = new LambdaQueryWrapper<>( );
+                    wrapper1.eq(Company::getRegionCode,s.getAdminRegionCode())
+                            .like(!ValidationUtil.isEmpty(company.getName()),Company::getName,company.getName());
+                    IPage<Company> companyIPage = companyMapper.selectPage(page, wrapper1);
+                    companyIPage.getRecords().forEach(company1 -> {
+                        CompanyDto companyDto = new CompanyDto( );
+                        BeanUtils.copyProperties(company1,companyDto);
+                        list.add(companyDto);
+                    });
+                });
+                page1.setRecords(list);
+                return page1;
+
+            }
+        }
+        return page1;
     }
 
     /**