diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java
index 6b876a5..7a490f8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java
@@ -8,9 +8,11 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +41,8 @@ public class SynchronousController {
     @Autowired
     private ICoscoBlacklistService coscoBlacklistService;
 
+    @Autowired
+    private ICoscoSupplierBaseService coscoSupplierBaseService;
 
 
 
@@ -96,4 +100,13 @@ public class SynchronousController {
     }
 
 
+    /**
+     * 供应商变更审批回调接口
+     */
+    @PostMapping("/supplierChangeApprove")
+    public BaseResponse supplierChangeApprove(@RequestBody CoscoSupplierChangeApply vo) {
+        return BaseResponse.success(coscoSupplierBaseService.updateCoscoSupplierBase(vo));
+    }
+
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java
index a25ea7b..640096e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo;
 
 import java.util.List;
@@ -44,10 +45,9 @@ public interface ICoscoSupplierBaseService {
     /**
      * 修改中远海运_供应商_基本信息
      *
-     * @param coscoSupplierBase 中远海运_供应商_基本信息
      * @return 结果
      */
-    public int updateCoscoSupplierBase(CoscoSupplierBase coscoSupplierBase);
+    public Boolean updateCoscoSupplierBase(CoscoSupplierChangeApply vo);
 
     /**
      * 批量删除中远海运_供应商_基本信息
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
index 66587c6..eea9242 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
@@ -174,6 +174,11 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
 
         //先验证一下主任务表数据状态
         CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
+
+        if(coscoAccessWorkData == null){
+            return true;
+        }
+
         if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
                 CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
             return true;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
index 0826f39..1eec45a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
@@ -505,6 +505,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
 
         //先验证一下主任务表数据状态
         CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
+
+        if(coscoAccessWorkData == null){
+            return true;
+        }
+
         if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
                 CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
             return true;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
index 164e08e..0f7611d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
@@ -54,6 +55,12 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
     @Autowired
     private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper;
 
+    //变更
+    @Autowired
+    private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper;
+
+
+
     @Override
     public IPage<CoscoSupplierBase> getPage(CoscoSupplierBase coscoSupplierBase) {
         // 创建分页对象（当前页，每页大小）
@@ -259,15 +266,117 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
     }
 
     /**
-     * 修改中远海运_供应商_基本信息
+     * 变更中远海运_供应商_基本信息
      *
-     * @param coscoSupplierBase 中远海运_供应商_基本信息
      * @return 结果
      */
     @Override
-    public int updateCoscoSupplierBase(CoscoSupplierBase coscoSupplierBase) {
+    @Transactional
+    public Boolean updateCoscoSupplierBase(CoscoSupplierChangeApply vo) {
+        String appid = vo.getId();//任务主体id
+        CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid);
+        if(coscoSupplierChangeApply == null){
+            return true;
+        }
+        //先验证一下主任务表数据状态
+        if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) ||
+                CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){
+            return true;
+        }
+        //新基本信息
+        CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid);
+
+        //老基本信息
+        CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierChangeApply.getSupplierId());
+        String supplierId = coscoSupplierBase.getId();
+        String createBy = coscoSupplierBase.getCreateBy();
+        String updateBy = coscoSupplierBase.getUpdateBy();
+        BeanUtil.copyProperties(newCoscoSupplierBase,coscoSupplierBase);
+        coscoSupplierBase.setId(supplierId);
         coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate());
-        return coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
+        coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
+
+        //删除在新增新资质
+        coscoSupplierQualificationsMapper.deleteCoscoSupplierQualificationsById(supplierId);
+
+        CoscoSupplierChangeQualifications coscoSupplierChangeQualifications2 = new CoscoSupplierChangeQualifications();
+        coscoSupplierChangeQualifications2.setSupplierId(newCoscoSupplierBase.getId());
+        List<CoscoSupplierChangeQualifications> newCoscoSupplierChangeQualificationsList =
+                coscoSupplierChangeQualificationsMapper.selectCoscoSupplierChangeQualificationsList(coscoSupplierChangeQualifications2);
+        for(CoscoSupplierChangeQualifications newQualifications : newCoscoSupplierChangeQualificationsList){
+            CoscoSupplierQualifications oldQualifications = new CoscoSupplierQualifications();
+            BeanUtil.copyProperties(newQualifications,oldQualifications);
+            String yId = CoscoIdUtil.getId();
+            oldQualifications.setId(yId);
+            oldQualifications.setSupplierId(supplierId);
+            oldQualifications.setCreateBy(createBy);
+            oldQualifications.setCreateTime(CoscoDateUtils.getNowDate());
+            oldQualifications.setUpdateBy(updateBy);
+            oldQualifications.setUpdateTime(CoscoDateUtils.getNowDate());
+            oldQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate());
+            coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(oldQualifications);
+
+            //把新id，添加到变更表
+            CoscoSupplierChangeQualifications coscoSupplierChangeQualifications  = new CoscoSupplierChangeQualifications();
+            coscoSupplierChangeQualifications.setSupplierQualificationsId(yId);
+            coscoSupplierChangeQualifications.setId(newQualifications.getId());
+            coscoSupplierChangeQualificationsMapper.updateCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications);
+        }
+
+        //新开票信息
+        coscoSupplierInvoiceMapper.deleteCoscoSupplierInvoiceById(supplierId);
+
+        CoscoSupplierChangeInvoice newInvoice = coscoSupplierChangeInvoiceMapper.selectBySupplierChangeApplyId(appid);
+        CoscoSupplierInvoice oldInvoice = new CoscoSupplierInvoice();
+        BeanUtil.copyProperties(newInvoice,oldInvoice);
+
+        oldInvoice.setId(CoscoIdUtil.getId());
+        oldInvoice.setSupplierId(supplierId);
+        oldInvoice.setCreateBy(createBy);
+        oldInvoice.setCreateTime(CoscoDateUtils.getNowDate());
+        oldInvoice.setUpdateBy(updateBy);
+        oldInvoice.setUpdateTime(CoscoDateUtils.getNowDate());
+        oldInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(oldInvoice);
+
+
+
+        //新银行
+        coscoSupplierBankMapper.deleteCoscoSupplierBankById(supplierId);
+
+        CoscoSupplierChangeBank newBank = new CoscoSupplierChangeBank();
+        newBank.setSupplierId(newCoscoSupplierBase.getId());
+        List<CoscoSupplierChangeBank> newBankList =
+                coscoSupplierChangeBankMapper.selectCoscoSupplierChangeBankList(newBank);
+        for(CoscoSupplierChangeBank coscoSupplierChangeBank : newBankList){
+            CoscoSupplierBank coscoSupplierBank = new CoscoSupplierBank();
+            BeanUtil.copyProperties(coscoSupplierChangeBank,coscoSupplierBank);
+            String bankId = CoscoIdUtil.getId();
+            coscoSupplierBank.setId(bankId);
+            coscoSupplierBank.setSupplierId(supplierId);
+            coscoSupplierBank.setCreateBy(createBy);
+            coscoSupplierBank.setCreateTime(CoscoDateUtils.getNowDate());
+            coscoSupplierBank.setUpdateBy(updateBy);
+            coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate());
+            coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate());
+            coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank);
+
+            CoscoSupplierChangeBank coscoSupplierChangeBank1 = new CoscoSupplierChangeBank();
+            coscoSupplierChangeBank1.setId(coscoSupplierChangeBank.getId());
+            coscoSupplierChangeBank1.setSupplierBankId(bankId);
+            coscoSupplierChangeBankMapper.updateCoscoSupplierChangeBank(coscoSupplierChangeBank1);
+        }
+
+        //修改审批状态
+        CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply();
+        coscoSupplierChangeApply1.setId(coscoSupplierChangeApply.getId());
+        coscoSupplierChangeApply1.setApproveStatus(vo.getApproveStatus());
+        coscoSupplierChangeApply1.setUpdateTime(CoscoDateUtils.getNowDate());
+        coscoSupplierChangeApply1.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(coscoSupplierChangeApply1);
+
+        return true;
     }
 
     /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java
