diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index fea3a66..b747ec2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -21,6 +21,7 @@ import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.sup.UserCompanyService; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -55,7 +56,9 @@ public class BasicCorpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicUnitMaintainEntities; - basicUnitMaintainFilterRequest.setCompanyIdFk(Long.parseLong(getCompanyId())); + if(StringUtils.isNotEmpty(getCompanyId())){ + basicUnitMaintainFilterRequest.setCompanyIdFk(Long.parseLong(getCompanyId())); + } basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java index f168752..479e4b3 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java @@ -11,6 +11,7 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.TyCompanySearchEntity; import com.glxp.api.entity.sup.UserCompanyEntity; @@ -42,6 +43,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 客户端企业信息 @@ -89,6 +91,44 @@ public class UserComanyController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @ApiOperation(value = "查询用户企业信息(关键字搜索)", response = UserCompanyEntity.class) + @AuthRuleAnnotation("udi/auth/user/comapny/searchOptimize") + @GetMapping("udi/auth/user/comapny/searchOptimize") + public BaseResponse searchOptimize(FilterUserComapanyRequest filterUserComapanyRequest) { + //获取部门id + if (filterUserComapanyRequest.getSearchKey() == null) { + filterUserComapanyRequest.setSearchKey(""); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (StringUtils.isNotBlank(filterUserComapanyRequest.getSearchKey()) && !"null".equals(filterUserComapanyRequest.getSearchKey())) { + queryWrapper.like("companyName", filterUserComapanyRequest.getSearchKey()); + } + if (StringUtils.isNotBlank(filterUserComapanyRequest.getCreditNum()) && !"null".equals(filterUserComapanyRequest.getCreditNum())) { + queryWrapper.eq("creditNum", filterUserComapanyRequest.getCreditNum()); + } + if (StringUtils.isNotBlank(filterUserComapanyRequest.getBussinessStatus()) && !"null".equals(filterUserComapanyRequest.getBussinessStatus())) { + queryWrapper.eq("bussinessStatus", filterUserComapanyRequest.getBussinessStatus()); + } + List userCompanyEntities = userCompanyService.list( + queryWrapper.eq("checkStatus", 1) + ); + + List reList = userCompanyEntities.stream().map(s-> { + DictDto dictDto = new DictDto(s.getId().toString(),s.getCompanyName()); + return dictDto; + }).collect(Collectors.toList()); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(reList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(reList); + + + return ResultVOUtils.success(pageSimpleResponse); + } + + @ApiOperation(value = "查询用户企业信息", response = UserCompanyEntity.class) @AuthRuleAnnotation("") @GetMapping("udi/auth/user/comapny/filterCompanyName") diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 978a95f..084a887 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -50,5 +50,7 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private Long companyIdFk; @ApiModelProperty(value = "注册企业") private String companyName; + @ApiModelProperty(value = "企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构") + private Integer bussinessStatus; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 8d0acdc..3028338 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -20,6 +20,8 @@ public class FilterUdiRelRequest extends ListPageRequest { private String nameCode; @ApiModelProperty(value = "公司类型") private Integer companyType; + @ApiModelProperty(value = "企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构") + private Integer bussinessStatus; @ApiModelProperty(value = "uuid") private String uuid; @ApiModelProperty(value = "原始UUID") diff --git a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java index d25a5f2..aba36b4 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java @@ -2,6 +2,7 @@ package com.glxp.api.req.purchase; import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -23,6 +24,7 @@ public class FilterUserCompanyRequest extends ListPageRequest { private String lastUpdateTime; private List auditStatusList; private Integer manufacturerStatus; - + @ApiModelProperty(value = "企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构") + private Integer bussinessStatus; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 88beb3f..f3bcce1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -89,7 +89,9 @@ AND companyIdFk = #{companyIdFk} - + + AND bussinessStatus = #{bussinessStatus} + AND (outType ]]> #{outType} or outType is NULL) diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml index 0e4c6e8..650978f 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml @@ -73,6 +73,9 @@ AND bur.companyIdFk = #{companyIdFk} + + AND bussinessStatus = #{bussinessStatus} + AND ggxh = #{ggxh} diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index 1caeca5..374765e 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -82,6 +82,9 @@ and companyName like concat('%',#{companyName},'%') + + AND bussinessStatus = #{bussinessStatus} + and creditNum like concat('%',#{creditNum},'%')