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

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

@@ -127,5 +127,53 @@ public class UserCertEntity implements Serializable {
     @TableField(exist = false)
     private String key;
 
+    /**
+     * 配送企业ID外键
+     */
+    @TableField("CustomerId")
+    private String customerId;
+
+    /**
+     * 有效期
+     */
+    @TableField("vailDate")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date vailDate;
+
+
+    @TableField("remark1")
+    private String remark1;
+
+    /**
+     * 证书类型：1:供应商；2.生产企业；3.产品品种
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 生产企业ID外键
+     */
+    @TableField("manufacturerIdFk")
+    private String manufacturerIdFk;
+
+    /**
+     * 产品证书ID外键
+     */
+    @TableField("productIdFk")
+    private String productIdFk;
+
+    /**
+     * 审核状态
+     */
+    @TableField("auditStatus")
+    private Integer auditStatus;
+
+    /**
+     * 审核说明
+     */
+    @TableField("auditComment")
+    private String auditComment;
+
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -117,6 +117,13 @@ public class certRequest extends ListPageRequest {
     @ApiModelProperty(value = "更新时间")
     @TableField(value = "updateTime")
     private Date updateTime;
+    private String customerId;
 
+    private String manufacturerIdFk;
+    private String productIdFk;
+    private Integer auditStatus;
+    private Integer type;
+
+    private String lastUpdateTime;
     private static final long serialVersionUID = 1L;
 }

src/main/resources/mybatis/mapper/sup/UserCertMapper.xml

@@ -31,12 +31,33 @@
         FROM user_cert_set c LEFT JOIN
 		(SELECT * from user_cert WHERE businessId=#{registerId}) a ON c.name = a.name
     </select>
-  <select id="filterCompanyCert" parameterType="com.glxp.api.req.purchase.certRequest"
+  <select id="filterCompanyCert" parameterType="com.glxp.api.req.purchase.FilterSupCertRequest"
           resultType="com.glxp.api.entity.sup.UserCertEntity">
-    select * from user_cert
+    select * from sup_cert
     <where>
-      <if test="businessId != '' and businessId!=null">
-        and businessId = #{businessId}
+      <if test="customerId != '' and customerId!=null">
+        and customerId = #{customerId}
+      </if>
+      <if test="manufacturerIdFk != '' and manufacturerIdFk!=null">
+        and manufacturerIdFk = #{manufacturerIdFk}
+      </if>
+      <if test="productIdFk != '' and productIdFk!=null">
+        and productIdFk = #{productIdFk}
+      </if>
+      <if test="type != '' and type!=null">
+        and `type` = #{type}
+      </if>
+      <if test="auditStatus != null  and auditStatus !=20 and auditStatus !=24 and auditStatus !=25" >
+        and auditStatus = #{auditStatus}
+      </if>
+      <if test="auditStatus ==20">
+        and (auditStatus = 1 or auditStatus=4)
+      </if>
+      <if test="auditStatus ==24">
+        and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6)
+      </if>
+      <if test="auditStatus ==25">
+        and (auditStatus !=0)
       </if>
 
     </where>