index 8ae2b77..e4bf0d8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java
@@ -57,9 +57,9 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
         CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid);
 
         //查询当前任务的上一条任务
-        CoscoSupplierChangeApply coscoSupplierChangeApply1 = coscoSupplierChangeApplyMapper.selectBySupplierId(coscoSupplierChangeApply.getSupplierId());
+        CoscoSupplierChangeApply oldCoscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectBySupplierId(coscoSupplierChangeApply.getSupplierId());
         //如果是空，说明是第一次提交变更
-        if(coscoSupplierChangeApply1 == null){
+        if(oldCoscoSupplierChangeApply == null){
             //基础信息比对结果
             CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase();
             coscoSupplierChangeBase.setSupplierId(coscoSupplierChangeApply.getSupplierId());
@@ -110,6 +110,62 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
 
 
 
+            diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply);
+            diffVo.setSupplierChangeDiffResult(selectDiff);
+            diffVo.setQualificationsMap(qualificationsMap);
+            diffVo.setInvoiceChangeDiffVo(invoiceChangeDiffVo);
+            diffVo.setBankListMap(bankListMap);
+        }else{
+            //基础信息比对结果
+            CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase();
+            coscoSupplierChangeBase.setSupplierChangeApplyIdOld(oldCoscoSupplierChangeApply.getId());
+            coscoSupplierChangeBase.setSupplierChangeApplyId(appid);
+            SupplierChangeDiffResult selectDiff = coscoSupplierChangeBaseMapper.selectDiff(coscoSupplierChangeBase);
+
+            //老基本信息
+            CoscoSupplierChangeBase oldCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(oldCoscoSupplierChangeApply.getId());
+            //新基本信息
+            CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid);
+
+
+            //原资质
+            CoscoSupplierChangeQualifications coscoSupplierChangeQualifications = new CoscoSupplierChangeQualifications();
+            coscoSupplierChangeQualifications.setSupplierId(oldCoscoSupplierBase.getId());
+            List<CoscoSupplierChangeQualifications> oldCoscoSupplierChangeQualificationsList =
+                    coscoSupplierChangeQualificationsMapper.selectCoscoSupplierChangeQualificationsList(coscoSupplierChangeQualifications);
+
+            //新资质
+            CoscoSupplierChangeQualifications coscoSupplierChangeQualifications2 = new CoscoSupplierChangeQualifications();
+            coscoSupplierChangeQualifications2.setSupplierId(newCoscoSupplierBase.getId());
+            List<CoscoSupplierChangeQualifications> newCoscoSupplierChangeQualificationsList =
+                    coscoSupplierChangeQualificationsMapper.selectCoscoSupplierChangeQualificationsList(coscoSupplierChangeQualifications2);
+            //资质对比
+            Map<String,Object> qualificationsMap = qualificationsDiff(oldCoscoSupplierChangeQualificationsList,newCoscoSupplierChangeQualificationsList);
+
+
+            //开票信息比对
+            CoscoSupplierChangeInvoice invoice = new CoscoSupplierChangeInvoice();
+            invoice.setOldSupplierId(oldCoscoSupplierBase.getId());
+            invoice.setNewSupplierId(newCoscoSupplierBase.getId());
+            InvoiceChangeDiffVo invoiceChangeDiffVo = coscoSupplierChangeInvoiceMapper.selectInvoiceDitt(invoice);
+
+
+            //原银行
+            CoscoSupplierChangeBank oldBank = new CoscoSupplierChangeBank();
+            oldBank.setSupplierId(oldCoscoSupplierBase.getId());
+            List<CoscoSupplierChangeBank> oldBankList =
+                    coscoSupplierChangeBankMapper.selectCoscoSupplierChangeBankList(oldBank);
+
+            //新银行
+            CoscoSupplierChangeBank newBank = new CoscoSupplierChangeBank();
+            newBank.setSupplierId(newCoscoSupplierBase.getId());
+            List<CoscoSupplierChangeBank> newBankList =
+                    coscoSupplierChangeBankMapper.selectCoscoSupplierChangeBankList(newBank);
+            //资质对比
+            Map<String,Object> bankListMap = bankDiff(oldBankList,newBankList);
+
+
+
             diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply);
             diffVo.setSupplierChangeDiffResult(selectDiff);
             diffVo.setQualificationsMap(qualificationsMap);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
