权星相关接口修复

mall-mbg/src/main/java/com/macro/mall/model/PmsSupplierAudit.java

@@ -43,6 +43,9 @@ public class PmsSupplierAudit implements Serializable {
     @ApiModelProperty(value = "审核状态  0待审核 1审核通过 2审核不通过")
     private Integer status;
 
+    @ApiModelProperty(value = "主营产品")
+    private String mainProduct;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -153,6 +156,14 @@ public class PmsSupplierAudit implements Serializable {
         this.status = status;
     }
 
+    public String getMainProduct() {
+        return mainProduct;
+    }
+
+    public void setMainProduct(String mainProduct) {
+        this.mainProduct = mainProduct;
+    }
+
     public String getRemarks() {
         return remarks;
     }
@@ -218,6 +229,7 @@ public class PmsSupplierAudit implements Serializable {
         sb.append(", phone=").append(phone);
         sb.append(", password=").append(password);
         sb.append(", status=").append(status);
+        sb.append(", mainProduct=").append(mainProduct);
         sb.append(", remarks=").append(remarks);
         sb.append(", memberId=").append(memberId);
         sb.append(", deleteStatus=").append(deleteStatus);

mall-mbg/src/main/java/com/macro/mall/model/PmsSupplierAuditExample.java

@@ -855,6 +855,76 @@ public class PmsSupplierAuditExample {
             return (Criteria) this;
         }
 
+        public Criteria andMainProductIsNull() {
+            addCriterion("main_product is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductIsNotNull() {
+            addCriterion("main_product is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductEqualTo(String value) {
+            addCriterion("main_product =", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductNotEqualTo(String value) {
+            addCriterion("main_product <>", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductGreaterThan(String value) {
+            addCriterion("main_product >", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductGreaterThanOrEqualTo(String value) {
+            addCriterion("main_product >=", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductLessThan(String value) {
+            addCriterion("main_product <", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductLessThanOrEqualTo(String value) {
+            addCriterion("main_product <=", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductLike(String value) {
+            addCriterion("main_product like", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductNotLike(String value) {
+            addCriterion("main_product not like", value, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductIn(List<String> values) {
+            addCriterion("main_product in", values, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductNotIn(List<String> values) {
+            addCriterion("main_product not in", values, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductBetween(String value1, String value2) {
+            addCriterion("main_product between", value1, value2, "mainProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainProductNotBetween(String value1, String value2) {
+            addCriterion("main_product not between", value1, value2, "mainProduct");
+            return (Criteria) this;
+        }
+
         public Criteria andRemarksIsNull() {
             addCriterion("remarks is null");
             return (Criteria) this;

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsSupplierAuditMapper.xml

@@ -13,6 +13,7 @@
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="main_product" jdbcType="VARCHAR" property="mainProduct" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
     <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
@@ -80,8 +81,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, brand_name, company_name, business_license, business, trademark, other_materials, 
-    phone, password, status, remarks, member_id, delete_status, audit_by, createtime, 
-    updatetime
+    phone, password, status, main_product, remarks, member_id, delete_status, audit_by, 
+    createtime, updatetime
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.PmsSupplierAuditExample" resultMap="BaseResultMap">
     select
@@ -120,15 +121,15 @@
     insert into pms_supplier_audit (name, brand_name, company_name, 
       business_license, business, trademark, 
       other_materials, phone, password, 
-      status, remarks, member_id, 
-      delete_status, audit_by, createtime, 
-      updatetime)
+      status, main_product, remarks, 
+      member_id, delete_status, audit_by, 
+      createtime, updatetime)
     values (#{name,jdbcType=VARCHAR}, #{brandName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{businessLicense,jdbcType=VARCHAR}, #{business,jdbcType=VARCHAR}, #{trademark,jdbcType=VARCHAR}, 
       #{otherMaterials,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{memberId,jdbcType=BIGINT}, 
-      #{deleteStatus,jdbcType=INTEGER}, #{auditBy,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, 
-      #{updatetime,jdbcType=TIMESTAMP})
+      #{status,jdbcType=INTEGER}, #{mainProduct,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
+      #{memberId,jdbcType=BIGINT}, #{deleteStatus,jdbcType=INTEGER}, #{auditBy,jdbcType=BIGINT}, 
+      #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.PmsSupplierAudit">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -166,6 +167,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="mainProduct != null">
+        main_product,
+      </if>
       <if test="remarks != null">
         remarks,
       </if>
@@ -216,6 +220,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="mainProduct != null">
+        #{mainProduct,jdbcType=VARCHAR},
+      </if>
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
@@ -278,6 +285,9 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
+      <if test="record.mainProduct != null">
+        main_product = #{record.mainProduct,jdbcType=VARCHAR},
+      </if>
       <if test="record.remarks != null">
         remarks = #{record.remarks,jdbcType=VARCHAR},
       </if>
@@ -314,6 +324,7 @@
       phone = #{record.phone,jdbcType=VARCHAR},
       password = #{record.password,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
+      main_product = #{record.mainProduct,jdbcType=VARCHAR},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       member_id = #{record.memberId,jdbcType=BIGINT},
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
@@ -357,6 +368,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="mainProduct != null">
+        main_product = #{mainProduct,jdbcType=VARCHAR},
+      </if>
       <if test="remarks != null">
         remarks = #{remarks,jdbcType=VARCHAR},
       </if>
@@ -390,6 +404,7 @@
       phone = #{phone,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
+      main_product = #{mainProduct,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
       member_id = #{memberId,jdbcType=BIGINT},
       delete_status = #{deleteStatus,jdbcType=INTEGER},