企业资质审核代码更新备份

src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModel;
@@ -105,6 +106,241 @@ public class UserCompanyEntity implements Serializable {
     private String reason;
 
 
+    private String customerId;
+
+    private String classes;
+
+    /**
+     * 地址
+     */
+    private String area;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddr;
+
+    /**
+     * 应用码x
+     */
+    private String appId;
+
+    /**
+     * 授权码x
+     */
+    private String appSecret;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 电话
+     */
+    private String tel;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    private String areaCode;
+
+    /**
+     * 企业唯一标识x
+     */
+    private String refEntId;
+
+    /**
+     * 企业IDx
+     */
+    private String entId;
+
+    /**
+     * 入网标识【0非入网1入网2入驻马上放心】x
+     */
+    private Integer networkType;
+
+    /**
+     * 绑定appkey外键IDx
+     */
+    private Integer certIdFk;
+
+    /**
+     * 所属总部x
+     */
+    private String parentCompany;
+
+    /**
+     * 所属总部Idx
+     */
+    private String parentIdFk;
+
+    /**
+     * 法人证件类型：1：身份证
+     */
+    private String contactsPapersType;
+
+    /**
+     * 法人证件号码
+     */
+    private String contactsPapersCode;
+
+    /**
+     * 登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出
+     */
+    private String registerStatus;
+
+    /**
+     * 经营许可证号（Ⅲ类）
+     */
+    private String jyxkzh;
+
+    /**
+     * 经营许可证发证机关
+     */
+    private String jyxkzfzjg;
+
+    /**
+     * 经营许可证有效期至
+     */
+    private LocalDate jyxkzyxq;
+
+    /**
+     * 经营备案凭证号（Ⅱ类）
+     */
+    private String jybapzh;
+
+    /**
+     * 经营备案部门
+     */
+    private String jybabm;
+
+    /**
+     * 发证日期
+     */
+    @TableField("fzrq")
+    private Date fzrq;
+
+    /**
+     * 税号
+     */
+    private String suihao;
+
+    /**
+     * 开户行
+     */
+    private String kaihuhang;
+
+    /**
+     * 开户账号
+     */
+    private String kaihuzhanghao;
+
+    /**
+     * 审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过
+     */
+    private Integer auditStatus;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件路径
+     */
+    private String filePath2;
+
+    /**
+     * 文件路径
+     */
+    private String filePath3;
+
+    /**
+     * 文件路径
+     */
+    private String filePath4;
+
+    /**
+     * 往来单位外键
+     */
+    private String unitIdFk;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 审核意见
+     */
+    private String auditComment;
+
+    /**
+     * 保存状态（1.草稿保存，2.已提交保存)
+     */
+
+    private Integer editStatus;
+
+
+
+    /**
+     * 备注
+     */
+
+    private String remark;
+
+    /**
+     * 创建人
+     */
+
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+
+    private Date updateTime;
+
+
+    private String auditor;
+
+
+    private String roleId;
+
+
+    @TableField(exist = false)
+    private String failCout;
+    @TableField(exist = false)
+    private String passCout;
+    @TableField(exist = false)
+    private String productFailCout;
+    @TableField(exist = false)
+    private String prouctPassCout;
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -114,8 +114,17 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private Boolean groupBuy;
     @ApiModelProperty(value = "企业id")
     private Long companyId;
-
+    private String productStatus;
     private String companyIdFk;
     private String burId;
+    private String manufacturerId;
+
+    private String creditCode;
+    private String placeArea;
+
+    private Integer auditStatus;
+
+    private Integer type;
+
 
 }