index ffcc94e..64b2e4a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
@@ -131,6 +131,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
     public Boolean updateCoscoSupplierexit(CoscoSupplierexit vo) {
         //先验证一下主任务表数据状态
         CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId());
+        if(coscoSupplierexit == null){
+            return true;
+        }
         if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) ||
                 CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus()) ){
             return true;
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml
index cd222fc..2b21f1c 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBankMapper.xml
@@ -191,8 +191,8 @@
     </update>
 
     <update id="deleteCoscoSupplierBankById" parameterType="String">
-        update cosco_supplier_bank set del_flag = 2
-        where id = #{id}
+        update cosco_supplier_bank set del_flag = 'deleted'
+        where supplier_id = #{supplierId}
     </update>
 
     <update id="deleteCoscoSupplierBankByIds" parameterType="String">
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
index af21926..0de320f 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@@ -4,99 +4,56 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper">
 
-    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase"
-               id="CoscoSupplierBaseResult">
-        <result property="id" column="id"/>
-        <result property="supplierType" column="supplier_type"/>
-        <result property="licenceAccessory" column="licence_accessory"/>
-        <result property="licenceDate" column="licence_date"/>
-        <result property="enterpriseType" column="enterprise_type"/>
-        <result property="name" column="name"/>
-        <result property="nameEn" column="name_en"/>
-        <result property="socialCreditCode" column="social_credit_code"/>
-        <result property="range" column="range"/>
-        <result property="regAddress" column="reg_address"/>
-        <result property="workAddress" column="work_address"/>
-        <result property="parentCompanyInvestor" column="parent_company_investor"/>
-        <result property="legalPerson" column="legal_person"/>
-        <result property="idCard" column="id_card"/>
-        <result property="capital" column="capital"/>
-        <result property="contactsName" column="contacts_name"/>
-        <result property="contactsPhone" column="contacts_phone"/>
-        <result property="contactsType" column="contacts_type"/>
-        <result property="contactsEmail" column="contacts_email"/>
-        <result property="telephone" column="telephone"/>
-        <result property="nation" column="nation"/>
-        <result property="vat" column="vat"/>
-        <result property="taxpayerId" column="taxpayer_id"/>
-        <result property="currency" column="currency"/>
-        <result property="personName" column="person_name"/>
-        <result property="personPhone" column="person_phone"/>
-        <result property="personBank" column="person_bank"/>
-        <result property="personAccount" column="person_account"/>
-        <result property="remark" column="remark"/>
-        <result property="accessStatus" column="access_status"/>
-        <result property="blacklistStatus" column="blacklist_status"/>
-        <result property="greylistStatus" column="greylist_status"/>
-        <result property="fillinStatus" column="fillin_status"/>
-        <result property="fillinBy" column="fillin_by"/>
-        <result property="sapCode" column="sap_code"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="lastUpdateTime" column="last_update_time"/>
+    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" id="CoscoSupplierBaseResult">
+            <result property="id" column="id"/>
+            <result property="supplierType" column="supplier_type"/>
+            <result property="licenceAccessory" column="licence_accessory"/>
+            <result property="licenceDate" column="licence_date"/>
+            <result property="enterpriseType" column="enterprise_type"/>
+            <result property="name" column="name"/>
+            <result property="nameEn" column="name_en"/>
+            <result property="socialCreditCode" column="social_credit_code"/>
+            <result property="range" column="range"/>
+            <result property="regAddress" column="reg_address"/>
+            <result property="workAddress" column="work_address"/>
+            <result property="parentCompanyInvestor" column="parent_company_investor"/>
+            <result property="legalPerson" column="legal_person"/>
+            <result property="idCard" column="id_card"/>
+            <result property="capital" column="capital"/>
+            <result property="contactsName" column="contacts_name"/>
+            <result property="contactsPhone" column="contacts_phone"/>
+            <result property="contactsType" column="contacts_type"/>
+            <result property="contactsEmail" column="contacts_email"/>
+            <result property="telephone" column="telephone"/>
+            <result property="nation" column="nation"/>
+            <result property="vat" column="vat"/>
+            <result property="taxpayerId" column="taxpayer_id"/>
+            <result property="currency" column="currency"/>
+            <result property="personName" column="person_name"/>
+            <result property="personPhone" column="person_phone"/>
+            <result property="personBank" column="person_bank"/>
+            <result property="personAccount" column="person_account"/>
+            <result property="remark" column="remark"/>
+            <result property="accessStatus" column="access_status"/>
+            <result property="blacklistStatus" column="blacklist_status"/>
+            <result property="greylistStatus" column="greylist_status"/>
+            <result property="fillinStatus" column="fillin_status"/>
+            <result property="fillinBy" column="fillin_by"/>
+            <result property="sapCode" column="sap_code"/>
+            <result property="delFlag" column="del_flag"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="lastUpdateTime" column="last_update_time"/>
     </resultMap>
 
     <sql id="selectCoscoSupplierBaseVo">
-        select id,
-               supplier_type,
-               licence_accessory,
-               licence_date,
-               enterprise_type,
-               name,
-               name_en,
-               social_credit_code,
-               `range`,
-               reg_address,
-               work_address,
-               parent_company_investor,
-               legal_person,
-               id_card,
-               capital,
-               contacts_name,
-               contacts_phone,
-               contacts_type,
-               contacts_email,
-               telephone,
-               nation,
-               vat,
-               taxpayer_id,
-               currency,
-               person_name,
-               person_phone,
-               person_bank,
-               person_account,
-               remark,
-               access_status,
-               blacklist_status,
-               greylist_status,
-               fillin_status,
-               fillin_by,
-               sap_code,
-               del_flag,
-               create_by,
-               create_time,
-               update_by,
-               update_time,
-               last_update_time
+        select id, supplier_type, licence_accessory, licence_date, enterprise_type, name, name_en, social_credit_code, `range`, reg_address, work_address, parent_company_investor, legal_person, id_card, capital, contacts_name, contacts_phone, contacts_type, contacts_email, telephone, nation, vat, taxpayer_id, currency, person_name, person_phone, person_bank, person_account, remark, access_status, blacklist_status, greylist_status, fillin_status, fillin_by, sap_code, del_flag, create_by, create_time, update_by, update_time, last_update_time
         from cosco_supplier_base
     </sql>
 
-    <select id="selectPageList"
-            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase"
-            resultMap="CoscoSupplierBaseResult">
+    <select id="selectPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" resultMap="CoscoSupplierBaseResult">
         <include refid="selectCoscoSupplierBaseVo"/>
         <where>
             and del_flag = 'normal'
@@ -122,7 +79,7 @@
                 and social_credit_code = #{vo.socialCreditCode}
             </if>
             <if test="vo.range != null  and vo.range != ''">
-                and range = #{vo.range}
+                and `range` = #{vo.range}
             </if>
             <if test="vo.regAddress != null  and vo.regAddress != ''">
                 and reg_address = #{vo.regAddress}
@@ -207,362 +164,347 @@
     </select>
 
 
-    <select id="selectCoscoSupplierBaseList"
-            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase"
-            resultMap="CoscoSupplierBaseResult">
+    <select id="selectCoscoSupplierBaseList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" resultMap="CoscoSupplierBaseResult">
         <include refid="selectCoscoSupplierBaseVo"/>
         <where>
-            <if test="supplierType != null  and supplierType != ''">
-                and supplier_type = #{supplierType}
-            </if>
-            <if test="licenceAccessory != null  and licenceAccessory != ''">
-                and licence_accessory = #{licenceAccessory}
-            </if>
-            <if test="licenceDate != null  and licenceDate != ''">
-                and licence_date = #{licenceDate}
-            </if>
-            <if test="enterpriseType != null  and enterpriseType != ''">
-                and enterprise_type = #{enterpriseType}
-            </if>
-            <if test="name != null  and name != ''">
-                and name like concat('%', #{name}, '%')
-            </if>
-            <if test="nameEn != null  and nameEn != ''">
-                and name_en = #{nameEn}
-            </if>
-            <if test="socialCreditCode != null  and socialCreditCode != ''">
-                and social_credit_code = #{socialCreditCode}
-            </if>
-            <if test="range != null  and range != ''">
-                and range = #{range}
-            </if>
-            <if test="regAddress != null  and regAddress != ''">
-                and reg_address = #{regAddress}
-            </if>
-            <if test="workAddress != null  and workAddress != ''">
-                and work_address = #{workAddress}
-            </if>
-            <if test="parentCompanyInvestor != null  and parentCompanyInvestor != ''">
-                and parent_company_investor = #{parentCompanyInvestor}
-            </if>
-            <if test="legalPerson != null  and legalPerson != ''">
-                and legal_person = #{legalPerson}
-            </if>
-            <if test="idCard != null  and idCard != ''">
-                and id_card = #{idCard}
-            </if>
-            <if test="capital != null ">
-                and capital = #{capital}
-            </if>
-            <if test="contactsName != null  and contactsName != ''">
-                and contacts_name like concat('%', #{contactsName}, '%')
-            </if>
-            <if test="contactsPhone != null  and contactsPhone != ''">
-                and contacts_phone = #{contactsPhone}
-            </if>
-            <if test="contactsType != null  and contactsType != ''">
-                and contacts_type = #{contactsType}
-            </if>
-            <if test="contactsEmail != null  and contactsEmail != ''">
-                and contacts_email = #{contactsEmail}
-            </if>
-            <if test="telephone != null  and telephone != ''">
-                and telephone = #{telephone}
-            </if>
-            <if test="nation != null  and nation != ''">
-                and nation = #{nation}
-            </if>
-            <if test="vat != null  and vat != ''">
-                and vat = #{vat}
-            </if>
-            <if test="taxpayerId != null  and taxpayerId != ''">
-                and taxpayer_id = #{taxpayerId}
-            </if>
-            <if test="currency != null  and currency != ''">
-                and currency = #{currency}
-            </if>
-            <if test="personName != null  and personName != ''">
-                and person_name like concat('%', #{personName}, '%')
-            </if>
-            <if test="personPhone != null  and personPhone != ''">
-                and person_phone = #{personPhone}
-            </if>
-            <if test="personBank != null  and personBank != ''">
-                and person_bank = #{personBank}
-            </if>
-            <if test="personAccount != null  and personAccount != ''">
-                and person_account = #{personAccount}
-            </if>
-            <if test="accessStatus != null ">
-                and access_status = #{accessStatus}
-            </if>
-            <if test="blacklistStatus != null ">
-                and blacklist_status = #{blacklistStatus}
-            </if>
-            <if test="greylistStatus != null ">
-                and greylist_status = #{greylistStatus}
-            </if>
-            <if test="fillinStatus != null ">
-                and fillin_status = #{fillinStatus}
-            </if>
-            <if test="fillinBy != null  and fillinBy != ''">
-                and fillin_by = #{fillinBy}
-            </if>
-            <if test="sapCode != null  and sapCode != ''">
-                and sap_code = #{sapCode}
-            </if>
-            <if test="lastUpdateTime != null ">
-                and last_update_time = #{lastUpdateTime}
-            </if>
+            and del_flag = 'normal'
+                        <if test="supplierType != null  and supplierType != ''">
+                            and supplier_type = #{supplierType}
+                        </if>
+                        <if test="licenceAccessory != null  and licenceAccessory != ''">
+                            and licence_accessory = #{licenceAccessory}
+                        </if>
+                        <if test="licenceDate != null  and licenceDate != ''">
+                            and licence_date = #{licenceDate}
+                        </if>
+                        <if test="enterpriseType != null  and enterpriseType != ''">
+                            and enterprise_type = #{enterpriseType}
+                        </if>
+                        <if test="name != null  and name != ''">
+                            and name like concat('%', #{name}, '%')
+                        </if>
+                        <if test="nameEn != null  and nameEn != ''">
+                            and name_en = #{nameEn}
+                        </if>
+                        <if test="socialCreditCode != null  and socialCreditCode != ''">
+                            and social_credit_code = #{socialCreditCode}
+                        </if>
+                        <if test="range != null  and range != ''">
+                            and `range` = #{range}
+                        </if>
+                        <if test="regAddress != null  and regAddress != ''">
+                            and reg_address = #{regAddress}
+                        </if>
+                        <if test="workAddress != null  and workAddress != ''">
+                            and work_address = #{workAddress}
+                        </if>
+                        <if test="parentCompanyInvestor != null  and parentCompanyInvestor != ''">
+                            and parent_company_investor = #{parentCompanyInvestor}
+                        </if>
+                        <if test="legalPerson != null  and legalPerson != ''">
+                            and legal_person = #{legalPerson}
+                        </if>
+                        <if test="idCard != null  and idCard != ''">
+                            and id_card = #{idCard}
+                        </if>
+                        <if test="capital != null ">
+                            and capital = #{capital}
+                        </if>
+                        <if test="contactsName != null  and contactsName != ''">
+                            and contacts_name like concat('%', #{contactsName}, '%')
+                        </if>
+                        <if test="contactsPhone != null  and contactsPhone != ''">
+                            and contacts_phone = #{contactsPhone}
+                        </if>
+                        <if test="contactsType != null  and contactsType != ''">
+                            and contacts_type = #{contactsType}
+                        </if>
+                        <if test="contactsEmail != null  and contactsEmail != ''">
+                            and contacts_email = #{contactsEmail}
+                        </if>
+                        <if test="telephone != null  and telephone != ''">
+                            and telephone = #{telephone}
+                        </if>
+                        <if test="nation != null  and nation != ''">
+                            and nation = #{nation}
+                        </if>
+                        <if test="vat != null  and vat != ''">
+                            and vat = #{vat}
+                        </if>
+                        <if test="taxpayerId != null  and taxpayerId != ''">
+                            and taxpayer_id = #{taxpayerId}
+                        </if>
+                        <if test="currency != null  and currency != ''">
+                            and currency = #{currency}
+                        </if>
+                        <if test="personName != null  and personName != ''">
+                            and person_name like concat('%', #{personName}, '%')
+                        </if>
+                        <if test="personPhone != null  and personPhone != ''">
+                            and person_phone = #{personPhone}
+                        </if>
+                        <if test="personBank != null  and personBank != ''">
+                            and person_bank = #{personBank}
+                        </if>
+                        <if test="personAccount != null  and personAccount != ''">
+                            and person_account = #{personAccount}
+                        </if>
+                        <if test="accessStatus != null ">
+                            and access_status = #{accessStatus}
+                        </if>
+                        <if test="blacklistStatus != null ">
+                            and blacklist_status = #{blacklistStatus}
+                        </if>
+                        <if test="greylistStatus != null ">
+                            and greylist_status = #{greylistStatus}
+                        </if>
+                        <if test="fillinStatus != null ">
+                            and fillin_status = #{fillinStatus}
+                        </if>
+                        <if test="fillinBy != null  and fillinBy != ''">
+                            and fillin_by = #{fillinBy}
+                        </if>
+                        <if test="sapCode != null  and sapCode != ''">
+                            and sap_code = #{sapCode}
+                        </if>
+                        <if test="lastUpdateTime != null ">
+                            and last_update_time = #{lastUpdateTime}
+                        </if>
         </where>
     </select>
 
     <select id="selectCoscoSupplierBaseById" parameterType="String"
             resultMap="CoscoSupplierBaseResult">
-        <include refid="selectCoscoSupplierBaseVo"/>
-        where id = #{id}
+            <include refid="selectCoscoSupplierBaseVo"/>
+            where id = #{id}
     </select>
 
-    <insert id="insertCoscoSupplierBase"
-            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase">
+    <insert id="insertCoscoSupplierBase" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase">
         insert into cosco_supplier_base
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="supplierType != null">supplier_type,</if>
-            <if test="licenceAccessory != null">licence_accessory,</if>
-            <if test="licenceDate != null">licence_date,</if>
-            <if test="enterpriseType != null">enterprise_type,</if>
-            <if test="name != null">name,</if>
-            <if test="nameEn != null">name_en,</if>
-            <if test="socialCreditCode != null">social_credit_code,</if>
-            <if test="range != null">`range`,</if>
-            <if test="regAddress != null">reg_address,</if>
-            <if test="workAddress != null">work_address,</if>
-            <if test="parentCompanyInvestor != null">parent_company_investor,</if>
-            <if test="legalPerson != null">legal_person,</if>
-            <if test="idCard != null">id_card,</if>
-            <if test="capital != null">capital,</if>
-            <if test="contactsName != null">contacts_name,</if>
-            <if test="contactsPhone != null">contacts_phone,</if>
-            <if test="contactsType != null">contacts_type,</if>
-            <if test="contactsEmail != null">contacts_email,</if>
-            <if test="telephone != null">telephone,</if>
-            <if test="nation != null">nation,</if>
-            <if test="vat != null">vat,</if>
-            <if test="taxpayerId != null">taxpayer_id,</if>
-            <if test="currency != null">currency,</if>
-            <if test="personName != null">person_name,</if>
-            <if test="personPhone != null">person_phone,</if>
-            <if test="personBank != null">person_bank,</if>
-            <if test="personAccount != null">person_account,</if>
-            <if test="remark != null">remark,</if>
-            <if test="accessStatus != null">access_status,</if>
-            <if test="blacklistStatus != null">blacklist_status,</if>
-            <if test="greylistStatus != null">greylist_status,</if>
-            <if test="fillinStatus != null">fillin_status,</if>
-            <if test="fillinBy != null">fillin_by,</if>
-            <if test="sapCode != null">sap_code,</if>
-            <if test="delFlag != null and delFlag != ''">del_flag,</if>
-            <if test="createBy != null and createBy != ''">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="lastUpdateTime != null">last_update_time,</if>
+                    <if test="id != null">id,</if>
+                    <if test="supplierType != null">supplier_type,</if>
+                    <if test="licenceAccessory != null">licence_accessory,</if>
+                    <if test="licenceDate != null">licence_date,</if>
+                    <if test="enterpriseType != null">enterprise_type,</if>
+                    <if test="name != null">name,</if>
+                    <if test="nameEn != null">name_en,</if>
+                    <if test="socialCreditCode != null">social_credit_code,</if>
+                    <if test="range != null">`range`,</if>
+                    <if test="regAddress != null">reg_address,</if>
+                    <if test="workAddress != null">work_address,</if>
+                    <if test="parentCompanyInvestor != null">parent_company_investor,</if>
+                    <if test="legalPerson != null">legal_person,</if>
+                    <if test="idCard != null">id_card,</if>
+                    <if test="capital != null">capital,</if>
+                    <if test="contactsName != null">contacts_name,</if>
+                    <if test="contactsPhone != null">contacts_phone,</if>
+                    <if test="contactsType != null">contacts_type,</if>
+                    <if test="contactsEmail != null">contacts_email,</if>
+                    <if test="telephone != null">telephone,</if>
+                    <if test="nation != null">nation,</if>
+                    <if test="vat != null">vat,</if>
+                    <if test="taxpayerId != null">taxpayer_id,</if>
+                    <if test="currency != null">currency,</if>
+                    <if test="personName != null">person_name,</if>
+                    <if test="personPhone != null">person_phone,</if>
+                    <if test="personBank != null">person_bank,</if>
+                    <if test="personAccount != null">person_account,</if>
+                    <if test="remark != null">remark,</if>
+                    <if test="accessStatus != null">access_status,</if>
+                    <if test="blacklistStatus != null">blacklist_status,</if>
+                    <if test="greylistStatus != null">greylist_status,</if>
+                    <if test="fillinStatus != null">fillin_status,</if>
+                    <if test="fillinBy != null">fillin_by,</if>
+                    <if test="sapCode != null">sap_code,</if>
+                    <if test="delFlag != null and delFlag != ''">del_flag,</if>
+                    <if test="createBy != null and createBy != ''">create_by,</if>
+                    <if test="createTime != null">create_time,</if>
+                    <if test="updateBy != null">update_by,</if>
+                    <if test="updateTime != null">update_time,</if>
+                    <if test="lastUpdateTime != null">last_update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="supplierType != null">#{supplierType},</if>
-            <if test="licenceAccessory != null">#{licenceAccessory},</if>
-            <if test="licenceDate != null">#{licenceDate},</if>
-            <if test="enterpriseType != null">#{enterpriseType},</if>
-            <if test="name != null">#{name},</if>
-            <if test="nameEn != null">#{nameEn},</if>
-            <if test="socialCreditCode != null">#{socialCreditCode},</if>
-            <if test="range != null">#{range},</if>
-            <if test="regAddress != null">#{regAddress},</if>
-            <if test="workAddress != null">#{workAddress},</if>
-            <if test="parentCompanyInvestor != null">#{parentCompanyInvestor},</if>
-            <if test="legalPerson != null">#{legalPerson},</if>
-            <if test="idCard != null">#{idCard},</if>
-            <if test="capital != null">#{capital},</if>
-            <if test="contactsName != null">#{contactsName},</if>
-            <if test="contactsPhone != null">#{contactsPhone},</if>
-            <if test="contactsType != null">#{contactsType},</if>
-            <if test="contactsEmail != null">#{contactsEmail},</if>
-            <if test="telephone != null">#{telephone},</if>
-            <if test="nation != null">#{nation},</if>
-            <if test="vat != null">#{vat},</if>
-            <if test="taxpayerId != null">#{taxpayerId},</if>
-            <if test="currency != null">#{currency},</if>
-            <if test="personName != null">#{personName},</if>
-            <if test="personPhone != null">#{personPhone},</if>
-            <if test="personBank != null">#{personBank},</if>
-            <if test="personAccount != null">#{personAccount},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="accessStatus != null">#{accessStatus},</if>
-            <if test="blacklistStatus != null">#{blacklistStatus},</if>
-            <if test="greylistStatus != null">#{greylistStatus},</if>
-            <if test="fillinStatus != null">#{fillinStatus},</if>
-            <if test="fillinBy != null">#{fillinBy},</if>
-            <if test="sapCode != null">#{sapCode},</if>
-            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
-            <if test="createBy != null and createBy != ''">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
+                    <if test="id != null">#{id},</if>
+                    <if test="supplierType != null">#{supplierType},</if>
+                    <if test="licenceAccessory != null">#{licenceAccessory},</if>
+                    <if test="licenceDate != null">#{licenceDate},</if>
+                    <if test="enterpriseType != null">#{enterpriseType},</if>
+                    <if test="name != null">#{name},</if>
+                    <if test="nameEn != null">#{nameEn},</if>
+                    <if test="socialCreditCode != null">#{socialCreditCode},</if>
+                    <if test="range != null">#{range},</if>
+                    <if test="regAddress != null">#{regAddress},</if>
+                    <if test="workAddress != null">#{workAddress},</if>
+                    <if test="parentCompanyInvestor != null">#{parentCompanyInvestor},</if>
+                    <if test="legalPerson != null">#{legalPerson},</if>
+                    <if test="idCard != null">#{idCard},</if>
+                    <if test="capital != null">#{capital},</if>
+                    <if test="contactsName != null">#{contactsName},</if>
+                    <if test="contactsPhone != null">#{contactsPhone},</if>
+                    <if test="contactsType != null">#{contactsType},</if>
+                    <if test="contactsEmail != null">#{contactsEmail},</if>
+                    <if test="telephone != null">#{telephone},</if>
+                    <if test="nation != null">#{nation},</if>
+                    <if test="vat != null">#{vat},</if>
+                    <if test="taxpayerId != null">#{taxpayerId},</if>
+                    <if test="currency != null">#{currency},</if>
+                    <if test="personName != null">#{personName},</if>
+                    <if test="personPhone != null">#{personPhone},</if>
+                    <if test="personBank != null">#{personBank},</if>
+                    <if test="personAccount != null">#{personAccount},</if>
+                    <if test="remark != null">#{remark},</if>
+                    <if test="accessStatus != null">#{accessStatus},</if>
+                    <if test="blacklistStatus != null">#{blacklistStatus},</if>
+                    <if test="greylistStatus != null">#{greylistStatus},</if>
+                    <if test="fillinStatus != null">#{fillinStatus},</if>
+                    <if test="fillinBy != null">#{fillinBy},</if>
+                    <if test="sapCode != null">#{sapCode},</if>
+                    <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+                    <if test="createBy != null and createBy != ''">#{createBy},</if>
+                    <if test="createTime != null">#{createTime},</if>
+                    <if test="updateBy != null">#{updateBy},</if>
+                    <if test="updateTime != null">#{updateTime},</if>
+                    <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
         </trim>
     </insert>
     <insert id="batchCoscoSupplierBase" parameterType="java.util.List">
         insert into cosco_supplier_base
-        ( id, supplier_type, licence_accessory, licence_date, enterprise_type, name, name_en, social_credit_code, range,
-        reg_address, work_address, parent_company_investor, legal_person, id_card, capital, contacts_name,
-        contacts_phone, contacts_type, contacts_email, telephone, nation, vat, taxpayer_id, currency, person_name,
-        person_phone, person_bank, person_account, remark, access_status, blacklist_status, greylist_status,
-        fillin_status, fillin_by, sap_code, del_flag, create_by, create_time, update_by, update_time, last_update_time)
+        ( id, supplier_type, licence_accessory, licence_date, enterprise_type, name, name_en, social_credit_code, `range`, reg_address, work_address, parent_company_investor, legal_person, id_card, capital, contacts_name, contacts_phone, contacts_type, contacts_email, telephone, nation, vat, taxpayer_id, currency, person_name, person_phone, person_bank, person_account, remark, access_status, blacklist_status, greylist_status, fillin_status, fillin_by, sap_code, del_flag, create_by, create_time, update_by, update_time, last_update_time)
         values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.supplierType}, #{item.licenceAccessory}, #{item.licenceDate}, #{item.enterpriseType},
-            #{item.name}, #{item.nameEn}, #{item.socialCreditCode}, #{item.range}, #{item.regAddress},
-            #{item.workAddress}, #{item.parentCompanyInvestor}, #{item.legalPerson}, #{item.idCard}, #{item.capital},
-            #{item.contactsName}, #{item.contactsPhone}, #{item.contactsType}, #{item.contactsEmail}, #{item.telephone},
-            #{item.nation}, #{item.vat}, #{item.taxpayerId}, #{item.currency}, #{item.personName}, #{item.personPhone},
-            #{item.personBank}, #{item.personAccount}, #{item.remark}, #{item.accessStatus}, #{item.blacklistStatus},
-            #{item.greylistStatus}, #{item.fillinStatus}, #{item.fillinBy}, #{item.sapCode}, #{item.delFlag},
-            #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime})
+            ( #{item.id}, #{item.supplierType}, #{item.licenceAccessory}, #{item.licenceDate}, #{item.enterpriseType}, #{item.name}, #{item.nameEn}, #{item.socialCreditCode}, #{item.range}, #{item.regAddress}, #{item.workAddress}, #{item.parentCompanyInvestor}, #{item.legalPerson}, #{item.idCard}, #{item.capital}, #{item.contactsName}, #{item.contactsPhone}, #{item.contactsType}, #{item.contactsEmail}, #{item.telephone}, #{item.nation}, #{item.vat}, #{item.taxpayerId}, #{item.currency}, #{item.personName}, #{item.personPhone}, #{item.personBank}, #{item.personAccount}, #{item.remark}, #{item.accessStatus}, #{item.blacklistStatus}, #{item.greylistStatus}, #{item.fillinStatus}, #{item.fillinBy}, #{item.sapCode}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime})
         </foreach>
     </insert>
-    <update id="updateCoscoSupplierBase"
-            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase">
+    <update id="updateCoscoSupplierBase" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase">
         update cosco_supplier_base
         <trim prefix="SET" suffixOverrides=",">
-            <if test="supplierType != null">supplier_type =
-                #{supplierType},
-            </if>
-            <if test="licenceAccessory != null">licence_accessory =
-                #{licenceAccessory},
-            </if>
-            <if test="licenceDate != null">licence_date =
-                #{licenceDate},
-            </if>
-            <if test="enterpriseType != null">enterprise_type =
-                #{enterpriseType},
-            </if>
-            <if test="name != null">name =
-                #{name},
-            </if>
-            <if test="nameEn != null">name_en =
-                #{nameEn},
-            </if>
-            <if test="socialCreditCode != null">social_credit_code =
-                #{socialCreditCode},
-            </if>
-            <if test="range != null">range =
-                #{range},
-            </if>
-            <if test="regAddress != null">reg_address =
-                #{regAddress},
-            </if>
-            <if test="workAddress != null">work_address =
-                #{workAddress},
-            </if>
-            <if test="parentCompanyInvestor != null">parent_company_investor =
-                #{parentCompanyInvestor},
-            </if>
-            <if test="legalPerson != null">legal_person =
-                #{legalPerson},
-            </if>
-            <if test="idCard != null">id_card =
-                #{idCard},
-            </if>
-            <if test="capital != null">capital =
-                #{capital},
-            </if>
-            <if test="contactsName != null">contacts_name =
-                #{contactsName},
-            </if>
-            <if test="contactsPhone != null">contacts_phone =
-                #{contactsPhone},
-            </if>
-            <if test="contactsType != null">contacts_type =
-                #{contactsType},
-            </if>
-            <if test="contactsEmail != null">contacts_email =
-                #{contactsEmail},
-            </if>
-            <if test="telephone != null">telephone =
-                #{telephone},
-            </if>
-            <if test="nation != null">nation =
-                #{nation},
-            </if>
-            <if test="vat != null">vat =
-                #{vat},
-            </if>
-            <if test="taxpayerId != null">taxpayer_id =
-                #{taxpayerId},
-            </if>
-            <if test="currency != null">currency =
-                #{currency},
-            </if>
-            <if test="personName != null">person_name =
-                #{personName},
-            </if>
-            <if test="personPhone != null">person_phone =
-                #{personPhone},
-            </if>
-            <if test="personBank != null">person_bank =
-                #{personBank},
-            </if>
-            <if test="personAccount != null">person_account =
-                #{personAccount},
-            </if>
-            <if test="remark != null">remark =
-                #{remark},
-            </if>
-            <if test="accessStatus != null">access_status =
-                #{accessStatus},
-            </if>
-            <if test="blacklistStatus != null">blacklist_status =
-                #{blacklistStatus},
-            </if>
-            <if test="greylistStatus != null">greylist_status =
-                #{greylistStatus},
-            </if>
-            <if test="fillinStatus != null">fillin_status =
-                #{fillinStatus},
-            </if>
-            <if test="fillinBy != null">fillin_by =
-                #{fillinBy},
-            </if>
-            <if test="sapCode != null">sap_code =
-                #{sapCode},
-            </if>
-            <if test="delFlag != null and delFlag != ''">del_flag =
-                #{delFlag},
-            </if>
-            <if test="createBy != null and createBy != ''">create_by =
-                #{createBy},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="updateBy != null">update_by =
-                #{updateBy},
-            </if>
-            <if test="updateTime != null">update_time =
-                #{updateTime},
-            </if>
-            <if test="lastUpdateTime != null">last_update_time =
-                #{lastUpdateTime},
-            </if>
+                    <if test="supplierType != null">supplier_type =
+                        #{supplierType},
+                    </if>
+                    <if test="licenceAccessory != null">licence_accessory =
+                        #{licenceAccessory},
+                    </if>
+                    <if test="licenceDate != null">licence_date =
+                        #{licenceDate},
+                    </if>
+                    <if test="enterpriseType != null">enterprise_type =
+                        #{enterpriseType},
+                    </if>
+                    <if test="name != null">name =
+                        #{name},
+                    </if>
+                    <if test="nameEn != null">name_en =
+                        #{nameEn},
+                    </if>
+                    <if test="socialCreditCode != null">social_credit_code =
+                        #{socialCreditCode},
+                    </if>
+                    <if test="range != null">`range` =
+                        #{range},
+                    </if>
+                    <if test="regAddress != null">reg_address =
+                        #{regAddress},
+                    </if>
+                    <if test="workAddress != null">work_address =
+                        #{workAddress},
+                    </if>
+                    <if test="parentCompanyInvestor != null">parent_company_investor =
+                        #{parentCompanyInvestor},
+                    </if>
+                    <if test="legalPerson != null">legal_person =
+                        #{legalPerson},
+                    </if>
+                    <if test="idCard != null">id_card =
+                        #{idCard},
+                    </if>
+                    <if test="capital != null">capital =
+                        #{capital},
+                    </if>
+                    <if test="contactsName != null">contacts_name =
+                        #{contactsName},
+                    </if>
+                    <if test="contactsPhone != null">contacts_phone =
+                        #{contactsPhone},
+                    </if>
+                    <if test="contactsType != null">contacts_type =
+                        #{contactsType},
+                    </if>
+                    <if test="contactsEmail != null">contacts_email =
+                        #{contactsEmail},
+                    </if>
+                    <if test="telephone != null">telephone =
+                        #{telephone},
+                    </if>
+                    <if test="nation != null">nation =
+                        #{nation},
+                    </if>
+                    <if test="vat != null">vat =
+                        #{vat},
+                    </if>
+                    <if test="taxpayerId != null">taxpayer_id =
+                        #{taxpayerId},
+                    </if>
+                    <if test="currency != null">currency =
+                        #{currency},
+                    </if>
+                    <if test="personName != null">person_name =
+                        #{personName},
+                    </if>
+                    <if test="personPhone != null">person_phone =
+                        #{personPhone},
+                    </if>
+                    <if test="personBank != null">person_bank =
+                        #{personBank},
+                    </if>
+                    <if test="personAccount != null">person_account =
+                        #{personAccount},
+                    </if>
+                    <if test="remark != null">remark =
+                        #{remark},
+                    </if>
+                    <if test="accessStatus != null">access_status =
+                        #{accessStatus},
+                    </if>
+                    <if test="blacklistStatus != null">blacklist_status =
+                        #{blacklistStatus},
+                    </if>
+                    <if test="greylistStatus != null">greylist_status =
+                        #{greylistStatus},
+                    </if>
+                    <if test="fillinStatus != null">fillin_status =
+                        #{fillinStatus},
+                    </if>
+                    <if test="fillinBy != null">fillin_by =
+                        #{fillinBy},
+                    </if>
+                    <if test="sapCode != null">sap_code =
+                        #{sapCode},
+                    </if>
+                    <if test="delFlag != null and delFlag != ''">del_flag =
+                        #{delFlag},
+                    </if>
+                    <if test="createBy != null and createBy != ''">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+                    <if test="lastUpdateTime != null">last_update_time =
+                        #{lastUpdateTime},
+                    </if>
         </trim>
         where id = #{id}
     </update>
 
     <update id="deleteCoscoSupplierBaseById" parameterType="String">
-        update cosco_supplier_base
-        set del_flag = 2
+        update cosco_supplier_base set del_flag = 2
         where id = #{id}
     </update>
 
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBankMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBankMapper.xml
index ecdd31d..1872e6b 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBankMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBankMapper.xml
@@ -147,6 +147,9 @@
                     <if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">supplier_change_apply_id =
                         #{supplierChangeApplyId},
                     </if>
+                    <if test="supplierBankId != null and supplierBankId != ''">supplier_bank_id =
+                        #{supplierBankId},
+                    </if>
         </trim>
         where id = #{id}
     </update>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeQualificationsMapper.xml
index a4f681f..6740fae 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeQualificationsMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeQualificationsMapper.xml
@@ -138,6 +138,10 @@
                     <if test="supplierChangeApplyId != null and supplierChangeApplyId != ''">supplier_change_apply_id =
                         #{supplierChangeApplyId},
                     </if>
+                    <if test="supplierQualificationsId != null and supplierQualificationsId != ''">supplier_qualifications_id =
+                        #{supplierQualificationsId},
+                    </if>
+
         </trim>
         where id = #{id}
     </update>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml
index 883458c..dad332c 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml
@@ -172,8 +172,8 @@
     </update>
 
     <update id="deleteCoscoSupplierInvoiceById" parameterType="String">
-        update cosco_supplier_invoice set del_flag = 2
-        where id = #{id}
+        update cosco_supplier_invoice set del_flag = 'deleted'
+        where supplier_id = #{supplierId}
     </update>
 
     <update id="deleteCoscoSupplierInvoiceByIds" parameterType="String">
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
index 5bf1eec..3e34c3d 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
@@ -172,8 +172,8 @@
     </update>
 
     <update id="deleteCoscoSupplierQualificationsById" parameterType="String">
-        update cosco_supplier_qualifications set del_flag = 2
-        where id = #{id}
+        update cosco_supplier_qualifications set del_flag = 'deleted'
+        where supplier_id = #{supplierId}
     </update>
 
     <update id="deleteCoscoSupplierQualificationsByIds" parameterType="String">