修改

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_CONSIGNEE</param>
+                        <param>RMS_SUPPLIER</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -138,36 +138,13 @@ public class RmsCapacityController extends BaseRESTfulController {
                 count++;
             }
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_capacity_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            listTotal = rmsCapacityService.getCapacityList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_capacity_list");
-            //添加id
-            map.put("indexId", "capacityId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
+        if (con != null && con.equals("")) {
+            con = null;
         }
-        if (listTotal == null) {
-            listTotal = rmsCapacityService.getCapacityList(mapValue);
+        if (con != null && !con.equals("undefined")){
+            mapValue.put("con","%" + con +"%");
         }
+        List<Map<String,Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);

src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java

@@ -43,40 +43,15 @@ public class RmsConsigneeController extends BaseRESTfulController {
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         String con) {
+                                         String con
+                                        ) {
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_consignee_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsConsigneeService.getConsigneeList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_consignee_list");
-            //添加id
-            map.put("indexId", "consigneeId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsConsigneeService.getConsigneeList(mapValue);
+        if (con != null && !con.equals("undefined")) {
+            mapValue.put("con","%" + con + "%");
         }
+        List<Map<String, Object>> listTotal = rmsConsigneeService.getConsigneeList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsConsigneeService.getConsigneeList(mapValue);

src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java

@@ -59,36 +59,11 @@ public class RmsSupplierController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize,
                                          String con){
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_supplier_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsSupplierService.getSupplierList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_supplier_list");
-            //添加id
-            map.put("indexId", "supplierId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsSupplierService.getSupplierList(mapValue);
-        }
+
+       if (con!=null && !con.equals("undefined")){
+           mapValue.put("con","%"+con+"%");
+       }
+        List<Map<String,Object>>  listTotal = rmsSupplierService.getSupplierList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsSupplierService.getSupplierList(mapValue);

src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -54,35 +54,44 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         String consigneeAbbreviation=(String)mapVal.get("consigneeAbbreviation");
         String consigneeRegisteredAddress=(String) mapVal.get("consigneeRegisteredAddress");
         String consigneeReceiveAddress=(String) mapVal.get("consigneeReceiveAddress");
-        String consigneeRegistrationTime=(String)mapVal.get("consigneeRegistrationTime");
-        Date time = simpleDateFormat.parse(consigneeRegistrationTime);
         String consigneeContactName=(String) mapVal.get("consigneeContactName");
         String consigneeContactTel=(String)mapVal.get("consigneeContactTel");
         //收货客户父节点
         BigDecimal consigneeFarId=DataChange.dataToBigDecimal(mapVal.get("consigneeFarId"));
-
         int i=0;
         int rmsConsignees=rmsConsigneeMapper.getConsigneeByCompanyName(companyName);
         RmsConsignee rmsConsignee=new RmsConsignee();
         if(rmsConsignees==0){
+            BigDecimal consigneeId = rmsConsigneeMapper.selectConsigneeId();
+            rmsConsignee.setConsigneeId(consigneeId);
             rmsConsignee.setConsigneeCompanyName(companyName);
-            rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
-            rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
-            rmsConsignee.setConsigneeReceiveAddress(consigneeReceiveAddress);
-            rmsConsignee.setConsigneeRegistrationTime(time);
-            rmsConsignee.setConsigneeContactName(consigneeContactName);
-            rmsConsignee.setConsigneeContactTel(consigneeContactTel);
-            rmsConsignee.setConsigneeFarId(consigneeFarId);
+            String consigneeRegistrationTime=(String)mapVal.get("consigneeRegistrationTime");
+            //非必填
+            if (consigneeAbbreviation!=null) {
+                rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
+            } if (consigneeRegisteredAddress!=null) {
+                rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
+            } if (consigneeReceiveAddress!=null) {
+                rmsConsignee.setConsigneeReceiveAddress(consigneeReceiveAddress);
+            } if(consigneeRegistrationTime!=null) {
+                Date time = simpleDateFormat.parse(consigneeRegistrationTime);
+                rmsConsignee.setConsigneeRegistrationTime(time);
+            } if (consigneeContactName!=null) {
+                rmsConsignee.setConsigneeContactName(consigneeContactName);
+            } if (consigneeContactTel!=null) {
+                rmsConsignee.setConsigneeContactTel(consigneeContactTel);
+            } if (consigneeFarId!=null) {
+                rmsConsignee.setConsigneeFarId(consigneeFarId);
+            }
+            rmsConsignee.setConsigneeCode(DataChange.generateEightDigitsNumber("WL",consigneeId.intValue()));
             rmsConsignee.setDeleted(new BigDecimal(0));
             rmsConsignee.setInsertTime(new Date());
             rmsConsignee.setInsertUsername("admin");
-            rmsConsignee.setConsigneeId(rmsConsigneeMapper.selectConsigneeId());
             i+=rmsConsigneeMapper.insertSelective(rmsConsignee);
         }
       else{
           i=-1;
         }
-
             return  i;
     }
 

src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.RmsSupplierMapper;
 import com.steerinfo.dil.model.RmsSupplier;
 import com.steerinfo.dil.service.IRmsSupplierService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -117,37 +118,37 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
      */
     @Override
     public int insertSupplier(Map<String,Object> mapValue) throws ParseException {
-//        获取日期，进行格式转换
-        String supplierRegisterDate=(String) mapValue.get("supplierRegisterDate");
-//        新增用户名和密码将其传到SSO接口
-//        String username=mapValue.get("username");
-//        String password="123456";
         RmsSupplier rmsSupplier=new RmsSupplier();
-        System.out.println(supplierRegisterDate);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Date registerDate=simpleDateFormat.parse(supplierRegisterDate);
         int i=0;
-        Date date=new Date(0);
-//            判断用户输入的船名在数据库中是否存在
+        // 判断用户输入的供应商在数据库中是否存在
         String supplierName=(String) mapValue.get("supplierName");
         int size = rmsSupplierMapper.selectByParametersSupplierName(supplierName);
         if (size == 0 ) {
+            BigDecimal supplierId = rmsSupplierMapper.getSupplierId();
             rmsSupplier.setSupplierName(supplierName);
             rmsSupplier.setSupplierAddress((String) mapValue.get("supplierAddress"));
             rmsSupplier.setSupplierContactsName((String) mapValue.get("supplierContactsName"));
             rmsSupplier.setSupplierContactNumber((String) mapValue.get("supplierContactNumber"));
-            rmsSupplier.setSupplierRegisterDate(registerDate);
-
-            if (mapValue.get("supplierRegisterDate").equals(date)) {
-                rmsSupplier.setSupplierRegisterDate(null);
+            rmsSupplier.setSupplierDutyParagraph(DataChange.generateEightDigitsNumber("WL",supplierId.intValue()));
+            String supplierRegisterDate=(String) mapValue.get("supplierRegisterDate");
+//            Date date=new Date(0);
+            if (supplierRegisterDate!=null) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date registerDate=simpleDateFormat.parse(supplierRegisterDate);
+                rmsSupplier.setSupplierRegisterDate(registerDate);
+            }else {
+                rmsSupplier.setSupplierRegisterDate(new Date());
             }
+            rmsSupplier.setSupplierFarId(DataChange.dataToBigDecimal(mapValue.get("supplierId")));
+//            if (mapValue.get("supplierRegisterDate").equals(date)) {
+//                rmsSupplier.setSupplierRegisterDate(null);
+//            }
             rmsSupplier.setInsertTime(new Date());
             rmsSupplier.setInsertUsername("admin");
             rmsSupplier.setDeleted(new BigDecimal(0));
-            rmsSupplier.setSupplierId(rmsSupplierMapper.getSupplierId());
+            rmsSupplier.setSupplierId(supplierId);
             i+=rmsSupplierMapper.insertSelective(rmsSupplier);
-        }
-        else{
+        }else{
             i=-1;
         }
         return i;

src/main/resources/application-dev.yml

@@ -1,10 +1,21 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
 
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-rms-api
+    #测试环境端口
+openFeign:
+    ESFeign:
+      url: ${ESFEIGN_URL:172.16.33.166:8089}
+    ColumnDataFeign:
+      url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    AmsFeign:
+      url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
+  #测试端口
+server:
+    port: 8014

src/main/resources/application-prod.yml

@@ -7,3 +7,13 @@ spring:
   application:
     name: dal-dazhou-rms-api
 
+#正式环境端口
+openFeign:
+    ESFeign:
+      url: ${ESFEIGN_URL:172.16.33.166:8089}
+    ColumnDataFeign:
+      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    AmsFeign:
+      url: ${AMSFEIGN_URL:172.16.33.166:8079}
+server:
+    port: 8060

src/main/resources/bootstrap.yml

@@ -44,13 +44,8 @@ redis:
     time: 864000000
   database: 0
 
-openFeign:
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+
+
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
@@ -60,5 +55,3 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
-server:
-  port: 8060

src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -722,11 +722,14 @@
     LEFT JOIN RMS_CARRIER RCA
     ON RCA.CARRIER_ID = RC.CARRIER_ID
     WHERE RC.DELETED != 1
-      <if test="carrierSSOId != null">
+    <if test="carrierSSOId != null">
         and RCA.CARRIER_SSO_ID = #{carrierSSOId}
       </if>
     ORDER BY RC.INSERT_TIME DESC
     )
+    <if test="con != null">
+      where "capacityNumber" like #{con} or "carrierName" like #{con}
+    </if>
     <where>
       <if test="capacityId!= null">
         and

src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -618,12 +618,17 @@
     RC.CONSIGNEE_RECEIVE_ADDRESS AS "consigneeReceiveAddress",
     RC.CONSIGNEE_REGISTRATION_TIME AS "consigneeRegistrationTime",
     RC.CONSIGNEE_CONTACT_NAME AS "consigneeContactName",
-    RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel"
+    RC.CONSIGNEE_CONTACT_TEL AS "consigneeContactTel",
+    RC2.CONSIGNEE_COMPANY_NAME "companyNameFar"
     FROM RMS_CONSIGNEE RC
+    LEFT JOIN RMS_CONSIGNEE RC2
+    ON RC.CONSIGNEE_ID=RC2.CONSIGNEE_FAR_ID
     WHERE RC.DELETED!=1
     ORDER BY RC.INSERT_TIME DESC
     )
-    WHERE rownum < 100
+    <if test="con != null" >
+      where "companyName" like #{con} or "companyNameFar" like #{con}
+    </if>
     <where>
       <if test="companyName!= null">
         and

src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

@@ -31,27 +31,29 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="EAS_SUPPLIER_ID" jdbcType="VARCHAR" property="easSupplierId" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="SUPPLIER_FAR_ID" jdbcType="DECIMAL" property="supplierFarId" />
     <result column="SUPPLIER_BUSINESS_LICENSE" jdbcType="BLOB" property="supplierBusinessLicense" />
     <result column="SUPPLIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="supplierBusinessAblelicense" />
   </resultMap>
   <sql id="columns">
-    SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-    SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, SUPPLIER_ACCOUNT, 
-    SUPPLIER_ACCOUNT_BLANK, SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, SUPPLIER_REGISTER_CAPITAL, 
-    SUPPLIERBUSINESS_SCOPE, SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, SUPPLIER_REGISTER_DATE, 
-    SUPPLIER_REGISTER_ORGANIZATION, SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-    SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE
+    SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+    SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, SUPPLIER_ACCOUNT,
+    SUPPLIER_ACCOUNT_BLANK, SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, SUPPLIER_REGISTER_CAPITAL,
+    SUPPLIERBUSINESS_SCOPE, SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, SUPPLIER_REGISTER_DATE,
+    SUPPLIER_REGISTER_ORGANIZATION, SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL,
+    SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, EAS_SUPPLIER_ID, DELETED, SUPPLIER_FAR_ID, SUPPLIER_BUSINESS_LICENSE,
+    SUPPLIER_BUSINESS_ABLELICENSE
   </sql>
   <sql id="columns_alias">
-    t.SUPPLIER_ID, t.SUPPLIER_NAME, t.SUPPLIER_ABBREVIATION, t.SUPPLIER_ADDRESS, t.SUPPLIER_LEGAL_REPRESENTATIVE, 
-    t.SUPPLIER_REGISTER_NO, t.SUPPLIER_AGENT, t.SUPPLIER_CONTACT_NUMBER, t.SUPPLIER_FAX, 
-    t.SUPPLIER_ACCOUNT, t.SUPPLIER_ACCOUNT_BLANK, t.SUPPLIER_DUTY_PARAGRAPH, t.SUPPLIER_POSTAL_CODE, 
-    t.SUPPLIER_REGISTER_CAPITAL, t.SUPPLIERBUSINESS_SCOPE, t.SUPPLIER_COMPANY_STATUS, 
-    t.SUPPLIER_OPERATION_PERIOD, t.SUPPLIER_REGISTER_DATE, t.SUPPLIER_REGISTER_ORGANIZATION, 
-    t.SUPPLIER_REGISTER_APTITUDES, t.SUPPLIER_CREDENTIAL, t.SUPPLIER_CONTACTS_NAME, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_SUPPLIER_ID, 
-    t.DELETED, t.SUPPLIER_BUSINESS_LICENSE, t.SUPPLIER_BUSINESS_ABLELICENSE
+    t.SUPPLIER_ID, t.SUPPLIER_NAME, t.SUPPLIER_ABBREVIATION, t.SUPPLIER_ADDRESS, t.SUPPLIER_LEGAL_REPRESENTATIVE,
+    t.SUPPLIER_REGISTER_NO, t.SUPPLIER_AGENT, t.SUPPLIER_CONTACT_NUMBER, t.SUPPLIER_FAX,
+    t.SUPPLIER_ACCOUNT, t.SUPPLIER_ACCOUNT_BLANK, t.SUPPLIER_DUTY_PARAGRAPH, t.SUPPLIER_POSTAL_CODE,
+    t.SUPPLIER_REGISTER_CAPITAL, t.SUPPLIERBUSINESS_SCOPE, t.SUPPLIER_COMPANY_STATUS,
+    t.SUPPLIER_OPERATION_PERIOD, t.SUPPLIER_REGISTER_DATE, t.SUPPLIER_REGISTER_ORGANIZATION,
+    t.SUPPLIER_REGISTER_APTITUDES, t.SUPPLIER_CREDENTIAL, t.SUPPLIER_CONTACTS_NAME, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_SUPPLIER_ID,
+    t.DELETED, t.SUPPLIER_FAR_ID, t.SUPPLIER_BUSINESS_LICENSE, t.SUPPLIER_BUSINESS_ABLELICENSE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_SUPPLIER
@@ -60,7 +62,7 @@
     SELECT <include refid="columns_alias" /> FROM RMS_SUPPLIER t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="supplierId != null">
         and SUPPLIER_ID = #{supplierId}
       </if>
@@ -148,6 +150,9 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="supplierFarId != null">
+        and SUPPLIER_FAR_ID = #{supplierFarId}
+      </if>
       <if test="supplierBusinessLicense != null">
         and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
       </if>
@@ -157,7 +162,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="supplierId != null">
         and SUPPLIER_ID = #{supplierId}
       </if>
@@ -245,6 +250,9 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="supplierFarId != null">
+        and SUPPLIER_FAR_ID = #{supplierFarId}
+      </if>
       <if test="supplierBusinessLicense != null">
         and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
       </if>
@@ -259,125 +267,130 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_SUPPLIER
-    where 1!=1 
-      <if test="supplierName != null and supplierName != ''">
-        or SUPPLIER_NAME = #{supplierName}
-      </if>
-      <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
-        or SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
-      </if>
-      <if test="supplierAddress != null and supplierAddress != ''">
-        or SUPPLIER_ADDRESS = #{supplierAddress}
-      </if>
-      <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
-        or SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
-      </if>
-      <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
-        or SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
-      </if>
-      <if test="supplierAgent != null and supplierAgent != ''">
-        or SUPPLIER_AGENT = #{supplierAgent}
-      </if>
-      <if test="supplierContactNumber != null and supplierContactNumber != ''">
-        or SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
-      </if>
-      <if test="supplierFax != null and supplierFax != ''">
-        or SUPPLIER_FAX = #{supplierFax}
-      </if>
-      <if test="supplierAccount != null and supplierAccount != ''">
-        or SUPPLIER_ACCOUNT = #{supplierAccount}
-      </if>
-      <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
-        or SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
-      </if>
-      <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
-        or SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
-      </if>
-      <if test="supplierPostalCode != null and supplierPostalCode != ''">
-        or SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
-      </if>
-      <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
-        or SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
-      </if>
-      <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
-        or SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
-      </if>
-      <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
-        or SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
-      </if>
-      <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
-        or SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
-      </if>
-      <if test="supplierRegisterDate != null">
-        or TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = '#{supplierRegisterDate}'
-      </if>
-      <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
-        or SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
-      </if>
-      <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
-        or SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
-      </if>
-      <if test="supplierCredential != null and supplierCredential != ''">
-        or SUPPLIER_CREDENTIAL = #{supplierCredential}
-      </if>
-      <if test="supplierContactsName != null and supplierContactsName != ''">
-        or SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="easSupplierId != null and easSupplierId != ''">
-        or EAS_SUPPLIER_ID = #{easSupplierId}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="supplierBusinessLicense != null">
-        or SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
-      </if>
-      <if test="supplierBusinessAblelicense != null">
-        or SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
-      </if>
+    where 1!=1
+    <if test="supplierName != null and supplierName != ''">
+      or SUPPLIER_NAME = #{supplierName}
+    </if>
+    <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
+      or SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
+    </if>
+    <if test="supplierAddress != null and supplierAddress != ''">
+      or SUPPLIER_ADDRESS = #{supplierAddress}
+    </if>
+    <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
+      or SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
+    </if>
+    <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
+      or SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
+    </if>
+    <if test="supplierAgent != null and supplierAgent != ''">
+      or SUPPLIER_AGENT = #{supplierAgent}
+    </if>
+    <if test="supplierContactNumber != null and supplierContactNumber != ''">
+      or SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
+    </if>
+    <if test="supplierFax != null and supplierFax != ''">
+      or SUPPLIER_FAX = #{supplierFax}
+    </if>
+    <if test="supplierAccount != null and supplierAccount != ''">
+      or SUPPLIER_ACCOUNT = #{supplierAccount}
+    </if>
+    <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
+      or SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
+    </if>
+    <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
+      or SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
+    </if>
+    <if test="supplierPostalCode != null and supplierPostalCode != ''">
+      or SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
+    </if>
+    <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
+      or SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
+    </if>
+    <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
+      or SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
+    </if>
+    <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
+      or SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
+    </if>
+    <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
+      or SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
+    </if>
+    <if test="supplierRegisterDate != null">
+      or TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = '#{supplierRegisterDate}'
+    </if>
+    <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
+      or SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
+    </if>
+    <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
+      or SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
+    </if>
+    <if test="supplierCredential != null and supplierCredential != ''">
+      or SUPPLIER_CREDENTIAL = #{supplierCredential}
+    </if>
+    <if test="supplierContactsName != null and supplierContactsName != ''">
+      or SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="easSupplierId != null and easSupplierId != ''">
+      or EAS_SUPPLIER_ID = #{easSupplierId}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="supplierFarId != null">
+      or SUPPLIER_FAR_ID = #{supplierFarId}
+    </if>
+    <if test="supplierBusinessLicense != null">
+      or SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
+    </if>
+    <if test="supplierBusinessAblelicense != null">
+      or SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsSupplier">
-    insert into RMS_SUPPLIER (SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, 
-      SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-      SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, 
-      SUPPLIER_FAX, SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK, 
-      SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, 
-      SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE, 
-      SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, 
-      SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION, 
-      SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-      SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE, 
-      SUPPLIER_BUSINESS_ABLELICENSE)
-    values (#{supplierId,jdbcType=DECIMAL}, #{supplierName,jdbcType=VARCHAR}, #{supplierAbbreviation,jdbcType=VARCHAR}, 
-      #{supplierAddress,jdbcType=VARCHAR}, #{supplierLegalRepresentative,jdbcType=VARCHAR}, 
-      #{supplierRegisterNo,jdbcType=VARCHAR}, #{supplierAgent,jdbcType=VARCHAR}, #{supplierContactNumber,jdbcType=VARCHAR}, 
-      #{supplierFax,jdbcType=VARCHAR}, #{supplierAccount,jdbcType=VARCHAR}, #{supplierAccountBlank,jdbcType=VARCHAR}, 
-      #{supplierDutyParagraph,jdbcType=VARCHAR}, #{supplierPostalCode,jdbcType=VARCHAR}, 
-      #{supplierRegisterCapital,jdbcType=VARCHAR}, #{supplierbusinessScope,jdbcType=VARCHAR}, 
-      #{supplierCompanyStatus,jdbcType=VARCHAR}, #{supplierOperationPeriod,jdbcType=VARCHAR}, 
-      #{supplierRegisterDate,jdbcType=TIMESTAMP}, #{supplierRegisterOrganization,jdbcType=VARCHAR}, 
-      #{supplierRegisterAptitudes,jdbcType=VARCHAR}, #{supplierCredential,jdbcType=VARCHAR}, 
-      #{supplierContactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{easSupplierId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{supplierBusinessLicense,jdbcType=BLOB}, 
-      #{supplierBusinessAblelicense,jdbcType=BLOB})
+    insert into RMS_SUPPLIER (SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION,
+                              SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+                              SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER,
+                              SUPPLIER_FAX, SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK,
+                              SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE,
+                              SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE,
+                              SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD,
+                              SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION,
+                              SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL,
+                              SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME,
+                              UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                              EAS_SUPPLIER_ID, DELETED, SUPPLIER_FAR_ID,
+                              SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE
+    )
+    values (#{supplierId,jdbcType=DECIMAL}, #{supplierName,jdbcType=VARCHAR}, #{supplierAbbreviation,jdbcType=VARCHAR},
+            #{supplierAddress,jdbcType=VARCHAR}, #{supplierLegalRepresentative,jdbcType=VARCHAR},
+            #{supplierRegisterNo,jdbcType=VARCHAR}, #{supplierAgent,jdbcType=VARCHAR}, #{supplierContactNumber,jdbcType=VARCHAR},
+            #{supplierFax,jdbcType=VARCHAR}, #{supplierAccount,jdbcType=VARCHAR}, #{supplierAccountBlank,jdbcType=VARCHAR},
+            #{supplierDutyParagraph,jdbcType=VARCHAR}, #{supplierPostalCode,jdbcType=VARCHAR},
+            #{supplierRegisterCapital,jdbcType=VARCHAR}, #{supplierbusinessScope,jdbcType=VARCHAR},
+            #{supplierCompanyStatus,jdbcType=VARCHAR}, #{supplierOperationPeriod,jdbcType=VARCHAR},
+            #{supplierRegisterDate,jdbcType=TIMESTAMP}, #{supplierRegisterOrganization,jdbcType=VARCHAR},
+            #{supplierRegisterAptitudes,jdbcType=VARCHAR}, #{supplierCredential,jdbcType=VARCHAR},
+            #{supplierContactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{easSupplierId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{supplierFarId,jdbcType=DECIMAL},
+            #{supplierBusinessLicense,jdbcType=BLOB}, #{supplierBusinessAblelicense,jdbcType=BLOB}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
     insert into RMS_SUPPLIER
@@ -469,6 +482,9 @@
       <if test="deleted != null">
         DELETED,
       </if>
+      <if test="supplierFarId != null">
+        SUPPLIER_FAR_ID,
+      </if>
       <if test="supplierBusinessLicense != null">
         SUPPLIER_BUSINESS_LICENSE,
       </if>
@@ -564,6 +580,9 @@
       <if test="deleted != null">
         #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="supplierFarId != null">
+        #{supplierFarId,jdbcType=DECIMAL},
+      </if>
       <if test="supplierBusinessLicense != null">
         #{supplierBusinessLicense,jdbcType=BLOB},
       </if>
@@ -575,35 +594,36 @@
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsSupplier">
     update RMS_SUPPLIER
     set SUPPLIER_NAME = #{supplierName,jdbcType=VARCHAR},
-      SUPPLIER_ABBREVIATION = #{supplierAbbreviation,jdbcType=VARCHAR},
-      SUPPLIER_ADDRESS = #{supplierAddress,jdbcType=VARCHAR},
-      SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_NO = #{supplierRegisterNo,jdbcType=VARCHAR},
-      SUPPLIER_AGENT = #{supplierAgent,jdbcType=VARCHAR},
-      SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber,jdbcType=VARCHAR},
-      SUPPLIER_FAX = #{supplierFax,jdbcType=VARCHAR},
-      SUPPLIER_ACCOUNT = #{supplierAccount,jdbcType=VARCHAR},
-      SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank,jdbcType=VARCHAR},
-      SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph,jdbcType=VARCHAR},
-      SUPPLIER_POSTAL_CODE = #{supplierPostalCode,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital,jdbcType=VARCHAR},
-      SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope,jdbcType=VARCHAR},
-      SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus,jdbcType=VARCHAR},
-      SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_DATE = #{supplierRegisterDate,jdbcType=TIMESTAMP},
-      SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
-      SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
-      SUPPLIER_CREDENTIAL = #{supplierCredential,jdbcType=VARCHAR},
-      SUPPLIER_CONTACTS_NAME = #{supplierContactsName,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      EAS_SUPPLIER_ID = #{easSupplierId,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
-      SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense,jdbcType=BLOB}
+        SUPPLIER_ABBREVIATION = #{supplierAbbreviation,jdbcType=VARCHAR},
+        SUPPLIER_ADDRESS = #{supplierAddress,jdbcType=VARCHAR},
+        SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative,jdbcType=VARCHAR},
+        SUPPLIER_REGISTER_NO = #{supplierRegisterNo,jdbcType=VARCHAR},
+        SUPPLIER_AGENT = #{supplierAgent,jdbcType=VARCHAR},
+        SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber,jdbcType=VARCHAR},
+        SUPPLIER_FAX = #{supplierFax,jdbcType=VARCHAR},
+        SUPPLIER_ACCOUNT = #{supplierAccount,jdbcType=VARCHAR},
+        SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank,jdbcType=VARCHAR},
+        SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph,jdbcType=VARCHAR},
+        SUPPLIER_POSTAL_CODE = #{supplierPostalCode,jdbcType=VARCHAR},
+        SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital,jdbcType=VARCHAR},
+        SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope,jdbcType=VARCHAR},
+        SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus,jdbcType=VARCHAR},
+        SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod,jdbcType=VARCHAR},
+        SUPPLIER_REGISTER_DATE = #{supplierRegisterDate,jdbcType=TIMESTAMP},
+        SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
+        SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
+        SUPPLIER_CREDENTIAL = #{supplierCredential,jdbcType=VARCHAR},
+        SUPPLIER_CONTACTS_NAME = #{supplierContactsName,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        EAS_SUPPLIER_ID = #{easSupplierId,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        SUPPLIER_FAR_ID = #{supplierFarId,jdbcType=DECIMAL},
+        SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
+        SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense,jdbcType=BLOB}
     where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