src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class FilterUserCompanyRequest extends ListPageRequest {
 
     private String id;
-//    private String customerId;
+    private String customerId;
     private String companyName;
     private String creditNum;
     private Integer checkStatus;
@@ -18,8 +18,11 @@ public class FilterUserCompanyRequest extends ListPageRequest {
     private String registerAddress;
 
 
+    private Integer auditStatus;
+    private String unitIdFk;
     private String lastUpdateTime;
     private List<String> auditStatusList;
     private Integer manufacturerStatus;
 
+
 }

src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
 import com.glxp.api.req.purchase.FilterSupManufacturerRequest;
 
+
 import java.util.List;
 
 public interface SupManufacturerService extends IService<SupManufacturerEntity> {

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

@@ -162,6 +162,58 @@
         </where>
         ORDER BY bur.updateTime DESC
     </select>
+<!--    <select id="filterBasicList" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"-->
+<!--            resultType="com.glxp.api.res.basic.BasicUdiRelResponse">-->
+<!--        SELECT sup_manufacturer.* ,user_company.companyName as supName-->
+<!--        <if test="productStatus!=null">-->
+<!--            ,(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as failCout,-->
+<!--            (SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId  AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk  ) as passCout-->
+<!--        </if>-->
+<!--        FROM sup_manufacturer-->
+<!--        inner join user_company on sup_manufacturer.customerId = user_company.customerId-->
+<!--        <where>-->
+<!--            <if test="id != null and id != '' and type==null">-->
+<!--                and id = #{id}-->
+<!--            </if>-->
+<!--            <if test="manufacturerId != null and manufacturerId != ''">-->
+<!--                and manufacturerId = #{manufacturerId}-->
+<!--            </if>-->
+<!--            <if test="companyName != null and companyName != ''">-->
+<!--                and sup_manufacturer.companyName like concat('%',#{companyName},'%')-->
+<!--            </if>-->
+<!--            <if test="creditCode != null and creditCode != ''">-->
+<!--                and creditCode like concat('%',#{creditCode},'%')-->
+<!--            </if>-->
+<!--            <if test="placeArea != null and placeArea != ''">-->
+<!--                and placeArea like concat('%',#{placeArea},'%')-->
+<!--            </if>-->
+<!--            <if test="customerId != null and customerId != ''">-->
+<!--                and sup_manufacturer.customerId = #{customerId}-->
+<!--            </if>-->
+
+<!--            <if test="auditStatus != null and auditStatus !=20  and auditStatus !=21 and auditStatus !=22">-->
+<!--                and sup_manufacturer.auditStatus = #{auditStatus}-->
+<!--            </if>-->
+
+<!--            <if test="auditStatus ==20">-->
+<!--                and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus=5 or-->
+<!--                sup_manufacturer.auditStatus=2)-->
+<!--            </if>-->
+<!--            <if test="auditStatus ==21">-->
+<!--                and <![CDATA[ sup_manufacturer.auditStatus <> 0 ]]>-->
+<!--            </if>-->
+
+<!--            <if test="auditStatus ==22">-->
+<!--                and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )-->
+<!--            </if>-->
+<!--            <if test="lastUpdateTime!=null and lastUpdateTime!=''">-->
+<!--                <![CDATA[   and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>-->
+<!--            </if>-->
+<!--            <if test="type != null">-->
+<!--                and id != #{id}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
 
 
     <select id="findByNameCode" parameterType="java.lang.String"

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

@@ -61,8 +61,14 @@
             resultType="com.glxp.api.entity.sup.UserCompanyEntity">
         SELECT
         *
-
+        <if test="manufacturerStatus!=null">
+        ,(SELECT count(*) FROM sup_manufacturer WHERE user_company.customerId=sup_manufacturer.customerId AND sup_manufacturer.auditStatus!=1 AND sup_manufacturer.auditStatus!=0  AND sup_manufacturer.auditStatus!=4 ) as failCout,
+        (SELECT count(*) FROM sup_manufacturer WHERE user_company.customerId=sup_manufacturer.customerId AND (sup_manufacturer.auditStatus=1  OR sup_manufacturer.auditStatus=4) ) as passCout
+        ,(SELECT count(*) FROM sup_product WHERE user_company.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 ) as productFailCout,
+        (SELECT count(*) FROM sup_product WHERE user_company.customerId=sup_product.customerId  AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4)  ) as prouctPassCout
+        </if>
         FROM user_company
+--         left JOIN basic_udi_product p on bur.uuid = p.uuid
         <where>
             checkStatus=1
             and bussinessStatus =1