企业资质审核代码更新完善

2 years ago · c522111c58
parent 5c703b5877
commit c522111c58
7 changed files with 213 additions and 12 deletions
--- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
@ -23,21 +23,20 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.purchase.FilterCertSetsRequest;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
+import com.glxp.api.req.purchase.FilterUserCompanyRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.purchase.SupProductResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.auth.AuthRoleAdminService;
 import com.glxp.api.service.auth.CustomerInfoService;
 import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.purchase.*;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@ -68,6 +67,20 @@ public class SupCompanyController {
    CustomerInfoService customerInfoService;
    @Resource
    BasicCorpService basicCorpService;
+
+    //资质审核查询数据
+    @AuthRuleAnnotation("")
+    @GetMapping("/api/pur/getSupComapnys")
+    public BaseResponse getComapnys(FilterUserCompanyRequest userCompanyRequest) {
+
+        List<UserCompanyEntity> userCompanyEntities=companyService.filterUserCompany(userCompanyRequest);
+        PageInfo<UserCompanyEntity> pageInfo = new PageInfo<>(userCompanyEntities);
+        PageSimpleResponse<UserCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(userCompanyEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
    @AuthRuleAnnotation("")
    @GetMapping("/directToCpt/api/pur/getSupComapnys")
    public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) {
--- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java
+++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java
@ -4,7 +4,9 @@ package com.glxp.api.dao.purchase;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
+import com.glxp.api.req.purchase.FilterUserCompanyRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@ -23,17 +25,19 @@ public interface SupCompanyDao extends BaseMapperPlus<SupCompanyDao, SupCompanyE

    List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest);

+    List<UserCompanyEntity> filterUserCompany(FilterUserCompanyRequest companyRequest);
+
    boolean modifyCompany(SupCompanyEntity companyEntity);

    boolean insertCompany(SupCompanyEntity companyEntity);

    boolean deleteCompany(String customerId);

-    /**
-     * 根据ID查询企业名称
-     *
-     * @param customerId
-     * @return
-     */
-    String selectNameByCustomerId(@Param("customerId") String customerId);
+//    /**
+//     * 根据ID查询企业名称
+//     *
+//     * @param customerId
+//     * @return
+//     */
+//    String selectNameByCustomerId(@Param("customerId") String customerId);
 }
--- a/src/main/java/com/glxp/api/entity/purchase/UserCompanyEntity.java
+++ b/src/main/java/com/glxp/api/entity/purchase/UserCompanyEntity.java
@ -0,0 +1,117 @@
+package com.glxp.api.entity.purchase;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 作者
+ * @since 2023-02-07
+ */
+@TableName("user_company")
+@Data
+public class UserCompanyEntity {
+
+    @TableId("customerId")
+    private String customerId;
+
+    /**
+     * 企业名称
+     */
+    @TableField("companyName")
+    private String companyName;
+
+    /**
+     * 企业类型 1生产企业,2流通企业,3,医疗机构.4.监管机构
+     */
+    @TableField("bussinessStatus")
+    private Integer bussinessStatus;
+
+
+
+    @TableField("checkStatus")
+    private Integer checkStatus;
+
+    /**
+     * 统一社会信用代码
+     */
+    @TableField("creditNum")
+    private String creditNum;
+
+
+
+    /**
+     * 注册地址
+     */
+    @TableField("registerAddress")
+    private String registerAddress;
+
+    /**
+     * 注册时间
+     */
+    @TableField("registerTime")
+    private Date registerTime;
+
+    /**
+     * 法人名称
+     */
+    @TableField("legalPerson")
+    private String legalPerson;
+
+    /**
+     *
+     * 法人身份证
+     */
+    @TableField("legalIdCard")
+    private String legalIdCard;
+
+
+    /**
+     * 联系电话
+     */
+    @TableField("contactWay")
+    private String contactWay;
+
+    /**
+     * 备注
+     */
+    @TableField("comments")
+    private String comments;
+
+    /**
+     * 邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    @TableField("areaCode")
+    private String areaCode;
+
+    /**
+     * 审核状态 0 未提交/3 已提交未审核/1 审核通过/2 审核未通过
+     */
+    @TableField("status")
+    private String status;
+
+    @TableField(exist = false)
+    private String failCout;
+    @TableField(exist = false)
+    private String passCout;
+    @TableField(exist = false)
+    private String productFailCout;
+    @TableField(exist = false)
+    private String prouctPassCout;
+    @TableField(exist = false)
+    private String roleId;
+    private String reason;
+
+
+}
--- a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java
@ -0,0 +1,24 @@
+package com.glxp.api.req.purchase;
+
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterUserCompanyRequest extends ListPageRequest {
+
+    private String customerId;
+    private String companyName;
+    private String creditNum;
+    private Integer checkStatus;
+    //地址
+    private String registerAddress;
+
+
+    private String lastUpdateTime;
+    private List<String> auditStatusList;
+    private Integer manufacturerStatus;
+
+}
--- a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java
+++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java
@ -4,7 +4,9 @@ package com.glxp.api.service.purchase;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
+import com.glxp.api.req.purchase.FilterUserCompanyRequest;

 import java.util.List;

@ -12,6 +14,7 @@ public interface SupCompanyService extends IService<SupCompanyEntity> {

 //    SupCompanyEntity findCompanyByUnitFk(String unitFk);

+    List<UserCompanyEntity> filterUserCompany(FilterUserCompanyRequest companyRequest);
    List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest);

    SupCompanyEntity findCompany(String CustomerId);
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.SupCompanyDao;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
+import com.glxp.api.req.purchase.FilterUserCompanyRequest;
 import com.glxp.api.service.purchase.SupCompanyService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@ -15,12 +17,12 @@ import java.util.List;

@Service
@Transactional(rollbackFor = Exception.class)
-public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyEntity> implements SupCompanyService {
+public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao, SupCompanyEntity> implements SupCompanyService {

    @Resource
    SupCompanyDao supCompanyDao;

-//    @Override
+    //    @Override
 //    public SupCompanyEntity findCompanyByUnitFk(String unitFk) {
 //        FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
 //        filterSupCompanyRequest.setUnitIdFk(unitFk);
@ -30,6 +32,17 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyE
 //        }
 //        return null;
 //    }
+    @Override
+    public List<UserCompanyEntity> filterUserCompany(FilterUserCompanyRequest companyRequest) {
+        if (companyRequest == null) {
+            return Collections.emptyList();
+        }
+        if (companyRequest.getPage() != null) {
+            int offset = (companyRequest.getPage() - 1) * companyRequest.getLimit();
+            PageHelper.offsetPage(offset, companyRequest.getLimit());
+        }
+        return supCompanyDao.filterUserCompany(companyRequest);
+    }

    @Override
    public List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest) {
--- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
@ -57,6 +57,33 @@
            </if>
        </where>
    </select>
+    <select id="filterUserCompany" parameterType="com.glxp.api.req.purchase.FilterUserCompanyRequest"
+            resultType="com.glxp.api.entity.purchase.UserCompanyEntity">
+        SELECT
+        *
+
+        FROM user_company
+        <where>
+            checkStatus=1
+            and bussinessStatus =1
+            <if test="companyName != null and companyName != ''">
+                and companyName like concat('%',#{companyName},'%')
+            </if>
+            <if test="creditNum != null and creditNum != ''">
+                and creditNum like concat('%',#{creditNum},'%')
+            </if>
+
+
+
+
+        </where>
+    </select>
+
+
+
+
+
+
    <delete id="deleteCompany" parameterType="java.lang.String">
        delete
        from sup_company