Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
@@ -126,11 +127,9 @@ public class CompanyController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
 	public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<CompanyDto> page = new Page<CompanyDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(companyServiceImpl.queryForCompanyPage(page));
+                    (value = "size") int size,String name) {
+
+		return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,name));
 	}
 
 	/**
@@ -152,14 +151,9 @@ public class CompanyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "Post",value = "修改企业信息",   notes = "修改企业信息")
 	@PostMapping(value = "/modifyCompanyInfo")
-	public ResponseModel<String> modifyCompanyInfo(@RequestBody CompanyDto company) throws Exception {
-
-
-
-		companyServiceImpl.updateById(company.getCompany());
-
-		return ResponseHelper.buildResponse("ok");
+	public ResponseModel<Boolean> modifyCompanyInfo(@RequestBody CompanyDto company) {
 
+		return ResponseHelper.buildResponse(companyServiceImpl.updateById(company.getCompany()));
 
 	}
 	/**
@@ -171,15 +165,9 @@ public class CompanyController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "查看企业信息详情",   notes = "查看企业信息详情")
 	@GetMapping(value = "/getCompanyInfo")
 	public ResponseModel<Company> getCompanyInfo(Company companyList)  {
-//		Company company;
-//		QueryWrapper<Company> lambdaQueryWrapper=new QueryWrapper<>();
-//		lambdaQueryWrapper.eq("name",companyList.getName());
-//		company= companyMapper.selectOne(lambdaQueryWrapper);
-
 
 		return ResponseHelper.buildResponse(companyMapper.selectById(companyList));
 
-
 	}
 	/**
 	 * 企业审核

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

@@ -9,7 +9,9 @@ import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import org.apache.lucene.queryparser.flexible.messages.Message;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +20,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 /**
  * 企业信息表服务实现类
@@ -29,12 +32,6 @@ import java.util.Locale;
 public class CompanyServiceImpl extends BaseService<CompanyDto, Company, CompanyMapper> implements ICompanyService {
     @Autowired
     CompanyMapper companyMapper;
-    /**
-     * 分页查询
-     */
-    public Page<CompanyDto> queryForCompanyPage(Page<CompanyDto> page) {
-        return this.queryForPage(page, null, false);
-    }
 
     /**
      * 列表查询 示例
@@ -44,10 +41,20 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
     }
 
 
-    @Override
-    public void modifyCompanyInfo(Company companyList)throws Exception {
-
-
-
+    /**
+     * 分页查询+筛选
+     */
+    public Page<CompanyDto> queryCompanyPage(int current, int size, String name) {
+        Page<CompanyDto> page = new Page<>();
+        page.setSize(size);
+        page.setCurrent(current);
+        Page<CompanyDto> page1 = queryForPage(page, null, false);
+
+        if (name != null) {
+            List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(name)).collect(Collectors.toList());
+            page1.setRecords(collect);
+        }
+
+        return page1;
     }
 }
\ No newline at end of file