@@ -693,6 +713,9 @@
       <if test="deleted != null">
         DELETED = #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="supplierFarId != null">
+        SUPPLIER_FAR_ID = #{supplierFarId,jdbcType=DECIMAL},
+      </if>
       <if test="supplierBusinessLicense != null">
         SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
       </if>
@@ -715,178 +738,184 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_SUPPLIER 
-      (SUPPLIER_ID, 
-      SUPPLIER_NAME, SUPPLIER_ABBREVIATION, 
-      SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE, 
-      SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, 
-      SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, 
-      SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK, 
-      SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, 
-      SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE, 
-      SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, 
-      SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION, 
-      SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
-      SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE, 
-      SUPPLIER_BUSINESS_ABLELICENSE)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.supplierId,jdbcType=DECIMAL}, 
-      #{item.supplierName,jdbcType=VARCHAR}, #{item.supplierAbbreviation,jdbcType=VARCHAR}, 
-      #{item.supplierAddress,jdbcType=VARCHAR}, #{item.supplierLegalRepresentative,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterNo,jdbcType=VARCHAR}, #{item.supplierAgent,jdbcType=VARCHAR}, 
-      #{item.supplierContactNumber,jdbcType=VARCHAR}, #{item.supplierFax,jdbcType=VARCHAR}, 
-      #{item.supplierAccount,jdbcType=VARCHAR}, #{item.supplierAccountBlank,jdbcType=VARCHAR}, 
-      #{item.supplierDutyParagraph,jdbcType=VARCHAR}, #{item.supplierPostalCode,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterCapital,jdbcType=VARCHAR}, #{item.supplierbusinessScope,jdbcType=VARCHAR}, 
-      #{item.supplierCompanyStatus,jdbcType=VARCHAR}, #{item.supplierOperationPeriod,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterDate,jdbcType=TIMESTAMP}, #{item.supplierRegisterOrganization,jdbcType=VARCHAR}, 
-      #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}, #{item.supplierCredential,jdbcType=VARCHAR}, 
-      #{item.supplierContactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.easSupplierId,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, #{item.supplierBusinessLicense,jdbcType=BLOB}, 
-      #{item.supplierBusinessAblelicense,jdbcType=BLOB} from dual  
-   </foreach> )
+    insert into RMS_SUPPLIER
+    (SUPPLIER_ID,
+    SUPPLIER_NAME, SUPPLIER_ABBREVIATION,
+    SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+    SUPPLIER_REGISTER_NO, SUPPLIER_AGENT,
+    SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX,
+    SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK,
+    SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE,
+    SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE,
+    SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD,
+    SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION,
+    SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL,
+    SUPPLIER_CONTACTS_NAME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    EAS_SUPPLIER_ID, DELETED, SUPPLIER_FAR_ID,
+    SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.supplierId,jdbcType=DECIMAL},
+    #{item.supplierName,jdbcType=VARCHAR}, #{item.supplierAbbreviation,jdbcType=VARCHAR},
+    #{item.supplierAddress,jdbcType=VARCHAR}, #{item.supplierLegalRepresentative,jdbcType=VARCHAR},
+    #{item.supplierRegisterNo,jdbcType=VARCHAR}, #{item.supplierAgent,jdbcType=VARCHAR},
+    #{item.supplierContactNumber,jdbcType=VARCHAR}, #{item.supplierFax,jdbcType=VARCHAR},
+    #{item.supplierAccount,jdbcType=VARCHAR}, #{item.supplierAccountBlank,jdbcType=VARCHAR},
+    #{item.supplierDutyParagraph,jdbcType=VARCHAR}, #{item.supplierPostalCode,jdbcType=VARCHAR},
+    #{item.supplierRegisterCapital,jdbcType=VARCHAR}, #{item.supplierbusinessScope,jdbcType=VARCHAR},
+    #{item.supplierCompanyStatus,jdbcType=VARCHAR}, #{item.supplierOperationPeriod,jdbcType=VARCHAR},
+    #{item.supplierRegisterDate,jdbcType=TIMESTAMP}, #{item.supplierRegisterOrganization,jdbcType=VARCHAR},
+    #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}, #{item.supplierCredential,jdbcType=VARCHAR},
+    #{item.supplierContactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.easSupplierId,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, #{item.supplierFarId,jdbcType=DECIMAL},
+    #{item.supplierBusinessLicense,jdbcType=BLOB}, #{item.supplierBusinessAblelicense,jdbcType=BLOB}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_SUPPLIER
-     set
-       SUPPLIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierId,jdbcType=DECIMAL}
-       </foreach>
-       ,SUPPLIER_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierName,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ABBREVIATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAbbreviation,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_LEGAL_REPRESENTATIVE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierLegalRepresentative,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterNo,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_AGENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAgent,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CONTACT_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_FAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierFax,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ACCOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccount,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_ACCOUNT_BLANK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccountBlank,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_DUTY_PARAGRAPH=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierDutyParagraph,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_POSTAL_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierPostalCode,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_CAPITAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterCapital,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIERBUSINESS_SCOPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierbusinessScope,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_COMPANY_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCompanyStatus,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_OPERATION_PERIOD=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierOperationPeriod,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SUPPLIER_REGISTER_ORGANIZATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterOrganization,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_REGISTER_APTITUDES=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CREDENTIAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCredential,jdbcType=VARCHAR}
-       </foreach>
-       ,SUPPLIER_CONTACTS_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactsName,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,EAS_SUPPLIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.easSupplierId,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,SUPPLIER_BUSINESS_LICENSE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessLicense,jdbcType=BLOB}
-       </foreach>
-       ,SUPPLIER_BUSINESS_ABLELICENSE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
-          when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessAblelicense,jdbcType=BLOB}
-       </foreach>
-     where SUPPLIER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.supplierId,jdbcType=DECIMAL}
-     </foreach> 
+    update RMS_SUPPLIER
+    set
+    SUPPLIER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierId,jdbcType=DECIMAL}
+    </foreach>
+    ,SUPPLIER_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierName,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_ABBREVIATION=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAbbreviation,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_ADDRESS=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAddress,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_LEGAL_REPRESENTATIVE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierLegalRepresentative,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_REGISTER_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterNo,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_AGENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAgent,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_CONTACT_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactNumber,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_FAX=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierFax,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_ACCOUNT=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccount,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_ACCOUNT_BLANK=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccountBlank,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_DUTY_PARAGRAPH=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierDutyParagraph,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_POSTAL_CODE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierPostalCode,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_REGISTER_CAPITAL=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterCapital,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIERBUSINESS_SCOPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierbusinessScope,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_COMPANY_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCompanyStatus,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_OPERATION_PERIOD=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierOperationPeriod,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_REGISTER_DATE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,SUPPLIER_REGISTER_ORGANIZATION=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterOrganization,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_REGISTER_APTITUDES=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_CREDENTIAL=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCredential,jdbcType=VARCHAR}
+    </foreach>
+    ,SUPPLIER_CONTACTS_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactsName,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,EAS_SUPPLIER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.easSupplierId,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,SUPPLIER_FAR_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierFarId,jdbcType=DECIMAL}
+    </foreach>
+    ,SUPPLIER_BUSINESS_LICENSE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessLicense,jdbcType=BLOB}
+    </foreach>
+    ,SUPPLIER_BUSINESS_ABLELICENSE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SUPPLIER_ID" separator=" ">
+      when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessAblelicense,jdbcType=BLOB}
+    </foreach>
+    where SUPPLIER_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.supplierId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_SUPPLIER
-    where SUPPLIER_ID in 
+    where SUPPLIER_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -903,11 +932,18 @@
     RS.SUPPLIER_ADDRESS AS "supplierAddress",
     RS.SUPPLIER_REGISTER_DATE AS "supplierRegisterDate",
     RS.SUPPLIER_CONTACTS_NAME AS "supplierContactsName",
-    RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber"
+    RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber",
+    RS1.SHIPPER_NAME as "farUnitName"
+
     FROM RMS_SUPPLIER RS
+    LEFT JOIN RMS_SHIPPER RS1
+    ON RS1.SHIPPER_ID=RS.SUPPLIER_FAR_ID
     WHERE RS.DELETED != 1
     ORDER BY RS.INSERT_TIME DESC
     )
+    <if test="con != null">
+      where "supplierName" like #{con} or "farUnitName" like #{con} or "supplierAddress" like #{con}
+    </if>
     <where>
       <if test="supplierId!= null">
         and
@@ -976,4 +1012,5 @@
     WHERE RS.SUPPLIER_NAME = #{supplierName}
       AND RS.DELETED=0
   </select>
+
 </mapper>