企业资质提交

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<BasicCorpResponse> basicUnitMaintainEntities;
-        basicUnitMaintainFilterRequest.setCompanyIdFk(Long.parseLong(getCompanyId()));
+        if(StringUtils.isNotEmpty(getCompanyId())){
+            basicUnitMaintainFilterRequest.setCompanyIdFk(Long.parseLong(getCompanyId()));
+        }
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
 
 

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<UserCompanyEntity> 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<UserCompanyEntity> userCompanyEntities = userCompanyService.list(
+                queryWrapper.eq("checkStatus", 1)
+        );
+
+        List<DictDto> reList = userCompanyEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getId().toString(),s.getCompanyName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        PageInfo<DictDto> pageInfo;
+        pageInfo = new PageInfo<>(reList);
+        PageSimpleResponse<DictDto> 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")

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;
 
 }

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")

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<String> auditStatusList;
     private Integer manufacturerStatus;
-
+    @ApiModelProperty(value = "企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构")
+    private Integer bussinessStatus;
 
 }

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -89,7 +89,9 @@
             <if test="companyIdFk != null">
                 AND companyIdFk = #{companyIdFk}
             </if>
-
+            <if test="bussinessStatus != '' and bussinessStatus != null">
+                AND bussinessStatus = #{bussinessStatus}
+            </if>
 
             <if test="outType != null">
                 AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)

src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml

@@ -73,6 +73,9 @@
             <if test="companyIdFk != '' and companyIdFk != null">
                 AND bur.companyIdFk = #{companyIdFk}
             </if>
+            <if test="bussinessStatus != '' and bussinessStatus != null">
+                AND bussinessStatus = #{bussinessStatus}
+            </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh = #{ggxh}
             </if>

src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml

@@ -82,6 +82,9 @@
             <if test="companyName != null and companyName != ''">
                 and companyName like concat('%',#{companyName},'%')
             </if>
+            <if test="bussinessStatus != '' and bussinessStatus != null">
+                AND bussinessStatus = #{bussinessStatus}
+            </if>
             <if test="creditNum != null and creditNum != ''">
                 and creditNum like concat('%',#{creditNum},'%')
             </if>