专家库和供应商去掉采购品种和供应商类型

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseExpertVo.java

@@ -87,12 +87,6 @@ public class BaseExpertVo {
     private String majorGrade;
 
 
-    /**
-     * 采购品种名
-     */
-    @ApiModelProperty(value = "采购品种名，多个使用英文逗号分隔")
-    private String varietyPurchaseName;
-
     /**
      * 职称
      */

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResVo.java

@@ -325,10 +325,6 @@ public class PmDemandResVo extends BaseEntity
      * 抽取专家名称
      */
     private String expertNameStr;
-    /**
-     * 抽取专家的采购品种
-     */
-    private String varietyPurchaseStr;
     /**
      * 抽取时间
      */

purchase-system/src/main/resources/mapper/base/BaseExpertMapper.xml

@@ -12,7 +12,6 @@
         <result property="majorType" column="major_type"/>
         <result property="unitInformation" column="unit_information"/>
         <result property="majorGrade" column="major_grade"/>
-        <result property="varietyPurchase" column="variety_purchase"/>
         <result property="professionalTitle" column="professional_title"/>
         <result property="status" column="status"/>
         <result property="localArea" column="local_area"/>
@@ -50,9 +49,6 @@
             <if test="majorGrade != null and majorGrade != '' ">
                 major_grade,
             </if>
-            <if test="varietyPurchase != null and varietyPurchase != '' ">
-                variety_purchase,
-            </if>
             <if test="professionalTitle != null and professionalTitle != ''">
                 professional_title,
             </if>
@@ -97,9 +93,6 @@
             <if test="majorGrade != null and majorGrade != ''">
                 #{majorGrade},
             </if>
-            <if test="varietyPurchase != null and varietyPurchase != ''">
-                #{varietyPurchase},
-            </if>
             <if test="professionalTitle != null and professionalTitle != ''">
                 #{professionalTitle},
             </if>
@@ -149,9 +142,6 @@
             <if test="unitName != null and unitName != ''">
                 #{unitName},
             </if>
-            <if test="varietyPurchase != null and varietyPurchase != '' ">
-                #{varietyPurchase},
-            </if>
             <if test="created != null and created != ''">
                 #{created},
             </if>

purchase-system/src/main/resources/mapper/base/BaseSupplierMapper.xml

@@ -8,7 +8,6 @@
         <result property="supplierName" column="supplier_name"/>
         <result property="supplierResponsiblePerson" column="supplier_responsible_person"/>
         <result property="supplierAddress" column="supplier_address"/>
-        <result property="supplierType" column="supplier_type"/>
         <result property="supplierState" column="supplier_state"/>
         <result property="supplierAdvancePurchase" column="supplier_advance_purchase"/>
         <result property="postalCode" column="postal_code"/>
@@ -29,7 +28,6 @@
             <if test="supplierName != null">supplier_name,</if>
             <if test="supplierResponsiblePerson != null">supplier_responsible_person,</if>
             <if test="supplierAddress != null">supplier_address,</if>
-            <if test="supplierType != null">supplier_type,</if>
             <if test="supplierState != null">supplier_state,</if>
             <if test="supplierAdvancePurchase != null">supplier_advance_purchase,</if>
             <if test="postalCode != null">postal_code,</if>
@@ -47,7 +45,6 @@
             <if test="supplierName != null">#{supplierName},</if>
             <if test="supplierResponsiblePerson != null">#{supplierResponsiblePerson},</if>
             <if test="supplierAddress != null">#{supplierAddress},</if>
-            <if test="supplierType != null">#{supplierType},</if>
             <if test="supplierState != null">#{supplierState},</if>
             <if test="supplierAdvancePurchase != null">#{supplierAdvancePurchase},</if>
             <if test="postalCode != null">#{postalCode},</if>
@@ -75,7 +72,6 @@
             <if test="supplierName != null">supplier_name = #{supplierName},</if>
             <if test="supplierResponsiblePerson != null">supplier_responsible_person = #{supplierResponsiblePerson},</if>
             <if test="supplierAddress != null">supplier_address = #{supplierAddress},</if>
-            <if test="supplierType != null">supplier_type = #{supplierType},</if>
             <if test="supplierState != null">supplier_state = #{supplierState},</if>
             <if test="supplierAdvancePurchase != null">supplier_advance_purchase = #{supplierAdvancePurchase},</if>
             <if test="postalCode != null">postal_code = #{postalCode},</if>
@@ -107,9 +103,6 @@
             <if test="supplierAddress != null and supplierAddress != ''">
                 and supplier_address like '% +' #{supplierAddress} '+ %'
             </if>
-            <if test="supplierType != null and supplierType != ''">
-                and supplier_type = #{supplierType}
-            </if>
             <if test="supplierState != null and supplierState != ''">
                 and supplier_state = #{supplierState}
             </if>
@@ -148,4 +141,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>