diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
index 52dd4bd..5ed57cc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
@@ -53,4 +53,14 @@ public interface CoscoCategoryConstant {
      * 最高级 0
      */
     public static final String LEVEL_TOP = "0";
+
+        /**
+     *      * 类型(0.分类、1.品类)
+     *      */
+        public static final Long CATEGORY_TYPE_CATEGORY = 0L;
+        /**
+     *      * 类型(0.分类、1.品类)
+     *      */
+        public static final Long CATEGORY_TYPE_CATEGORY_TYPE = 1L;
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java
index af67625..ac1659e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java
@@ -1,18 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.common;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Entity基类
@@ -56,9 +50,6 @@ public class CoscoBaseEntity implements Serializable
     @ApiModelProperty(value = "备注")
     private String remark;
 
-    /** 请求参数 */
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> params;
 
     public String getSearchValue()
     {
@@ -120,20 +111,6 @@ public class CoscoBaseEntity implements Serializable
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
-
     public Integer getPageNo() {
         return pageNo;
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
index a4c1617..0e328e9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
@@ -102,7 +102,7 @@
 
     <select id="selectCategoryNameById" parameterType="string" resultType="string">
         SELECT
-            GROUP_CONCAT(c2.category_name ORDER BY FIND_IN_SET(c2.id, CONCAT(c1.ancestors, ',', c1.id)) SEPARATOR '-') AS full_path
+            GROUP_CONCAT(c2.category_name ORDER BY FIND_IN_SET(c2.id, CONCAT(c1.ancestors, ',', c1.id)) SEPARATOR '>') AS full_path
         FROM
             cosco_category c1
                 JOIN
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
index 92e85d6..f5d40fc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
@@ -67,7 +67,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
         coscoCategory.setId(PropertyUtils.getSnowflakeId());
         if (!coscoCategory.getParentId().equals(CoscoCategoryConstant.LEVEL_TOP)) {
             CoscoCategory coscoCategory1 = coscoCategoryMapper.selectCoscoCategoryById(coscoCategory.getParentId());
-            if (coscoCategory1.getType().equals(1L)) {
+            if (coscoCategory1.getType().equals(CoscoCategoryConstant.CATEGORY_TYPE_CATEGORY_TYPE)) {
                 throw new RuntimeException(ErrorMessageConstant.ENABLE_DISABLE_TEMPLATE_NOT_MODIFY);
             }
             coscoCategory.setAncestors(coscoCategory1.getAncestors() + "," + coscoCategory.getId());
@@ -87,7 +87,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
     @Override
     public int updateCoscoCategory(CoscoCategory coscoCategory) {
         coscoCategory.setUpdateTime(new Date());
-        coscoCategory.setUpdateBy("1");
+        coscoCategory.setUpdateBy(SupplierUserConstant.USER_NAME);
         return coscoCategoryMapper.updateCoscoCategory(coscoCategory);
     }
 
@@ -136,7 +136,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
          * 获取全部上级部门id
          */
         List<String> deptIds = new ArrayList<>();
-        deptIds.add("dep01");
+        deptIds.add(SupplierUserConstant.DEPT_ID);
         coscoCategory.setDeptIds(deptIds);
         return selectCategoryTree(coscoCategory);
     }
@@ -154,7 +154,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
     private List<CoscoCategoryVO> buildTree(List<CoscoCategoryVO> categories) {
         // 获取所有顶级节点 (parentId = "0")
         List<CoscoCategoryVO> rootNodes = categories.stream()
-                .filter(c -> "0".equals(c.getParentId()))
+                .filter(c -> CoscoCategoryConstant.LEVEL_TOP.equals(c.getParentId()))
                 .map(this::convertToTreeDto)
                 .collect(Collectors.toList());
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java
index ebb11d9..34b9f07 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java
@@ -5,14 +5,12 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
index ff01d15..5424119 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
@@ -1,12 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 /**
@@ -41,6 +34,7 @@ public class CoscoAccessWorkController extends BaseController {
     @ApiOperation("查询分页数据")
     @PostMapping("/getPage")
     public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
+        data.setCreateBy("E0001");
         return BaseResponse.success(coscoAccessWorkService.getPage(data));
     }
 
@@ -85,6 +79,7 @@ public class CoscoAccessWorkController extends BaseController {
     @ApiOperation("查询数据")
     @GetMapping("/reviewInfo")
     public BaseResponse<List<CoscoAccessSupplier>> reviewInfo(@ApiParam(value = "主键id", required = true) String id,@ApiParam(value = "用户id", required = true) String userId){
+        userId = "E0001";
         return BaseResponse.success(coscoAccessWorkService.reviewInfo(id,userId));
     }
 
@@ -107,6 +102,7 @@ public class CoscoAccessWorkController extends BaseController {
     @ApiOperation("修改数据")
     @PostMapping("/update")
     public BaseResponse<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessUserItemVo vo){
+        vo.setUserId("E0001");
         return BaseResponse.success(coscoAccessWorkService.updateCoscoAccessWork(vo));
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
index d01eb85..ba07816 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
@@ -1,25 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java
index 715198b..7f96de8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java
@@ -1,24 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBankService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java
index e1abf2e..4408141 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java
@@ -1,23 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.*;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
-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.CoscoSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService;
@@ -27,6 +16,14 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 
 /**
  * 中远海运_供应商_基本信息Controller
@@ -42,16 +39,18 @@ public class CoscoSupplierBaseController extends BaseController {
 
 
     /**
-     * 查询分页数据
+     * 查询未准入供应商分页数据
      * @return 返回结果
      */
     @ApiOperation("查询分页数据")
     @PostMapping("/getPage")
     public BaseResponse<IPage<CoscoSupplierBase>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) {
-
-        return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase));
+        return BaseResponse.success(coscoSupplierBaseService.selectWzrPageList(coscoSupplierBase));
     }
 
+
+
+
     /**
      * 分页查询已准入的供应商给用户进行选择
      */
@@ -87,6 +86,17 @@ public class CoscoSupplierBaseController extends BaseController {
     }
 
 
+    /**
+     * 全部注册的供应商查询分页数据
+     * @return 返回结果
+     */
+    @ApiOperation("查询分页数据")
+    @PostMapping("/getRegisterPage")
+    public BaseResponse<IPage<CoscoSupplierBase>> getRegisterPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) {
+        return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase));
+    }
+
+
     /**
      * 代录列表查询分页数据
      * @return 返回结果
@@ -128,31 +138,36 @@ public class CoscoSupplierBaseController extends BaseController {
 
 
     /**
-     * 导出合格供应商列表查询分页数据
+     * 导出合我的分页数据
      * @return
      */
 
     @GetMapping("/getPageMyExport")
-    public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception {
-        coscoSupplierBase.setCreateBy("1");
-        List<CoscoSupplierBase> list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase);
+    public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase){
+        try{
+            coscoSupplierBase.setCreateBy("1");
+            List<CoscoSupplierBase> list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase);
 
-        // 动态设置导出字段（忽略未标注字段）
-        Set<String> includeFields = new HashSet<>(Arrays.asList(
-                "name","supplierTypeCn", "enterpriseType","categoryName","updateTime" // 指定要导出的字段名
-        ));
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "name","supplierTypeCn", "enterpriseType","categoryName","updateTime" // 指定要导出的字段名
+            ));
 
-        String fileName = URLEncoder.encode("我的供应商.xlsx", "UTF-8");
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-        response.setCharacterEncoding("utf-8");
+            String fileName = URLEncoder.encode("我的供应商.xlsx", "UTF-8");
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+
+            EasyExcelFactory.write(response.getOutputStream())
+                    .includeColumnFieldNames(includeFields)
+                    .head(CoscoSupplierBase.class)
+                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
+                    .sheet("我的供应商")
+                    .doWrite(list);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
-        EasyExcel.write(response.getOutputStream())
-                .includeColumnFieldNames(includeFields)
-                .head(CoscoSupplierBase.class)
-                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
-                .sheet("我的供应商")
-                .doWrite(list);
     }
 
 
@@ -162,27 +177,32 @@ public class CoscoSupplierBaseController extends BaseController {
      */
 
     @GetMapping("/getPageQualifiedExport")
-    public void getPageQualifiedExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception {
-        coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
-        coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W);
-        List<CoscoSupplierBase> list = coscoSupplierBaseService.selectCoscoSupplierBaseList(coscoSupplierBase);
+    public void getPageQualifiedExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase){
+        try{
+            coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
+            coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W);
+            List<CoscoSupplierBase> list = coscoSupplierBaseService.selectCoscoSupplierBaseList(coscoSupplierBase);
 
-        // 动态设置导出字段（忽略未标注字段）
-        Set<String> includeFields = new HashSet<>(Arrays.asList(
-                "name", "socialCreditCode","supplierTypeCn", "enterpriseType","createTime" // 指定要导出的字段名
-        ));
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "name", "socialCreditCode","supplierTypeCn", "enterpriseType","createTime" // 指定要导出的字段名
+            ));
 
-        String fileName = URLEncoder.encode("合格供应商.xlsx", "UTF-8");
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-        response.setCharacterEncoding("utf-8");
+            String fileName = URLEncoder.encode("合格供应商.xlsx", "UTF-8");
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+
+            EasyExcelFactory.write(response.getOutputStream())
+                    .includeColumnFieldNames(includeFields)
+                    .head(CoscoSupplierBase.class)
+                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
+                    .sheet("合格供应商")
+                    .doWrite(list);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
-        EasyExcel.write(response.getOutputStream())
-                .includeColumnFieldNames(includeFields)
-                .head(CoscoSupplierBase.class)
-                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
-                .sheet("合格供应商")
-                .doWrite(list);
     }
 
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java
index de3a6cd..7910a16 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java
@@ -4,14 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeApplyService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 
 /**
@@ -40,29 +38,8 @@ public class CoscoSupplierChangeApplyController extends BaseController {
 
 
 
-    /**
-     * 供应商信息变更申请------------原来比对逻辑（作废）
-     * @param vo
-     * @return
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/add")
-    public BaseResponse<Boolean> add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierChangeApplyVo vo){
-        return BaseResponse.success(coscoSupplierChangeApplyService.insertCoscoSupplierChangeApply(vo));
-    }
 
 
-    /**
-     * 供应商信息主表详情信息(作废)
-     * @param id
-     * @return
-     */
-    @ApiOperation("查询数据")
-    @GetMapping("/{id}")
-    public BaseResponse<CoscoSupplierDiffVo> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
-
-        return BaseResponse.success(coscoSupplierChangeApplyService.selectCoscoSupplierChangeApplyById(id));
-    }
 
     /**
      * 供应商信息主表详情信息
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java
index 5056c6e..8280d00 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java
@@ -1,24 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierInvoiceService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java
index 0d67205..be80979 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java
@@ -1,24 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierQualificationsService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java
index 80091e4..011c285 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java
@@ -1,24 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyAttachmentsService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java
index bbeae10..35ba973 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java
@@ -3,8 +3,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSurveyQuestionController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSurveyQuestionController.java
index 41701b0..9a7310e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSurveyQuestionController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSurveyQuestionController.java
@@ -7,7 +7,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSurveyQuesti
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSurveyQuestionService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java
index fcb0f22..a104f69 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java
index 80e8623..f5b282e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java
index 3eb6094..42092ff 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java
@@ -2,8 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java
index 8f5e9be..1d21da1 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
 import org.springframework.data.repository.query.Param;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java
index ed29d21..1f858c1 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 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.vo.BaseCategoryNameVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
@@ -33,6 +32,10 @@ public interface CoscoSupplierBaseMapper {
      */
     public List<CoscoSupplierBase> selectCoscoSupplierBaseList(CoscoSupplierBase coscoSupplierBase);
 
+
+
+    IPage<CoscoSupplierBase> selectWzrPageList(IPage<CoscoSupplierBase> page, @Param("vo") CoscoSupplierBase vo);
+
     IPage<CoscoSupplierBase> selectPageList(IPage<CoscoSupplierBase> page, @Param("vo") CoscoSupplierBase vo);
 
     //我准入的供应商
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeApplyMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeApplyMapper.java
index 836aea1..7e51e41 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeApplyMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeApplyMapper.java
@@ -1,12 +1,9 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 /**
  * 中远海运_供应商_供应商信息变更申请Mapper接口
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeBaseMapper.java
index 9507197..7c2e949 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeBaseMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeBaseMapper.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeBase;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.SupplierChangeDiffResult;
 
 import java.util.List;
 
@@ -33,7 +32,6 @@ public interface CoscoSupplierChangeBaseMapper {
     public List<CoscoSupplierChangeBase> selectCoscoSupplierChangeBaseList(CoscoSupplierChangeBase coscoSupplierChangeBase);
 
 
-    public SupplierChangeDiffResult selectDiff(CoscoSupplierChangeBase coscoSupplierChangeBase);
 
     /**
      * 新增中远海运_供应商_变更后基本信息
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeInvoiceMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeInvoiceMapper.java
index 27dd3a4..4f3e450 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeInvoiceMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeInvoiceMapper.java
@@ -1,8 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeInvoice;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.InvoiceChangeDiffVo;
 
 import java.util.List;
 
@@ -35,8 +33,6 @@ public interface CoscoSupplierChangeInvoiceMapper {
     public List<CoscoSupplierChangeInvoice> selectCoscoSupplierChangeInvoiceList(CoscoSupplierChangeInvoice coscoSupplierChangeInvoice);
 
 
-    public InvoiceChangeDiffVo selectInvoiceDitt(CoscoSupplierChangeInvoice coscoSupplierChangeInvoice);
-
 
 
     /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierInvoiceMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierInvoiceMapper.java
index 8ac5647..57cbccb 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierInvoiceMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierInvoiceMapper.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
index aff9a1e..6d8b0f3 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo;
 import org.springframework.data.repository.query.Param;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierSurveyAttachmentsMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierSurveyAttachmentsMapper.java
index 5974729..dd1b808 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierSurveyAttachmentsMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierSurveyAttachmentsMapper.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
 import org.springframework.data.repository.query.Param;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java
index e79839a..ec76174 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
 import org.springframework.data.repository.query.Param;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessCategory.java
index d3b63d9..efe41ca 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessCategory.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessCategory.java
@@ -1,10 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItem.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItem.java
index 93cae48..8f45ba8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItem.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItem.java
@@ -1,16 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
 
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-
 /**
  * 供应商准入_准入工作评审项对象 cosco_access_item
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItemAttachments.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItemAttachments.java
index d3de3cc..1af3d69 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItemAttachments.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItemAttachments.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商准入_准入工作评审项附件对象 cosco_access_item_attachments
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java
index 3513374..4635403 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java
@@ -1,10 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java
index 6b94ae2..e906c13 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplierCategory.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商准入_供应商已准入品类对象 cosco_access_supplier_category
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java
index 7037eec..0c2ddff 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商准入_准入工作关联评审人员对象 cosco_access_user
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItem.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItem.java
index b64eef7..31148c5 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItem.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItem.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商准入_准入工作评审项关联评审人对象 cosco_access_user_item
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java
index 3d40dc5..3758543 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java
@@ -14,8 +14,6 @@ public class CoscoAccessUserItemVo {
     @Valid
     private String accessWorkId;
 
-    @NotNull(message = "评审人员id不能为空")
-    @Valid
     //暂时写死额的userId
     private String userId;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java
index 0a982f5..d72b613 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商准入_准入申请工作主对象 cosco_access_work
  *
@@ -40,12 +36,12 @@ public class CoscoAccessWork extends CoscoBaseEntity {
     private String accessType;
 
     /** 评审开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     //@Excel(name = "评审开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
 
     /** 评审结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     //@Excel(name = "评审结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
@@ -65,7 +61,7 @@ public class CoscoAccessWork extends CoscoBaseEntity {
     private String delFlag;
 
     /** 最后更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastUpdateTime;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkAttachments.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkAttachments.java
index 1b11404..f60ba74 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkAttachments.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkAttachments.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_准入申请工作附件对象 cosco_access_work_attachments
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java
index f305401..3a86990 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java
@@ -2,8 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class CoscoAccessWorkCategoryVo {
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBank.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBank.java
index 5ab4693..fb83ccb 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBank.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBank.java
@@ -1,13 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
-import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_银行账户对象 cosco_supplier_bank
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java
index 0dba31e..714bf49 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java
@@ -1,16 +1,14 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 /**
  * 中远海运_供应商_基本信息对象 cosco_supplier_base
@@ -217,6 +215,8 @@ public class CoscoSupplierBase {
     @ApiModelProperty(value = "修改人")
     private String updateBy;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
     //搜索条件品类
     private String categoryId;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java
index 89ce2b7..63c499d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java
@@ -1,15 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
 /**
  * 中远海运_供应商_供应商信息变更申请对象 cosco_supplier_change_apply
  *
@@ -64,8 +60,6 @@ public class CoscoSupplierChangeApply extends CoscoBaseEntity {
 
     private String approveStatusText;
 
-    private CoscoSupplierDiffVo coscoSupplierDiffVo;
-
     //变更内容字段
     private List<String> textList;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java
index 7552b39..5f655b6 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java
@@ -1,30 +1,28 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
+import java.io.Serializable;
 import java.util.List;
 
 
 @Data
-public class CoscoSupplierChangeApplyVo{
+public class CoscoSupplierChangeApplyVo  implements Serializable {
 
 
     //供应商id
-    public String supplierId;
+    private String supplierId;
 
     //变更供应商信息
-    public CoscoSupplierChangeBase coscoSupplierChangeBase;
+    private CoscoSupplierChangeBase coscoSupplierChangeBase;
 
     //资质信息
-    public List<CoscoSupplierChangeQualifications> coscoSupplierChangeQualificationsList;
+    private List<CoscoSupplierChangeQualifications> coscoSupplierChangeQualificationsList;
 
     //开票信息
-    public CoscoSupplierChangeInvoice coscoSupplierChangeInvoice;
+    private CoscoSupplierChangeInvoice coscoSupplierChangeInvoice;
 
     //银行账户
-    public List<CoscoSupplierChangeBank> coscoSupplierChangeBankList;
+    private List<CoscoSupplierChangeBank> coscoSupplierChangeBankList;
 
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBank.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBank.java
index bed7b33..b815d78 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBank.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBank.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBase.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBase.java
index 399b2f0..3a76054 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBase.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeBase.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java
index 8440ca2..0a6bbfb 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java
@@ -1,14 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_供应商信息变更历史记录对象 cosco_supplier_change_history
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeInvoice.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeInvoice.java
index 362dec7..896159e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeInvoice.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeInvoice.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeQualifications.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeQualifications.java
index bb74814..53de76e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeQualifications.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeQualifications.java
@@ -1,14 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_变更后资质信息对象 cosco_supplier_change_qualifications
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java
index 63b172c..a8871f0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierDiffVo.java
@@ -2,30 +2,17 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 @Data
-public class CoscoSupplierDiffVo {
+public class CoscoSupplierDiffVo implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     //主体任务
-    CoscoSupplierChangeApply coscoSupplierChangeApply;
-
-    //基础内容
-    SupplierChangeDiffResult supplierChangeDiffResult;
-
-    //资质内容
-    Map<String,Object> qualificationsMap;
-
-    //开票信息对比
-    InvoiceChangeDiffVo invoiceChangeDiffVo;
-
-    Map<String,Object> bankListMap;
-
-    //变更内容（作废）
-    List<String> txtList;
+    private CoscoSupplierChangeApply coscoSupplierChangeApply;
 
     //变更内容集合
 
-    List<CoscoSupplierChangeHistory> coscoSupplierChangeHistoryList;
+    private List<CoscoSupplierChangeHistory> coscoSupplierChangeHistoryList;
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierInvoice.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierInvoice.java
index 0e22af8..58c91d6 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierInvoice.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierInvoice.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_开票信息对象 cosco_supplier_invoice
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierQualifications.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierQualifications.java
index 4441dfe..91bdab7 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierQualifications.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierQualifications.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_资质信息对象 cosco_supplier_qualifications
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurvey.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurvey.java
index fe78eb0..ace3cde 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurvey.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurvey.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_社会准则符合性自查问卷_填写人信息对象 cosco_supplier_survey
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyAttachments.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyAttachments.java
index 06c9a15..4ec9693 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyAttachments.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyAttachments.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_承诺书及附件对象 cosco_supplier_survey_attachments
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java
index 067a427..b7c8b6f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_社会准则符合性自查问卷_问题回复对象 cosco_supplier_survey_question_reply
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierTianyanchaIc.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierTianyanchaIc.java
index 0d0bd73..495d96a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierTianyanchaIc.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierTianyanchaIc.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_供应商_天眼查工商信息标对象 cosco_supplier_tianyancha_ic
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java
index 4d5af7d..9d4d789 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java
@@ -3,7 +3,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 import lombok.Data;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java
index 630ed8a..355eac3 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java
@@ -1,14 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 供应商退出_供应商退出任务对象 cosco_supplierexit
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java
index d8ddcf3..ca43692 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java
index f12a1e5..db1a963 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java
index 9ac2f4d..64fdff1 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java
@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 import java.util.List;
 
 @Data
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestion.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestion.java
index e7d2fa8..e3795f7 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestion.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestion.java
@@ -1,12 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 中远海运_社会准则符合性自查问卷_问题对象 cosco_survey_question
  *
@@ -36,6 +36,6 @@ public class CoscoSurveyQuestion extends CoscoBaseEntity {
     //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastUpdateTime;
 
-    List<CoscoSurveyQuestionOption> coscoSurveyQuestionOptionList;
+    private List<CoscoSurveyQuestionOption> coscoSurveyQuestionOptionList;
 
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestionOption.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestionOption.java
index 821c2f3..669c85b 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestionOption.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSurveyQuestionOption.java
@@ -1,11 +1,11 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
 
-import java.util.Date;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 中远海运_社会准则符合性自查问卷_问题选项对象 cosco_survey_question_option
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/InvoiceChangeDiffVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/InvoiceChangeDiffVo.java
deleted file mode 100644
index 7c7c734..0000000
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/InvoiceChangeDiffVo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
-
-import lombok.Data;
-
-/**
- * 开票信息变更对比结果DTO
- */
-@Data
-public class InvoiceChangeDiffVo {
-    private String taxpayerTypeDiff;
-    private String taxpayerCodeDiff;
-    private String phoneDiff;
-    private String accountDiff;
-    private String headDiff;
-    private String addressDiff;
-    private String bankDiff;
-    private String qualificationCertificateDiff;
-
-    // Getter和Setter方法
-    public String getTaxpayerTypeDiff() {
-        return taxpayerTypeDiff;
-    }
-
-    public void setTaxpayerTypeDiff(String taxpayerTypeDiff) {
-        this.taxpayerTypeDiff = taxpayerTypeDiff;
-    }
-
-    public String getTaxpayerCodeDiff() {
-        return taxpayerCodeDiff;
-    }
-
-    public void setTaxpayerCodeDiff(String taxpayerCodeDiff) {
-        this.taxpayerCodeDiff = taxpayerCodeDiff;
-    }
-
-    public String getPhoneDiff() {
-        return phoneDiff;
-    }
-
-    public void setPhoneDiff(String phoneDiff) {
-        this.phoneDiff = phoneDiff;
-    }
-
-    public String getAccountDiff() {
-        return accountDiff;
-    }
-
-    public void setAccountDiff(String accountDiff) {
-        this.accountDiff = accountDiff;
-    }
-
-    public String getHeadDiff() {
-        return headDiff;
-    }
-
-    public void setHeadDiff(String headDiff) {
-        this.headDiff = headDiff;
-    }
-
-    public String getAddressDiff() {
-        return addressDiff;
-    }
-
-    public void setAddressDiff(String addressDiff) {
-        this.addressDiff = addressDiff;
-    }
-
-    public String getBankDiff() {
-        return bankDiff;
-    }
-
-    public void setBankDiff(String bankDiff) {
-        this.bankDiff = bankDiff;
-    }
-
-    public String getQualificationCertificateDiff() {
-        return qualificationCertificateDiff;
-    }
-
-    public void setQualificationCertificateDiff(String qualificationCertificateDiff) {
-        this.qualificationCertificateDiff = qualificationCertificateDiff;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/SupplierChangeDiffResult.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/SupplierChangeDiffResult.java
deleted file mode 100644
index 6b919f1..0000000
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/SupplierChangeDiffResult.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
-
-import lombok.Data;
-
-/**
- * 供应商变更差异比较结果实体类
- */
-@Data
-public class SupplierChangeDiffResult {
-    // 供应商身份类型差异
-    private String supplierTypeDiff;
-
-    // 营业执照附件差异
-    private String licenceAccessoryDiff;
-
-    // 营业执照有效期差异
-    private String licenceDateDiff;
-
-    // 企业类型差异
-    private String enterpriseTypeDiff;
-
-    // 企业名称差异
-    private String nameDiff;
-
-    // 企业英文名称差异
-    private String nameEnDiff;
-
-    // 统一社会信用代码差异
-    private String socialCreditCodeDiff;
-
-    // 经营范围差异
-    private String rangeDiff;
-
-    // 注册地址差异
-    private String regAddressDiff;
-
-    // 办公地址差异
-    private String workAddressDiff;
-
-    // 母公司/出资人信息差异
-    private String parentCompanyInvestorDiff;
-
-    // 法定代表人差异
-    private String legalPersonDiff;
-
-    // 身份证号差异
-    private String idCardDiff;
-
-    // 注册资本差异
-    private String capitalDiff;
-
-    // 联系人姓名差异
-    private String contactsNameDiff;
-
-    // 联系人手机差异
-    private String contactsPhoneDiff;
-
-    // 联系人身份类别差异
-    private String contactsTypeDiff;
-
-    // 联系人邮箱差异
-    private String contactsEmailDiff;
-
-    // 固定电话差异
-    private String telephoneDiff;
-
-    // 国家地区差异
-    private String nationDiff;
-
-    // 增值税号差异
-    private String vatDiff;
-
-    // 境外纳税人ID差异
-    private String taxpayerIdDiff;
-
-    // 币种差异
-    private String currencyDiff;
-
-    // 个人姓名差异
-    private String personNameDiff;
-
-    // 个人联系电话差异
-    private String personPhoneDiff;
-
-    // 个人开户行差异
-    private String personBankDiff;
-
-    // 个人银行账号差异
-    private String personAccountDiff;
-
-    // 备注差异
-    private String remarkDiff;
-}
\ No newline at end of file
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java
index 700b31d..1c8f9d8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java
@@ -1,11 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkCategoryVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
 
-import java.util.List;
-
 /**
  * 供应商准入_准入申请工作主Service接口
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
index b62a1bc..843ed01 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
@@ -1,8 +1,10 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java
index 0625553..06d42bd 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBankService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBankService.java
index 737f178..5a68fae 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBankService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBankService.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
 
 import java.util.List;
 
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 4d3dcdb..a30f6f8 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
@@ -1,8 +1,10 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
+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 com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 
 import java.util.List;
@@ -15,6 +17,9 @@ import java.util.List;
  */
 public interface ICoscoSupplierBaseService {
 
+    IPage<CoscoSupplierBase> selectWzrPageList(CoscoSupplierBase coscoSupplierBase);
+
+
     IPage<CoscoSupplierBase> getPage(CoscoSupplierBase coscoSupplierBase);
 
     IPage<CoscoSupplierBase> getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java
index ec56b29..dadb397 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeApplyService.java
@@ -1,9 +1,9 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
-
-import java.util.List;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApplyVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierDiffVo;
 
 /**
  * 中远海运_供应商_供应商信息变更申请Service接口
@@ -17,13 +17,6 @@ public interface ICoscoSupplierChangeApplyService {
 
 
 
-    /**
-     * 查询中远海运_供应商_供应商信息变更申请
-     *
-     * @param id 中远海运_供应商_供应商信息变更申请主键
-     * @return 中远海运_供应商_供应商信息变更申请
-     */
-    public CoscoSupplierDiffVo selectCoscoSupplierChangeApplyById(String id);
 
 
     public CoscoSupplierDiffVo supplierChangeApplyById(String id);
@@ -36,12 +29,6 @@ public interface ICoscoSupplierChangeApplyService {
      */
     public IPage<CoscoSupplierChangeApply> selectCoscoSupplierChangeApplyList(CoscoSupplierChangeApply coscoSupplierChangeApply);
 
-    /**
-     * 新增中远海运_供应商_供应商信息变更申请
-     *
-     * @return 结果
-     */
-    public Boolean insertCoscoSupplierChangeApply(CoscoSupplierChangeApplyVo vo);
 
     /**
      * 修改中远海运_供应商_供应商信息变更申请
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierInvoiceService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierInvoiceService.java
index 93e7ed3..2df267c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierInvoiceService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierInvoiceService.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 
 import java.util.List;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierQualificationsService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierQualificationsService.java
index 699a9b7..a4a3558 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierQualificationsService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierQualificationsService.java
@@ -1,8 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierSurveyAttachmentsService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierSurveyAttachmentsService.java
index 22edf1a..8c97a28 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierSurveyAttachmentsService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierSurveyAttachmentsService.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java
index 0648988..48d13a8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java
@@ -1,7 +1,10 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupplierCategoryVo;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessCategoryServiceImpl.java
index f92003e..0d34231 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessCategoryServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessCategoryMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商准入_准入申请关联品类Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java
index d1bd826..4d116e4 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java
@@ -1,8 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessItemAttachmentsMapper;
@@ -11,6 +8,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessItem
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_准入工作评审项附件Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java
index aacaf03..a3b2204 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java
@@ -1,16 +1,15 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessItemMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItem;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_准入工作评审项Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java
index b6202e1..e2cd4a4 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java
@@ -1,8 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
@@ -11,6 +8,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupp
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_供应商已准入品类Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
index c231088..b4a51db 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
@@ -1,7 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
@@ -14,6 +12,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商准入_关联供应商Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java
index fc6ca9c..d5a7ff5 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java
@@ -1,8 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserItemMapper;
@@ -11,6 +8,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessUser
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_准入工作评审项关联评审人Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java
index fe829a7..b2f1014 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java
@@ -1,17 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_准入工作关联评审人员Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java
index 8b5f213..e25537d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java
@@ -1,8 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkAttachmentsMapper;
@@ -11,6 +8,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWork
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 中远海运_准入申请工作附件Service业务层处理
  *
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 460e289..00f00c8 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
@@ -2,13 +2,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
 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.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessCategoryMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
@@ -201,14 +203,24 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
         CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
         coscoAccessSupplier.setAccessWorkId(vo.getId());
         List<CoscoAccessSupplier>  supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier);
+        //处理审批逻辑
+        approveYandN(vo, coscoAccessWorkData, supplierIdList, supplierList);
 
+        //封装消息内容实体
+        coscoSupplierAccessWorkVo.setSupplierList(supplierIdList);
+        coscoSupplierAccessWorkVo.setApproveStatus(vo.getApproveStatus());
+        coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());
 
+        return coscoSupplierAccessWorkVo;
+    }
+
+    private void approveYandN(CoscoAccessWork vo, CoscoAccessWork coscoAccessWorkData, List<CoscoAccessSupplier> supplierIdList, List<CoscoAccessSupplier> supplierList) {
         //审批通过
         if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
             //把准入的品类添加到已准入品类表
 
 
-            for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
+            for(CoscoAccessSupplier coscoAccessSupplier1 : supplierList){
                 //根据id查询全部需要准入的品类
                 CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
                 coscoAccessCategory.setAccessWorkId(vo.getId());
@@ -237,7 +249,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
             }
 
         }else{   //审批未通过
-            for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
+            for(CoscoAccessSupplier coscoAccessSupplier1 : supplierList){
                 //根据id查询全部需要准入的品类
                 CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
                 coscoAccessCategory.setAccessWorkId(vo.getId());
@@ -246,13 +258,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
                 supplierIdList.add(coscoAccessSupplier1);
             }
         }
-
-        //封装消息内容实体
-        coscoSupplierAccessWorkVo.setSupplierList(supplierIdList);
-        coscoSupplierAccessWorkVo.setApproveStatus(vo.getApproveStatus());
-        coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());
-
-        return coscoSupplierAccessWorkVo;
     }
 
 
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 ee5722b..063b03a 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
@@ -1,26 +1,28 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
-import com.chinaunicom.zyhy.ebtp.supplier.common.*;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
+import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应商准入_准入申请工作主Service业务层处理
  *
@@ -30,6 +32,9 @@ import org.springframework.util.ObjectUtils;
 @Service
 public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
 
+    @Autowired
+    private ICoscoCategoryService coscoCategoryService;
+
 
     @Autowired
     private ICoscoSupplierBaseService coscoSupplierBaseService;
@@ -100,6 +105,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
 
 
 
+
+
+
     @Override
     public IPage<CoscoAccessWork> getPage(CoscoAccessWork data) {
         // 创建分页对象（当前页，每页大小）
@@ -113,7 +121,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
             //暂时这么写，这里需要获取登录人信息
             coscoAccessUser.setUserId(data.getCreateBy());
             coscoAccessUser.setIsLeader(CoscoType.IS_LEADER_SHI);
-            if(coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser).size() > 0){
+            if (!CollectionUtils.isEmpty(coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser))) {
                 coscoAccessWork.setIsLeader(CoscoType.IS_LEADER_SHI);
             }else{
                 coscoAccessWork.setIsLeader(CoscoType.IS_LEADER_FO);
@@ -153,7 +161,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         //品类
         CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
         coscoAccessCategory.setAccessWorkId(id);
-        vo.setCoscoAccessCategoryList(coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory));
+        List<CoscoAccessCategory>  coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
+        for(CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
+            coscoAccessCategory1.setCategoryName(coscoCategoryService.getCategoryNameById(coscoAccessCategory1.getCategoryId()));
+        }
+        vo.setCoscoAccessCategoryList(coscoAccessCategoryList);
 
         //人员信息
         CoscoAccessUser coscoAccessUser = new CoscoAccessUser();
@@ -199,7 +211,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
                     CoscoAccessItemAttachments coscoAccessItemAttachments = new CoscoAccessItemAttachments();
                     coscoAccessItemAttachments.setAccessUserItemId(coscoAccessUserItem1.getId());
                     List<CoscoAccessItemAttachments> list = coscoAccessItemAttachmentsMapper.selectCoscoAccessItemAttachmentsList(coscoAccessItemAttachments);
-                    if(list.size() > 0){
+                    if (!CollectionUtils.isEmpty(list)) {
                         coscoAccessUserItem1.setCoscoAccessTtemAttachments(list.get(0));
                     }
                 }
@@ -237,7 +249,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
                     CoscoAccessItemAttachments coscoAccessItemAttachments = new CoscoAccessItemAttachments();
                     coscoAccessItemAttachments.setAccessUserItemId(coscoAccessUserItem1.getId());
                     List<CoscoAccessItemAttachments> list = coscoAccessItemAttachmentsMapper.selectCoscoAccessItemAttachmentsList(coscoAccessItemAttachments);
-                    if(list.size() > 0){
+                    if (!CollectionUtils.isEmpty(list)) {
                         coscoAccessUserItem1.setCoscoAccessTtemAttachments(list.get(0));
                     }
                 }
@@ -289,89 +301,16 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         coscoAccessWork.setLastUpdateTime(date);
         coscoAccessWorkMapper.insertCoscoAccessWork(coscoAccessWork);
 
-        //品类集合
-        for(String cId : vo.getCategoryIds()){
-            CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
-            coscoAccessCategory.setAccessWorkId(workId);
-            coscoAccessCategory.setCategoryId(cId);
-            coscoAccessCategoryService.insertCoscoAccessCategory(coscoAccessCategory);
-        }
+        addCateGoryId(vo, workId);
 
-        //供应商集合
-        for(String sId : vo.getSupplierIds()){
-            CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
-            coscoAccessSupplier.setId(CoscoIdUtil.getId());
-            coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId());
-            coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
-            coscoAccessSupplier.setAccessWorkId(workId);
-            coscoAccessSupplier.setSupplierId(sId);
-            coscoAccessSupplierService.insertCoscoAccessSupplier(coscoAccessSupplier);
-        }
+        addSupplierIds(vo, workId, coscoAccessWork);
         //如果是线上准入、有人员和评审项
         if(CoscoType.ACCESS_TYPE_ONLINE.equals(coscoAccessWork.getAccessType())){
-            String zuZhangId = "";//组长id
-            //评审人员集合
+
             List<CoscoAccessUser> coscoAccessUserls = vo.getCoscoAccessUserls();
-            if (!CollectionUtils.isEmpty(coscoAccessUserls)) {
-                for(CoscoAccessUser user: coscoAccessUserls){
-                    //判断是否是组长
-                    if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){
-                        zuZhangId = user.getUserId();
-                    }
-                    user.setAccessWorkId(workId);
-                    user.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D);
-                    coscoAccessUserService.insertCoscoAccessUser(user);
-                }
-            }
-
-            //评审项集合
-            if (!CollectionUtils.isEmpty(vo.getCoscoAccessItems())) {
-                //首先循环所有供应商
-                for(String sId : vo.getSupplierIds()){
-
-                    for(CoscoAccessItemVo item: vo.getCoscoAccessItems()){
-                        //评审项新增
-                        CoscoAccessItem coscoAccessItem = new CoscoAccessItem();
-                        String itemId = PropertyUtils.getSnowflakeId();//评审项id
-                        coscoAccessItem.setId(itemId);
-                        coscoAccessItem.setAccessWorkId(workId);
-                        coscoAccessItem.setSupplierId(sId);
-                        coscoAccessItem.setItemType(CoscoType.ITEMTYPE_ITEM);
-                        coscoAccessItem.setItemName(item.getItemName());//评审项名称
-                        coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem);
-
-                        List<String> userList = item.getReviewBy();//评审项人员
-                        for(String userId : userList){
-                            CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem();
-                            coscoAccessUserItem.setAccessWorkId(workId);
-                            coscoAccessUserItem.setSupplierId(sId);
-                            coscoAccessUserItem.setItemId(itemId);
-                            coscoAccessUserItem.setReviewBy(userId);
-                            coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem);
-                        }
-                    }
-
-
-                    //额外再给每个供应商追加1条汇总项，以及关联表新增
-                    CoscoAccessItem coscoAccessItem = new CoscoAccessItem();
-                    String itemId = PropertyUtils.getSnowflakeId();//评审项id
-                    coscoAccessItem.setId(itemId);
-                    coscoAccessItem.setAccessWorkId(workId);
-                    coscoAccessItem.setSupplierId(sId);
-                    coscoAccessItem.setItemType(CoscoType.ITEMTYPE_SUMMARY);
-                    coscoAccessItem.setItemName("结果汇总");//评审项名称
-                    coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem);
-
-                    CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem();
-                    coscoAccessUserItem.setAccessWorkId(workId);
-                    coscoAccessUserItem.setSupplierId(sId);
-                    coscoAccessUserItem.setItemId(itemId);
-                    coscoAccessUserItem.setReviewBy(zuZhangId);
-                    coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem);
-
-                }
-            }
+            String zuZhangId = addCoscoAccessUser(workId, coscoAccessUserls);//组长id
 
+            addUserAndItem(vo, workId, zuZhangId);
             //给各个评审人员发送消息
             coscoMessageService.userMessage(coscoAccessUserls);
         }
@@ -385,6 +324,96 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         return true;
     }
 
+    private void addUserAndItem(CoscoAccessWorkVo vo, String workId, String zuZhangId) {
+        //评审项集合
+        if (!CollectionUtils.isEmpty(vo.getCoscoAccessItems())) {
+            //首先循环所有供应商
+            for(String sId : vo.getSupplierIds()){
+
+                for(CoscoAccessItemVo item: vo.getCoscoAccessItems()){
+                    //评审项新增
+                    CoscoAccessItem coscoAccessItem = new CoscoAccessItem();
+                    String itemId = PropertyUtils.getSnowflakeId();//评审项id
+                    coscoAccessItem.setId(itemId);
+                    coscoAccessItem.setAccessWorkId(workId);
+                    coscoAccessItem.setSupplierId(sId);
+                    coscoAccessItem.setItemType(CoscoType.ITEMTYPE_ITEM);
+                    coscoAccessItem.setItemName(item.getItemName());//评审项名称
+                    coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem);
+
+                    List<String> userList = item.getReviewBy();//评审项人员
+                    for(String userId : userList){
+                        CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem();
+                        coscoAccessUserItem.setAccessWorkId(workId);
+                        coscoAccessUserItem.setSupplierId(sId);
+                        coscoAccessUserItem.setItemId(itemId);
+                        coscoAccessUserItem.setReviewBy(userId);
+                        coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem);
+                    }
+                }
+
+
+                //额外再给每个供应商追加1条汇总项，以及关联表新增
+                CoscoAccessItem coscoAccessItem = new CoscoAccessItem();
+                String itemId = PropertyUtils.getSnowflakeId();//评审项id
+                coscoAccessItem.setId(itemId);
+                coscoAccessItem.setAccessWorkId(workId);
+                coscoAccessItem.setSupplierId(sId);
+                coscoAccessItem.setItemType(CoscoType.ITEMTYPE_SUMMARY);
+                coscoAccessItem.setItemName("结果汇总");//评审项名称
+                coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem);
+
+                CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem();
+                coscoAccessUserItem.setAccessWorkId(workId);
+                coscoAccessUserItem.setSupplierId(sId);
+                coscoAccessUserItem.setItemId(itemId);
+                coscoAccessUserItem.setReviewBy(zuZhangId);
+                coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem);
+
+            }
+        }
+    }
+
+    private String addCoscoAccessUser(String workId, List<CoscoAccessUser> coscoAccessUserls) {
+        String zuZhangId = "";//组长id
+        //评审人员集合
+        if (!CollectionUtils.isEmpty(coscoAccessUserls)) {
+            for(CoscoAccessUser user: coscoAccessUserls){
+                //判断是否是组长
+                if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){
+                    zuZhangId = user.getUserId();
+                }
+                user.setAccessWorkId(workId);
+                user.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D);
+                coscoAccessUserService.insertCoscoAccessUser(user);
+            }
+        }
+        return zuZhangId;
+    }
+
+    private void addSupplierIds(CoscoAccessWorkVo vo, String workId, CoscoAccessWork coscoAccessWork) {
+        //供应商集合
+        for(String sId : vo.getSupplierIds()){
+            CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
+            coscoAccessSupplier.setId(CoscoIdUtil.getId());
+            coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId());
+            coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
+            coscoAccessSupplier.setAccessWorkId(workId);
+            coscoAccessSupplier.setSupplierId(sId);
+            coscoAccessSupplierService.insertCoscoAccessSupplier(coscoAccessSupplier);
+        }
+    }
+
+    private void addCateGoryId(CoscoAccessWorkVo vo, String workId) {
+        //品类集合
+        for(String cId : vo.getCategoryIds()){
+            CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
+            coscoAccessCategory.setAccessWorkId(workId);
+            coscoAccessCategory.setCategoryId(cId);
+            coscoAccessCategoryService.insertCoscoAccessCategory(coscoAccessCategory);
+        }
+    }
+
     /**
      * 评审人员评审保存
      * @return
@@ -392,26 +421,10 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
     @Override
     @Transactional
     public Boolean updateCoscoAccessWork(CoscoAccessUserItemVo vo) {
-        //String userId = "USER001";
-        Date date = CoscoDateUtils.getNowDate();
         String userId =vo.getUserId();
-        if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) {
-            for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){
-                //修改评审项关联评审人员表
-                coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem);
-                if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) {
-                    //插入附件表
-                    CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments();
-                    coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId());
-                    coscoAccessTtemAttachments.setAccessUserItemId(coscoAccessUserItem.getId());
-                    if(coscoAccessTtemAttachments.getId() != null){
-                        coscoAccessItemAttachmentsService.updateCoscoAccessItemAttachments(coscoAccessTtemAttachments);
-                    }else{
-                        coscoAccessItemAttachmentsService.insertCoscoAccessItemAttachments(coscoAccessTtemAttachments);
-                    }
-                }
-            }
-        }
+        Date date = CoscoDateUtils.getNowDate();
+
+        addCoscoAccessUserItemAndUp(vo);
         //修改评审人员表状态
         CoscoAccessUser coscoAccessUser = new CoscoAccessUser();
         coscoAccessUser.setAccessWorkId(vo.getAccessWorkId());
@@ -466,6 +479,26 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         return true;
     }
 
+    private void addCoscoAccessUserItemAndUp(CoscoAccessUserItemVo vo) {
+        if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) {
+            for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){
+                //修改评审项关联评审人员表
+                coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem);
+                if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) {
+                    //插入附件表
+                    CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments();
+                    coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId());
+                    coscoAccessTtemAttachments.setAccessUserItemId(coscoAccessUserItem.getId());
+                    if(coscoAccessTtemAttachments.getId() != null){
+                        coscoAccessItemAttachmentsService.updateCoscoAccessItemAttachments(coscoAccessTtemAttachments);
+                    }else{
+                        coscoAccessItemAttachmentsService.insertCoscoAccessItemAttachments(coscoAccessTtemAttachments);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * 修改主任务方法
      * @param coscoAccessWork
@@ -600,7 +633,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
 
                 supplierIdList.add(coscoAccessSupplier1);
             }
-        } if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_BH)){//驳回
+        }
+        if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_BH)){//驳回
             //暂时只有消息推送逻辑
             for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
                 supplierIdList.add(coscoAccessSupplier1);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
index aaa8871..d4fc05e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
@@ -1,23 +1,21 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商业务处理消息推送Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java
index 57c5a75..4fd1c91 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java
@@ -1,19 +1,18 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBankMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBankService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.util.List;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBankMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBankService;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 /**
  * 中远海运_供应商_银行账户Service业务层处理
  *
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 08667f4..026b977 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
@@ -1,26 +1,19 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 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.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
-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.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +21,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import java.lang.reflect.Field;
+import java.util.*;
+
 /**
  * 中远海运_供应商_基本信息Service业务层处理
  *
@@ -90,6 +86,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
     @Autowired
     private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
 
+    @Override
+    public IPage<CoscoSupplierBase> selectWzrPageList(CoscoSupplierBase coscoSupplierBase) {
+        // 创建分页对象（当前页，每页大小）
+        IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
+        return  coscoSupplierBaseMapper.selectWzrPageList(page, coscoSupplierBase);
+    }
+
     @Override
     public IPage<CoscoSupplierBase> getPage(CoscoSupplierBase coscoSupplierBase) {
         // 创建分页对象（当前页，每页大小）
@@ -136,7 +139,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
         CoscoSupplierInvoice coscoSupplierInvoice = new CoscoSupplierInvoice();
         coscoSupplierInvoice.setSupplierId(id);
         List<CoscoSupplierInvoice> coscoSupplierInvoiceList = coscoSupplierInvoiceMapper.selectCoscoSupplierInvoiceList(coscoSupplierInvoice);
-        if(coscoSupplierInvoiceList.size() > 0){
+
+        if(!CollectionUtils.isEmpty(coscoSupplierInvoiceList)){
             vo.setCoscoSupplierInvoice(coscoSupplierInvoiceList.get(0));
         }
 
@@ -344,16 +348,10 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
             boolean mameEnBlean = baseDiff(oldCoscoSupplierBase.getNameEn(),coscoSupplierBase.getNameEn()); //企业英文名称
             boolean rangBlean = baseDiff(oldCoscoSupplierBase.getRange(),coscoSupplierBase.getRange()); //经营范围
 
-            if(CoscoType.SUPPLIER_TYPE_DVS.equals(oldCoscoSupplierBase.getSupplierType())){//境内
-                if(nameBlean || rangBlean){
-                    System.out.println("需要发起变更");
-                     return insertCoscoSupplierChangeApply(coscoSupplierBase,oldCoscoSupplierBase,vo);
-                }
-            }else if(CoscoType.SUPPLIER_TYPE_OVS.equals(oldCoscoSupplierBase.getSupplierType())){//境外
-                if(mameEnBlean || rangBlean){
-                    System.out.println("需要发起变更");
-                    return insertCoscoSupplierChangeApply(coscoSupplierBase,oldCoscoSupplierBase,vo);
-                }
+            // 优化后的代码
+            if (isDomesticSupplierAndNeedsChange(oldCoscoSupplierBase, nameBlean, rangBlean) ||
+                    isOverseasSupplierAndNeedsChange(oldCoscoSupplierBase, mameEnBlean, rangBlean)) {
+                return insertCoscoSupplierChangeApply(coscoSupplierBase, oldCoscoSupplierBase, vo);
             }
         }
         //修改基本信息
@@ -364,13 +362,22 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
         return true;
     }
 
+    // 提取境内供应商判断逻辑
+    private boolean isDomesticSupplierAndNeedsChange(CoscoSupplierBase supplier, boolean nameChanged, boolean rangeChanged) {
+        return CoscoType.SUPPLIER_TYPE_DVS.equals(supplier.getSupplierType())
+                && (nameChanged || rangeChanged);
+    }
 
+    // 提取境外供应商判断逻辑
+    private boolean isOverseasSupplierAndNeedsChange(CoscoSupplierBase supplier, boolean nameEnChanged, boolean rangeChanged) {
+        return CoscoType.SUPPLIER_TYPE_OVS.equals(supplier.getSupplierType())
+                && (nameEnChanged || rangeChanged);
+    }
     /**
      * 新增中远海运_供应商_供应商信息变更申请
      *
      * @return 结果
      */
-    @Transactional
     public Boolean insertCoscoSupplierChangeApply(CoscoSupplierBase newCoscoSupplierBase,CoscoSupplierBase oldCoscoSupplierBase,CoscoSupplierVo vo) {
         Date date = CoscoDateUtils.getNowDate();
         String applyId = PropertyUtils.getSnowflakeId();
@@ -423,7 +430,6 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
     }
 
 
-
     public List<CoscoSupplierChangeHistory> compareSupplierChanges(
             CoscoSupplierBase newCoscoSupplierBase,
             CoscoSupplierBase oldCoscoSupplierBase,
@@ -441,8 +447,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
                 Object newValue = field.get(newCoscoSupplierBase);
                 Object oldValue = field.get(oldCoscoSupplierBase);
                 // 比较值是否相同
-                if ((newValue == null && oldValue != null) ||
-                        (newValue != null && !newValue.equals(oldValue))) {
+                if (isChanged(newValue, oldValue)) {
                     // 创建变更记录
                     CoscoSupplierChangeHistory history = new CoscoSupplierChangeHistory();
                     history.setId(PropertyUtils.getSnowflakeId());
@@ -458,8 +463,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
                         history.setFieldAnnotation(field.getName());
                     }
 
-                    history.setOldValue(oldValue != null ? oldValue.toString() : null);
-                    history.setNewValue(newValue != null ? newValue.toString() : null);
+                    history.setOldValue(Optional.ofNullable(oldValue).map(Object::toString).orElse(null));
+                    history.setNewValue(Optional.ofNullable(newValue).map(Object::toString).orElse(null));
                     history.setCreateBy("1");
                     history.setCreateTime(CoscoDateUtils.getNowDate());
                     history.setUpdateBy("1");
@@ -481,13 +486,19 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
         return newChangeHistories;
     }
 
-
-    public Boolean baseDiff(String msg1,String msg2) {
-        if(msg1.equals(msg2)){//无改变
+    public static boolean isChanged(Object newValue, Object oldValue) {
+        return !Objects.equals(newValue, oldValue);
+    }
+    public static boolean baseDiff(String str1, String str2) {
+        // 处理两个都为null的情况
+        if (str1 == null && str2 == null) {
             return false;
-        }else{//有改变
+        }
+        // 处理其中一个为null的情况
+        if (str1 == null || str2 == null) {
             return true;
         }
-
+        // 使用equals()比较字符串内容
+        return str1.equals(str2);
     }
 }
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 0b262e6..f2a17e1 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
@@ -1,21 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
-
 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.ChangeText;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierDiffVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 中远海运_供应商_供应商信息变更申请Service业务层处理
@@ -28,18 +23,6 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
     @Autowired
     private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper;
 
-    @Autowired
-    private CoscoSupplierChangeBaseMapper coscoSupplierChangeBaseMapper;
-
-    @Autowired
-    private CoscoSupplierChangeQualificationsMapper coscoSupplierChangeQualificationsMapper;
-
-    @Autowired
-    private CoscoSupplierChangeInvoiceMapper coscoSupplierChangeInvoiceMapper;
-
-    @Autowired
-    private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper;
-
     @Autowired
     private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper;
 
@@ -59,9 +42,9 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
     public IPage<CoscoSupplierChangeApply> selectCoscoSupplierChangeApplyList(CoscoSupplierChangeApply data) {
         // 创建分页对象（当前页，每页大小）
         IPage<CoscoSupplierChangeApply> page = new Page<>(data.getPageNo(), data.getPageSize());
-        IPage<CoscoSupplierChangeApply>  CoscoSupplierChangeApplyPage
+        IPage<CoscoSupplierChangeApply>  coscoSupplierChangeApplyPage
                 = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyList(page, data);
-        List<CoscoSupplierChangeApply> coscoSupplierChangeApplies =  CoscoSupplierChangeApplyPage.getRecords();
+        List<CoscoSupplierChangeApply> coscoSupplierChangeApplies =  coscoSupplierChangeApplyPage.getRecords();
         for(CoscoSupplierChangeApply coscoSupplierChangeApply : coscoSupplierChangeApplies){
             //变更基本内容
             CoscoSupplierChangeHistory coscoSupplierChangeHistory = new CoscoSupplierChangeHistory();
@@ -69,191 +52,10 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
             List<CoscoSupplierChangeHistory> coscoSupplierChangeHistoryList  = coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory);
             coscoSupplierChangeApply.setCoscoSupplierChangeHistoryList(coscoSupplierChangeHistoryList);
         }
-        return CoscoSupplierChangeApplyPage;
+        return coscoSupplierChangeApplyPage;
     }
 
 
-    /**
-     * 查询中远海运_供应商_供应商信息变更申请——————————————————（作废）
-     *
-     * @return 中远海运_供应商_供应商信息变更申请
-     */
-    @Override
-    public CoscoSupplierDiffVo selectCoscoSupplierChangeApplyById(String appid) {
-        List<String> upTxt = new ArrayList<>();
-        CoscoSupplierDiffVo diffVo = new CoscoSupplierDiffVo();
-        CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid);
-
-        //查询当前任务的上一条任务
-        CoscoSupplierChangeApply oldCoscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectBySupplierId(coscoSupplierChangeApply.getSupplierId());
-        //如果是空，说明是第一次提交变更
-        if(oldCoscoSupplierChangeApply == null){
-            //基础信息比对结果
-            CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase();
-            coscoSupplierChangeBase.setSupplierId(coscoSupplierChangeApply.getSupplierId());
-            coscoSupplierChangeBase.setSupplierChangeApplyId(appid);
-            SupplierChangeDiffResult selectDiff = coscoSupplierChangeBaseMapper.selectDiff(coscoSupplierChangeBase);
-            //验证基本信息
-            try{
-                boolean supplierDiff = supplierChangeDiffResultFieldValue(selectDiff);
-                if(supplierDiff){
-                    upTxt.add(ChangeText.JBXX);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-            //老基本信息
-            CoscoSupplierChangeBase oldCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierId(coscoSupplierChangeApply.getSupplierId());
-            //新基本信息
-            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);
-            if(qualificationsMap != null){
-                if(qualificationsMap.get("text") != null){
-                    upTxt.add(qualificationsMap.get("text").toString());
-                }
-            }
-
-            //开票信息比对
-            CoscoSupplierChangeInvoice invoice = new CoscoSupplierChangeInvoice();
-            invoice.setOldSupplierId(oldCoscoSupplierBase.getId());
-            invoice.setNewSupplierId(newCoscoSupplierBase.getId());
-            InvoiceChangeDiffVo invoiceChangeDiffVo = coscoSupplierChangeInvoiceMapper.selectInvoiceDitt(invoice);
-            //验证开票信息
-            try{
-                boolean supplierDiff = invoiceChangeDiffVoFieldValue(invoiceChangeDiffVo);
-                if(supplierDiff){
-                    upTxt.add(ChangeText.KPXX);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
-            //原银行
-            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);
-            if(bankListMap != null){
-                if(bankListMap.get("text") != null){
-                    upTxt.add(bankListMap.get("text").toString());
-                }
-            }
-
-
-            diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply);
-            diffVo.setSupplierChangeDiffResult(selectDiff);
-            diffVo.setQualificationsMap(qualificationsMap);
-            diffVo.setInvoiceChangeDiffVo(invoiceChangeDiffVo);
-            diffVo.setBankListMap(bankListMap);
-            diffVo.setTxtList(upTxt);
-        }else{
-            //基础信息比对结果
-            CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase();
-            coscoSupplierChangeBase.setSupplierChangeApplyIdOld(oldCoscoSupplierChangeApply.getId());
-            coscoSupplierChangeBase.setSupplierChangeApplyId(appid);
-            SupplierChangeDiffResult selectDiff = coscoSupplierChangeBaseMapper.selectDiff(coscoSupplierChangeBase);
-            //验证基本信息
-            try{
-                boolean supplierDiff = supplierChangeDiffResultFieldValue(selectDiff);
-                if(supplierDiff){
-                    upTxt.add(ChangeText.JBXX);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
-            //老基本信息
-            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);
-            if(qualificationsMap != null){
-                if(qualificationsMap.get("text") != null){
-                    upTxt.add(qualificationsMap.get("text").toString());
-                }
-            }
-
-            //开票信息比对
-            CoscoSupplierChangeInvoice invoice = new CoscoSupplierChangeInvoice();
-            invoice.setOldSupplierId(oldCoscoSupplierBase.getId());
-            invoice.setNewSupplierId(newCoscoSupplierBase.getId());
-            InvoiceChangeDiffVo invoiceChangeDiffVo = coscoSupplierChangeInvoiceMapper.selectInvoiceDitt(invoice);
-            //验证开票信息
-            try{
-                boolean supplierDiff = invoiceChangeDiffVoFieldValue(invoiceChangeDiffVo);
-                if(supplierDiff){
-                    upTxt.add(ChangeText.KPXX);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
-            //原银行
-            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);
-            if(bankListMap != null){
-                if(bankListMap.get("text") != null){
-                    upTxt.add(bankListMap.get("text").toString());
-                }
-            }
-
-
-            diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply);
-            diffVo.setSupplierChangeDiffResult(selectDiff);
-            diffVo.setQualificationsMap(qualificationsMap);
-            diffVo.setInvoiceChangeDiffVo(invoiceChangeDiffVo);
-            diffVo.setBankListMap(bankListMap);
-            diffVo.setTxtList(upTxt);
-        }
-
-        return diffVo;
-    }
 
     @Override
     public CoscoSupplierDiffVo supplierChangeApplyById(String id) {
@@ -271,263 +73,8 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange
     }
 
 
-    //资质对比方法
-    public Map<String,Object> qualificationsDiff(List<CoscoSupplierChangeQualifications> oldList,List<CoscoSupplierChangeQualifications> newList){
-        Map<String,Object> qualificationsMap = new HashMap<>();
-        List<CoscoSupplierChangeQualifications> delQualificationsList = new ArrayList<>();
-        List<CoscoSupplierChangeQualifications> addQualificationsList = new ArrayList<>();
-        List<Map<String,CoscoSupplierChangeQualifications>> updateQualificationsList = new ArrayList<>();
-
-        //原数据有 新数据有
-        if(oldList.size() > 0 && newList.size() > 0){
-            // 1. 找出需要删除的资质(在原集合但不在新集合)
-            for(CoscoSupplierChangeQualifications oldQualifications : oldList){
-                boolean exists = newList.stream()
-                        .anyMatch(q -> oldQualifications.getSupplierQualificationsId().equals(q.getSupplierQualificationsId()));
-                if(!exists){//不在
-                    delQualificationsList.add(oldQualifications);
-                }
-            }
-
-            // 2. 找出需要新增的资质(在新集合但不在原集合)
-            for(CoscoSupplierChangeQualifications newQualifications : newList){
-                boolean exists = oldList.stream()
-                        .anyMatch(q -> q.getSupplierQualificationsId().equals(newQualifications.getSupplierQualificationsId()));
-                if(!exists){//不在
-                    addQualificationsList.add(newQualifications);
-                }
-            }
-            // 3. 找出可能需要更新的资质(两个集合中都存在)
-            for(CoscoSupplierChangeQualifications oldQualifications : oldList){
-                List<CoscoSupplierChangeQualifications> newQualifications = newList.stream()
-                        .filter(q -> oldQualifications.getSupplierQualificationsId().equals(q.getSupplierQualificationsId())).collect(Collectors.toList());
-                if(newQualifications.size() > 0){//存在
-                    Map<String,CoscoSupplierChangeQualifications> upQualifications = new HashMap<>();
-                    upQualifications.put("old",oldQualifications);
-                    upQualifications.put("new", newQualifications.get(0));
-                    updateQualificationsList.add(upQualifications);
-                }
-            }
-        }else if(oldList.size() > 0 ){  //原数据有  新数据空
-            // 1. 找出需要删除的资质(在原集合但不在新集合)
-            for(CoscoSupplierChangeQualifications oldQualifications : oldList){
-                boolean exists = newList.stream()
-                        .anyMatch(q -> oldQualifications.getSupplierQualificationsId().equals(q.getSupplierQualificationsId()));
-                if(!exists){//不在
-                    delQualificationsList.add(oldQualifications);
-                }
-            }
-        }else if(newList.size() > 0){  //原数据空  新数据有
-            // 2. 找出需要新增的资质(在新集合但不在原集合)
-            for(CoscoSupplierChangeQualifications newQualifications : newList){
-                boolean exists = oldList.stream()
-                        .anyMatch(q -> q.getSupplierQualificationsId().equals(newQualifications.getSupplierQualificationsId()));
-                if(!exists){//不在
-                    addQualificationsList.add(newQualifications);
-                }
-            }
-        }
-        if(delQualificationsList.size() > 0 || addQualificationsList.size() > 0 || updateQualificationsList.size() > 0){
-            qualificationsMap.put("text",ChangeText.ZZXX);
-        }
-        qualificationsMap.put("delList",delQualificationsList);
-        qualificationsMap.put("addList",addQualificationsList);
-        qualificationsMap.put("updateList",updateQualificationsList);
-        return qualificationsMap;
-    }
 
 
-    //银行对比方法
-    public Map<String,Object> bankDiff(List<CoscoSupplierChangeBank> oldList,List<CoscoSupplierChangeBank> newList){
-        Map<String,Object> qualificationsMap = new HashMap<>();
-        List<CoscoSupplierChangeBank> delList = new ArrayList<>();
-        List<CoscoSupplierChangeBank> addList = new ArrayList<>();
-        List<Map<String,CoscoSupplierChangeBank>> updateList = new ArrayList<>();
-
-        //原数据有 新数据有
-        if(oldList.size() > 0 && newList.size() > 0){
-            // 1. 找出需要删除的资质(在原集合但不在新集合)
-            for(CoscoSupplierChangeBank oldQualifications : oldList){
-                boolean exists = newList.stream()
-                        .anyMatch(q -> oldQualifications.getSupplierBankId().equals(q.getSupplierBankId()));
-                if(!exists){//不在
-                    delList.add(oldQualifications);
-                }
-            }
-
-            // 2. 找出需要新增的资质(在新集合但不在原集合)
-            for(CoscoSupplierChangeBank newQualifications : newList){
-                boolean exists = oldList.stream()
-                        .anyMatch(q -> q.getSupplierBankId().equals(newQualifications.getSupplierBankId()));
-                if(!exists){//不在
-                    addList.add(newQualifications);
-                }
-            }
-            // 3. 找出可能需要更新的资质(两个集合中都存在)
-            for(CoscoSupplierChangeBank oldQualifications : oldList){
-                List<CoscoSupplierChangeBank> newQualifications = newList.stream()
-                        .filter(q -> oldQualifications.getSupplierBankId().equals(q.getSupplierBankId())).collect(Collectors.toList());
-                if(newQualifications.size() > 0){//存在
-                    Map<String,CoscoSupplierChangeBank> upQualifications = new HashMap<>();
-                    upQualifications.put("old",oldQualifications);
-                    upQualifications.put("new", newQualifications.get(0));
-                    updateList.add(upQualifications);
-                }
-            }
-        }else if(oldList.size() > 0 ){  //原数据有  新数据空
-            // 1. 找出需要删除的资质(在原集合但不在新集合)
-            for(CoscoSupplierChangeBank oldQualifications : oldList){
-                boolean exists = newList.stream()
-                        .anyMatch(q -> oldQualifications.getSupplierBankId().equals(q.getSupplierBankId()));
-                if(!exists){//不在
-                    delList.add(oldQualifications);
-                }
-            }
-        }else if(newList.size() > 0){  //原数据空  新数据有
-            // 2. 找出需要新增的资质(在新集合但不在原集合)
-            for(CoscoSupplierChangeBank newQualifications : newList){
-                boolean exists = oldList.stream()
-                        .anyMatch(q -> q.getSupplierBankId().equals(newQualifications.getSupplierBankId()));
-                if(!exists){//不在
-                    addList.add(newQualifications);
-                }
-            }
-        }
-        if(delList.size() > 0 || addList.size() > 0 || updateList.size() > 0){
-            qualificationsMap.put("text",ChangeText.YHZG);
-        }
-        qualificationsMap.put("delList",delList);
-        qualificationsMap.put("addList",addList);
-        qualificationsMap.put("updateList",updateList);
-        return qualificationsMap;
-    }
-
-    /**
-     * 验证基础信息是否有变更
-     * @param result
-     * @return
-     * @throws IllegalAccessException
-     */
-    public boolean supplierChangeDiffResultFieldValue(SupplierChangeDiffResult result) throws IllegalAccessException {
-        if (result == null) {
-            return false;
-        }
-
-        Field[] fields = result.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            field.setAccessible(true);
-            Object value = field.get(result);
-            if (value != null) {
-                if (value instanceof String && !((String) value).isEmpty()) {
-                    return true;
-                } else if (value instanceof Number && ((Number) value).intValue() != 0) {
-                    return true;
-                } else if (!(value instanceof String) && !(value instanceof Number)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * 验证发票信息是否有变更
-     * @param result
-     * @return
-     * @throws IllegalAccessException
-     */
-    public boolean invoiceChangeDiffVoFieldValue(InvoiceChangeDiffVo result) throws IllegalAccessException {
-        if (result == null) {
-            return false;
-        }
-
-        Field[] fields = result.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            field.setAccessible(true);
-            Object value = field.get(result);
-            if (value != null) {
-                if (value instanceof String && !((String) value).isEmpty()) {
-                    return true;
-                } else if (value instanceof Number && ((Number) value).intValue() != 0) {
-                    return true;
-                } else if (!(value instanceof String) && !(value instanceof Number)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * 新增中远海运_供应商_供应商信息变更申请------------原来比对逻辑（作废）
-     *
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public Boolean insertCoscoSupplierChangeApply(CoscoSupplierChangeApplyVo vo) {
-        String applyId = PropertyUtils.getSnowflakeId();
-        //主体信息---待审批
-        CoscoSupplierChangeApply coscoSupplierChangeApply = new CoscoSupplierChangeApply();
-        coscoSupplierChangeApply.setId(applyId);
-        coscoSupplierChangeApply.setSupplierId(vo.getSupplierId());
-        coscoSupplierChangeApply.setChangeBy("1");
-        coscoSupplierChangeApply.setChangeTime(CoscoDateUtils.getNowDate());
-        coscoSupplierChangeApply.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
-        coscoSupplierChangeApply.setCreateBy("1");
-        coscoSupplierChangeApply.setCreateTime(CoscoDateUtils.getNowDate());
-        coscoSupplierChangeApply.setUpdateBy("1");
-        coscoSupplierChangeApply.setUpdateTime(CoscoDateUtils.getNowDate());
-        coscoSupplierChangeApply.setLastUpdateTime(CoscoDateUtils.getNowDate());
-        coscoSupplierChangeApplyMapper.insertCoscoSupplierChangeApply(coscoSupplierChangeApply);
-
-        //新增变更后基本信息
-        String changeSupplierId = PropertyUtils.getSnowflakeId();
-        CoscoSupplierChangeBase coscoSupplierChangeBase = vo.getCoscoSupplierChangeBase();
-        coscoSupplierChangeBase.setId(changeSupplierId);
-        coscoSupplierChangeBase.setSupplierChangeApplyId(applyId);
-        coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase);
-
-        //资质信息新增
-        List<CoscoSupplierChangeQualifications> coscoSupplierChangeQualificationsList = vo.getCoscoSupplierChangeQualificationsList();
-        if(coscoSupplierChangeQualificationsList != null){
-            if(coscoSupplierChangeQualificationsList.size() > 0){
-                for(CoscoSupplierChangeQualifications coscoSupplierChangeQualifications : coscoSupplierChangeQualificationsList){
-                    coscoSupplierChangeQualifications.setId(PropertyUtils.getSnowflakeId());
-                    coscoSupplierChangeQualifications.setSupplierId(changeSupplierId);
-                    coscoSupplierChangeQualifications.setSupplierChangeApplyId(applyId);
-                    coscoSupplierChangeQualificationsMapper.insertCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications);
-                }
-            }
-        }
-
-        //发票信息
-        if(vo.getCoscoSupplierChangeInvoice() != null){
-            CoscoSupplierChangeInvoice coscoSupplierChangeInvoice = vo.getCoscoSupplierChangeInvoice();
-            coscoSupplierChangeInvoice.setId(PropertyUtils.getSnowflakeId());
-            coscoSupplierChangeInvoice.setSupplierId(changeSupplierId);
-            coscoSupplierChangeInvoice.setSupplierChangeApplyId(applyId);
-            coscoSupplierChangeInvoiceMapper.insertCoscoSupplierChangeInvoice(coscoSupplierChangeInvoice);
-        }
-
-        //银行信息
-        if(vo.getCoscoSupplierChangeBankList() != null){
-            if(vo.getCoscoSupplierChangeBankList().size() > 0){
-                for(CoscoSupplierChangeBank coscoSupplierChangeBank :  vo.getCoscoSupplierChangeBankList()){
-                    coscoSupplierChangeBank.setId(PropertyUtils.getSnowflakeId());
-                    coscoSupplierChangeBank.setSupplierId(changeSupplierId);
-                    coscoSupplierChangeBank.setSupplierChangeApplyId(applyId);
-                    coscoSupplierChangeBankMapper.insertCoscoSupplierChangeBank(coscoSupplierChangeBank);
-                }
-            }
-        }
-
-        //**************调用审批接口**********************
-
-        return true;
-    }
 
     /**
      * 修改中远海运_供应商_供应商信息变更申请
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBankServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBankServiceImpl.java
index 775c123..db3815a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBankServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBankServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeBankMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeBank;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeBankService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_变更后银行账户Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBaseServiceImpl.java
index 4f659ff..99ebdfe 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBaseServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeBaseServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeBaseMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_变更后基本信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java
index c19c3fe..f0e4d35 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java
@@ -1,7 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeHistoryMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory;
@@ -9,6 +7,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierCh
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_供应商信息变更历史记录Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeInvoiceServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeInvoiceServiceImpl.java
index 8acdd47..1aba90f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeInvoiceServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeInvoiceServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeInvoiceMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeInvoice;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeInvoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_变更后开票信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeQualificationsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeQualificationsServiceImpl.java
index 741d188..67014cf 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeQualificationsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeQualificationsServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierChangeQualificationsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeQualificationsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_变更后资质信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java
index c3e9579..e7072af 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java
@@ -1,19 +1,18 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierInvoiceMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierInvoiceService;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierInvoiceMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierInvoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 中远海运_供应商_开票信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java
index 515494e..76b4cf1 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java
@@ -1,20 +1,18 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierQualificationsService;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierQualificationsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 中远海运_供应商_资质信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyAttachmentsServiceImpl.java
index 1fda85d..6d0493c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyAttachmentsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyAttachmentsServiceImpl.java
@@ -1,18 +1,17 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyAttachmentsMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyAttachmentsService;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyAttachmentsMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyAttachmentsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_承诺书及附件Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java
index 01e48ad..fda330c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java
@@ -1,16 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyQuestionReplyMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyQuestionReply;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyQuestionReplyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.util.List;
 
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyQuestionReply;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyQuestionReplyMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyQuestionReplyService;
-import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 /**
  * 中远海运_供应商_社会准则符合性自查问卷_问题回复Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java
index ebcfcd4..f31f4fa 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java
@@ -1,16 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurvey;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurvey;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 中远海运_供应商_社会准则符合性自查问卷_填写人信息Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierTianyanchaIcServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierTianyanchaIcServiceImpl.java
index 691bc92..24cf32f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierTianyanchaIcServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierTianyanchaIcServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierTianyanchaIc;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierTianyanchaIcMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierTianyanchaIc;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierTianyanchaIcService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_供应商_天眼查工商信息标Service业务层处理
  *
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 805686e..2bf138c 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
@@ -1,9 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
@@ -13,7 +9,6 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupplierCategoryVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +16,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 供应商退出_供应商退出任务Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java
index a03fbff..9d5f3e2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitSupplierCategoryMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitSupplierCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商退出_退出任务供应商关联品类Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java
index 0cb00f4..4af189c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java
@@ -1,13 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitSupplierMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitSupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商退出_退出任务关联供应商Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionOptionServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionOptionServiceImpl.java
index 92233a8..b4052a6 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionOptionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionOptionServiceImpl.java
@@ -1,14 +1,14 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSurveyQuestionOption;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSurveyQuestionOptionMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSurveyQuestionOption;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSurveyQuestionOptionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_社会准则符合性自查问卷_问题选项Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionServiceImpl.java
index e534e1f..7516e84 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSurveyQuestionServiceImpl.java
@@ -1,16 +1,16 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
 
-import java.util.List;
-
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSurveyQuestionMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSurveyQuestionOptionMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSurveyQuestion;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSurveyQuestionMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSurveyQuestionOption;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSurveyQuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 中远海运_社会准则符合性自查问卷_问题Service业务层处理
  *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java
index a2ef26e..731c75c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java
@@ -2,13 +2,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.task;
 
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
-import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
-import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -40,8 +42,8 @@ public class SupplierSyncTask {
     @Autowired
     private ICoscoAccessSupplierService coscoAccessSupplierService;
 
-
-
+    private static final Set<Long> NOTIFICATION_DAYS =
+            new HashSet<>(Arrays.asList(30l, 15l, 7l, 0l));
     private static final DateTimeFormatter DATE_FORMATTER =
             DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
@@ -63,15 +65,16 @@ public class SupplierSyncTask {
             LocalDate today = LocalDate.now();
             long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate);
 
-            if (daysRemaining == 30) {
-                coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining);
-            } else if (daysRemaining == 15) {
-                coscoAccessSupplierService.sendNotificationYyzz(supplier,  supplier.getLicenceDate(),daysRemaining);
-            } else if (daysRemaining == 7) {
-                coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining);
-            } else if (daysRemaining == 0) {
-                coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining);
-                removeSupplier(supplier);
+            if (NOTIFICATION_DAYS.contains(daysRemaining)) {
+                coscoAccessSupplierService.sendNotificationYyzz(
+                        supplier,
+                        supplier.getLicenceDate(),
+                        daysRemaining
+                );
+
+                if (daysRemaining == 0) {
+                    removeSupplier(supplier);
+                }
             }
         });
     }
@@ -100,15 +103,13 @@ public class SupplierSyncTask {
 
                 LocalDate today = LocalDate.now();
                 long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate);
-
-                if (daysRemaining == 30) {
-                    coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining);
-                } else if (daysRemaining == 15) {
-                    coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining);
-                } else if (daysRemaining == 7) {
-                    coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining);
-                } else if (daysRemaining == 0) {
-                    coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining);
+                if (NOTIFICATION_DAYS.contains(daysRemaining)) {
+                    coscoAccessSupplierService.sendNotificationZzxx(
+                            supplier,
+                            qualifications,
+                            termOfValidity,
+                            daysRemaining
+                    );
                 }
             });
 
@@ -117,7 +118,6 @@ public class SupplierSyncTask {
 
 
     //移除供应商所有信息
-    @Transactional
     public void removeSupplier(CoscoSupplierBase supplier) {
         Date date = CoscoDateUtils.getNowDate();
         //修改注册信息表状态
@@ -149,8 +149,7 @@ public class SupplierSyncTask {
         try {
             return LocalDate.parse(dateStr, DATE_FORMATTER);
         } catch (DateTimeParseException e) {
-            // 日志记录异常，返回null或默认值
-            System.err.println("日期格式错误: " + dateStr);
+            e.printStackTrace();
             return null;
         }
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java
index 4e04082..5a810c2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java
@@ -1,8 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
 
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java
index 3f47067..3b2d846 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java
@@ -1,6 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
 
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
 import lombok.Data;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java
index 825f0c9..af67b45 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java
@@ -1,7 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
 
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory;
 import lombok.Data;
 
 import java.util.List;
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 3e8b4f0..b4c9a67 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
@@ -37,6 +37,7 @@
                 and supplier_id = #{vo.supplierId}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectCoscoSupplierBankList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank" resultMap="CoscoSupplierBankResult">
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 c1d5c67..3de3028 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
@@ -150,6 +150,130 @@
 
 
 
+    <select id="selectWzrPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" resultMap="CoscoSupplierBaseResult">
+        <include refid="selectCoscoSupplierBaseVo"/>
+        WHERE
+        id NOT IN (
+        SELECT
+        cas.supplier_id
+        FROM
+        cosco_access_work caw
+        LEFT JOIN cosco_access_supplier cas ON caw.id = cas.access_work_id
+        WHERE
+        (
+        caw.approve_status IS NULL
+        OR caw.approve_status IN ( 0, 1 ))
+        <if test="vo.deptId != null  and vo.deptId != ''">
+            AND cas.dept_id IN (#{vo.deptId})
+        </if>
+        )
+        <if test="vo.supplierType != null  and vo.supplierType != ''">
+            and supplier_type = #{vo.supplierType}
+        </if>
+        <if test="vo.licenceAccessory != null  and vo.licenceAccessory != ''">
+            and licence_accessory = #{vo.licenceAccessory}
+        </if>
+        <if test="vo.licenceDate != null  and vo.licenceDate != ''">
+            and licence_date = #{vo.licenceDate}
+        </if>
+        <if test="vo.enterpriseType != null  and vo.enterpriseType != ''">
+            and enterprise_type = #{vo.enterpriseType}
+        </if>
+        <if test="vo.name != null  and vo.name != ''">
+            and name like concat('%', #{vo.name}, '%')
+        </if>
+        <if test="vo.nameEn != null  and vo.nameEn != ''">
+            and name_en = #{vo.nameEn}
+        </if>
+        <if test="vo.socialCreditCode != null  and vo.socialCreditCode != ''">
+            and social_credit_code = #{vo.socialCreditCode}
+        </if>
+        <if test="vo.range != null  and vo.range != ''">
+            and `range` = #{vo.range}
+        </if>
+        <if test="vo.regAddress != null  and vo.regAddress != ''">
+            and reg_address = #{vo.regAddress}
+        </if>
+        <if test="vo.workAddress != null  and vo.workAddress != ''">
+            and work_address = #{vo.workAddress}
+        </if>
+        <if test="vo.parentCompanyInvestor != null  and vo.parentCompanyInvestor != ''">
+            and parent_company_investor = #{vo.parentCompanyInvestor}
+        </if>
+        <if test="vo.legalPerson != null  and vo.legalPerson != ''">
+            and legal_person = #{vo.legalPerson}
+        </if>
+        <if test="vo.idCard != null  and vo.idCard != ''">
+            and id_card = #{vo.idCard}
+        </if>
+        <if test="vo.capital != null ">
+            and capital = #{vo.capital}
+        </if>
+        <if test="vo.contactsName != null  and vo.contactsName != ''">
+            and contacts_name like concat('%', #{vo.contactsName}, '%')
+        </if>
+        <if test="vo.contactsPhone != null  and vo.contactsPhone != ''">
+            and contacts_phone = #{vo.contactsPhone}
+        </if>
+        <if test="vo.contactsType != null  and vo.contactsType != ''">
+            and contacts_type = #{vo.contactsType}
+        </if>
+        <if test="vo.contactsEmail != null  and vo.contactsEmail != ''">
+            and contacts_email = #{vo.contactsEmail}
+        </if>
+        <if test="vo.telephone != null  and vo.telephone != ''">
+            and telephone = #{telephone}
+        </if>
+        <if test="vo.nation != null  and vo.nation != ''">
+            and nation = #{nation}
+        </if>
+        <if test="vo.vat != null  and vo.vat != ''">
+            and vat = #{vo.vat}
+        </if>
+        <if test="vo.taxpayerId != null  and vo.taxpayerId != ''">
+            and taxpayer_id = #{vo.taxpayerId}
+        </if>
+        <if test="vo.currency != null  and vo.currency != ''">
+            and currency = #{vo.currency}
+        </if>
+        <if test="vo.personName != null  and vo.personName != ''">
+            and person_name like concat('%', #{vo.personName}, '%')
+        </if>
+        <if test="vo.personPhone != null  and vo.personPhone != ''">
+            and person_phone = #{vo.personPhone}
+        </if>
+        <if test="vo.personBank != null  and vo.personBank != ''">
+            and person_bank = #{vo.personBank}
+        </if>
+        <if test="vo.personAccount != null  and vo.personAccount != ''">
+            and person_account = #{vo.personAccount}
+        </if>
+        <if test="vo.accessStatus != null ">
+            and access_status = #{vo.accessStatus}
+        </if>
+        <if test="vo.blacklistStatus != null ">
+            and blacklist_status = #{vo.blacklistStatus}
+        </if>
+        <if test="vo.greylistStatus != null ">
+            and greylist_status = #{vo.greylistStatus}
+        </if>
+        <if test="vo.fillinStatus != null ">
+            and fillin_status = #{vo.fillinStatus}
+        </if>
+        <if test="vo.fillinBy != null  and vo.fillinBy != ''">
+            and fillin_by = #{vo.fillinBy}
+        </if>
+        <if test="vo.sapCode != null  and vo.sapCode != ''">
+            and sap_code = #{vo.sapCode}
+        </if>
+        <if test="vo.lastUpdateTime != null ">
+            and last_update_time = #{vo.lastUpdateTime}
+        </if>
+
+        order by create_time desc
+    </select>
+
+
 
     <select id="selectPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase" resultMap="CoscoSupplierBaseResult">
         <include refid="selectCoscoSupplierBaseVo"/>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBaseMapper.xml
index feedc55..3237935 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeBaseMapper.xml
@@ -37,36 +37,6 @@
             <result property="supplierChangeApplyId" column="supplier_change_apply_id"/>
     </resultMap>
 
-    <resultMap id="supplierChangeDiffResultMap" type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.SupplierChangeDiffResult">
-        <result property="supplierTypeDiff" column="supplier_type_diff"/>
-        <result property="licenceAccessoryDiff" column="licence_accessory_diff"/>
-        <result property="licenceDateDiff" column="licence_date_diff"/>
-        <result property="enterpriseTypeDiff" column="enterprise_type_diff"/>
-        <result property="nameDiff" column="name_diff"/>
-        <result property="nameEnDiff" column="name_en_diff"/>
-        <result property="socialCreditCodeDiff" column="social_credit_code_diff"/>
-        <result property="rangeDiff" column="range_diff"/>
-        <result property="regAddressDiff" column="reg_address_diff"/>
-        <result property="workAddressDiff" column="work_address_diff"/>
-        <result property="parentCompanyInvestorDiff" column="parent_company_investor_diff"/>
-        <result property="legalPersonDiff" column="legal_person_diff"/>
-        <result property="idCardDiff" column="id_card_diff"/>
-        <result property="capitalDiff" column="capital_diff"/>
-        <result property="contactsNameDiff" column="contacts_name_diff"/>
-        <result property="contactsPhoneDiff" column="contacts_phone_diff"/>
-        <result property="contactsTypeDiff" column="contacts_type_diff"/>
-        <result property="contactsEmailDiff" column="contacts_email_diff"/>
-        <result property="telephoneDiff" column="telephone_diff"/>
-        <result property="nationDiff" column="nation_diff"/>
-        <result property="vatDiff" column="vat_diff"/>
-        <result property="taxpayerIdDiff" column="taxpayer_id_diff"/>
-        <result property="currencyDiff" column="currency_diff"/>
-        <result property="personNameDiff" column="person_name_diff"/>
-        <result property="personPhoneDiff" column="person_phone_diff"/>
-        <result property="personBankDiff" column="person_bank_diff"/>
-        <result property="personAccountDiff" column="person_account_diff"/>
-        <result property="remarkDiff" column="remark_diff"/>
-    </resultMap>
 
     <sql id="selectCoscoSupplierChangeBaseVo">
         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, supplier_change_apply_id
@@ -164,107 +134,6 @@
     </select>
 
 
-    <select id="selectDiff" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeBase" resultMap="supplierChangeDiffResultMap">
-        SELECT
-            CASE WHEN a.supplier_type != b.supplier_type OR (a.supplier_type IS NULL XOR b.supplier_type IS NULL)
-                 THEN CONCAT('供应商身份类型: 变更前: ', a.supplier_type, ' 变更后: ', b.supplier_type) ELSE NULL END AS supplier_type_diff,
-            CASE WHEN a.licence_accessory != b.licence_accessory OR (a.licence_accessory IS NULL XOR b.licence_accessory IS NULL)
-                 THEN CONCAT('营业执照附件: 变更前: ', a.licence_accessory, ' 变更后: ', b.licence_accessory) ELSE NULL END AS licence_accessory_diff,
-            CASE WHEN a.licence_date != b.licence_date OR (a.licence_date IS NULL XOR b.licence_date IS NULL)
-                 THEN CONCAT('营业执照有效期: 变更前: ', a.licence_date, ' 变更后: ', b.licence_date) ELSE NULL END AS licence_date_diff,
-            CASE WHEN a.enterprise_type != b.enterprise_type OR (a.enterprise_type IS NULL XOR b.enterprise_type IS NULL)
-                 THEN CONCAT('企业类型: 变更前: ', a.enterprise_type, ' 变更后: ', b.enterprise_type) ELSE NULL END AS enterprise_type_diff,
-            CASE WHEN a.name != b.name OR (a.name IS NULL XOR b.name IS NULL)
-                 THEN CONCAT('企业名称: 变更前: ', a.name, ' 变更后: ', b.name) ELSE NULL END AS name_diff,
-            CASE WHEN a.name_en != b.name_en OR (a.name_en IS NULL XOR b.name_en IS NULL)
-                 THEN CONCAT('企业英文名称: 变更前: ', a.name_en, ' 变更后: ', b.name_en) ELSE NULL END AS name_en_diff,
-            CASE WHEN a.social_credit_code != b.social_credit_code OR (a.social_credit_code IS NULL XOR b.social_credit_code IS NULL)
-                 THEN CONCAT('统一社会信用代码: 变更前: ', a.social_credit_code, ' 变更后: ', b.social_credit_code) ELSE NULL END AS social_credit_code_diff,
-            CASE WHEN a.range != b.range OR (a.range IS NULL XOR b.range IS NULL)
-                 THEN CONCAT('经营范围: 变更前: ', a.range, ' 变更后: ', b.range) ELSE NULL END AS range_diff,
-            CASE WHEN a.reg_address != b.reg_address OR (a.reg_address IS NULL XOR b.reg_address IS NULL)
-                 THEN CONCAT('注册地址: 变更前: ', a.reg_address, ' 变更后: ', b.reg_address) ELSE NULL END AS reg_address_diff,
-            CASE WHEN a.work_address != b.work_address OR (a.work_address IS NULL XOR b.work_address IS NULL)
-                 THEN CONCAT('办公地址: 变更前: ', a.work_address, ' 变更后: ', b.work_address) ELSE NULL END AS work_address_diff,
-            CASE WHEN a.parent_company_investor != b.parent_company_investor OR (a.parent_company_investor IS NULL XOR b.parent_company_investor IS NULL)
-                 THEN CONCAT('母公司/出资人信息: 变更前: ', a.parent_company_investor, ' 变更后: ', b.parent_company_investor) ELSE NULL END AS parent_company_investor_diff,
-            CASE WHEN a.legal_person != b.legal_person OR (a.legal_person IS NULL XOR b.legal_person IS NULL)
-                 THEN CONCAT('法定代表人: 变更前: ', a.legal_person, ' 变更后: ', b.legal_person) ELSE NULL END AS legal_person_diff,
-            CASE WHEN a.id_card != b.id_card OR (a.id_card IS NULL XOR b.id_card IS NULL)
-                 THEN CONCAT('身份证号: 变更前: ', a.id_card, ' 变更后: ', b.id_card) ELSE NULL END AS id_card_diff,
-            CASE WHEN a.capital != b.capital OR (a.capital IS NULL XOR b.capital IS NULL)
-                 THEN CONCAT('注册资本(万元): 变更前: ', a.capital, ' 变更后: ', b.capital) ELSE NULL END AS capital_diff,
-            CASE WHEN a.contacts_name != b.contacts_name OR (a.contacts_name IS NULL XOR b.contacts_name IS NULL)
-                 THEN CONCAT('联系人姓名: 变更前: ', a.contacts_name, ' 变更后: ', b.contacts_name) ELSE NULL END AS contacts_name_diff,
-            CASE WHEN a.contacts_phone != b.contacts_phone OR (a.contacts_phone IS NULL XOR b.contacts_phone IS NULL)
-                 THEN CONCAT('联系人手机: 变更前: ', a.contacts_phone, ' 变更后: ', b.contacts_phone) ELSE NULL END AS contacts_phone_diff,
-            CASE WHEN a.contacts_type != b.contacts_type OR (a.contacts_type IS NULL XOR b.contacts_type IS NULL)
-                 THEN CONCAT('联系人身份类别: 变更前: ', a.contacts_type, ' 变更后: ', b.contacts_type) ELSE NULL END AS contacts_type_diff,
-            CASE WHEN a.contacts_email != b.contacts_email OR (a.contacts_email IS NULL XOR b.contacts_email IS NULL)
-                 THEN CONCAT('联系人邮箱: 变更前: ', a.contacts_email, ' 变更后: ', b.contacts_email) ELSE NULL END AS contacts_email_diff,
-            CASE WHEN a.telephone != b.telephone OR (a.telephone IS NULL XOR b.telephone IS NULL)
-                 THEN CONCAT('固定电话: 变更前: ', a.telephone, ' 变更后: ', b.telephone) ELSE NULL END AS telephone_diff,
-            CASE WHEN a.nation != b.nation OR (a.nation IS NULL XOR b.nation IS NULL)
-                 THEN CONCAT('国家地区: 变更前: ', a.nation, ' 变更后: ', b.nation) ELSE NULL END AS nation_diff,
-            CASE WHEN a.vat != b.vat OR (a.vat IS NULL XOR b.vat IS NULL)
-                 THEN CONCAT('增值税号: 变更前: ', a.vat, ' 变更后: ', b.vat) ELSE NULL END AS vat_diff,
-            CASE WHEN a.taxpayer_id != b.taxpayer_id OR (a.taxpayer_id IS NULL XOR b.taxpayer_id IS NULL)
-                 THEN CONCAT('境外纳税人ID: 变更前: ', a.taxpayer_id, ' 变更后: ', b.taxpayer_id) ELSE NULL END AS taxpayer_id_diff,
-            CASE WHEN a.currency != b.currency OR (a.currency IS NULL XOR b.currency IS NULL)
-                 THEN CONCAT('币种: 变更前: ', a.currency, ' 变更后: ', b.currency) ELSE NULL END AS currency_diff,
-            CASE WHEN a.person_name != b.person_name OR (a.person_name IS NULL XOR b.person_name IS NULL)
-                 THEN CONCAT('个人姓名: 变更前: ', a.person_name, ' 变更后: ', b.person_name) ELSE NULL END AS person_name_diff,
-            CASE WHEN a.person_phone != b.person_phone OR (a.person_phone IS NULL XOR b.person_phone IS NULL)
-                 THEN CONCAT('个人联系电话: 变更前: ', a.person_phone, ' 变更后: ', b.person_phone) ELSE NULL END AS person_phone_diff,
-            CASE WHEN a.person_bank != b.person_bank OR (a.person_bank IS NULL XOR b.person_bank IS NULL)
-                 THEN CONCAT('个人开户行: 变更前: ', a.person_bank, ' 变更后: ', b.person_bank) ELSE NULL END AS person_bank_diff,
-            CASE WHEN a.person_account != b.person_account OR (a.person_account IS NULL XOR b.person_account IS NULL)
-                 THEN CONCAT('个人银行账号: 变更前: ', a.person_account, ' 变更后: ', b.person_account) ELSE NULL END AS person_account_diff,
-            CASE WHEN a.remark != b.remark OR (a.remark IS NULL XOR b.remark IS NULL)
-                 THEN CONCAT('备注: 变更前: ', a.remark, ' 变更后: ', b.remark) ELSE NULL END AS remark_diff
-        FROM
-            (SELECT * FROM cosco_supplier_change_base
-             WHERE
-                    <if test="supplierId != null  and supplierId != ''">
-                        supplier_id = #{supplierId}
-                    </if>
-                    <if test="supplierChangeApplyIdOld != null  and supplierChangeApplyIdOld != ''">
-                        supplier_change_apply_id = #{supplierChangeApplyIdOld}
-                    </if>
-
-                     ) a,
-            (SELECT * FROM cosco_supplier_change_base
-             WHERE supplier_change_apply_id = #{supplierChangeApplyId}) b
-        HAVING
-            supplier_type_diff IS NOT NULL OR
-            licence_accessory_diff IS NOT NULL OR
-            licence_date_diff IS NOT NULL OR
-            enterprise_type_diff IS NOT NULL OR
-            name_diff IS NOT NULL OR
-            name_en_diff IS NOT NULL OR
-            social_credit_code_diff IS NOT NULL OR
-            range_diff IS NOT NULL OR
-            reg_address_diff IS NOT NULL OR
-            work_address_diff IS NOT NULL OR
-            parent_company_investor_diff IS NOT NULL OR
-            legal_person_diff IS NOT NULL OR
-            id_card_diff IS NOT NULL OR
-            capital_diff IS NOT NULL OR
-            contacts_name_diff IS NOT NULL OR
-            contacts_phone_diff IS NOT NULL OR
-            contacts_type_diff IS NOT NULL OR
-            contacts_email_diff IS NOT NULL OR
-            telephone_diff IS NOT NULL OR
-            nation_diff IS NOT NULL OR
-            vat_diff IS NOT NULL OR
-            taxpayer_id_diff IS NOT NULL OR
-            currency_diff IS NOT NULL OR
-            person_name_diff IS NOT NULL OR
-            person_phone_diff IS NOT NULL OR
-            person_bank_diff IS NOT NULL OR
-            person_account_diff IS NOT NULL OR
-            remark_diff IS NOT NULL;
-    </select>
 
     <select id="selectCoscoSupplierChangeBaseById" parameterType="String"
             resultMap="CoscoSupplierChangeBaseResult">
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeInvoiceMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeInvoiceMapper.xml
index cd7efe5..805fe31 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeInvoiceMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeInvoiceMapper.xml
@@ -18,31 +18,6 @@
             <result property="supplierChangeApplyId" column="supplier_change_apply_id"/>
     </resultMap>
 
-    <resultMap id="InvoiceChangeDiffResultMap" type="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.InvoiceChangeDiffVo">
-        <!-- 纳税人类型变更对比 -->
-        <result property="taxpayerTypeDiff" column="taxpayer_type_diff" />
-
-        <!-- 纳税人识别号变更对比 -->
-        <result property="taxpayerCodeDiff" column="taxpayer_code_diff" />
-
-        <!-- 开票电话变更对比 -->
-        <result property="phoneDiff" column="phone_diff" />
-
-        <!-- 开票户行账号变更对比 -->
-        <result property="accountDiff" column="account_diff" />
-
-        <!-- 开票抬头变更对比 -->
-        <result property="headDiff" column="head_diff" />
-
-        <!-- 开票地址变更对比 -->
-        <result property="addressDiff" column="address_diff" />
-
-        <!-- 开票户行变更对比 -->
-        <result property="bankDiff" column="bank_diff" />
-
-        <!-- 一般纳税人资格证明变更对比 -->
-        <result property="qualificationCertificateDiff" column="qualification_certificate_diff" />
-    </resultMap>
 
 
     <sql id="selectCoscoSupplierChangeInvoiceVo">
@@ -87,39 +62,6 @@
     </select>
 
 
-    <select id="selectInvoiceDitt" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeInvoice" resultMap="InvoiceChangeDiffResultMap">
-        SELECT
-                CASE WHEN a.taxpayer_type != b.taxpayer_type OR (a.taxpayer_type IS NULL XOR b.taxpayer_type IS NULL)
-            THEN CONCAT('纳税人类型: 变更前: ', a.taxpayer_type, ' 变更后: ', b.taxpayer_type) ELSE NULL END AS taxpayer_type_diff,
-            CASE WHEN a.taxpayer_code != b.taxpayer_code OR (a.taxpayer_code IS NULL XOR b.taxpayer_code IS NULL)
-                 THEN CONCAT('纳税人识别号: 变更前: ', a.taxpayer_code, ' 变更后: ', b.taxpayer_code) ELSE NULL END AS taxpayer_code_diff,
-            CASE WHEN a.phone != b.phone OR (a.phone IS NULL XOR b.phone IS NULL)
-                 THEN CONCAT('开票电话: 变更前: ', a.phone, ' 变更后: ', b.phone) ELSE NULL END AS phone_diff,
-            CASE WHEN a.account != b.account OR (a.account IS NULL XOR b.account IS NULL)
-                 THEN CONCAT('开票户行账号: 变更前: ', a.account, ' 变更后: ', b.account) ELSE NULL END AS account_diff,
-            CASE WHEN a.head != b.head OR (a.head IS NULL XOR b.head IS NULL)
-                 THEN CONCAT('开票抬头: 变更前: ', a.head, ' 变更后: ', b.head) ELSE NULL END AS head_diff,
-            CASE WHEN a.address != b.address OR (a.address IS NULL XOR b.address IS NULL)
-                 THEN CONCAT('开票地址: 变更前: ', a.address, ' 变更后: ', b.address) ELSE NULL END AS address_diff,
-            CASE WHEN a.bank != b.bank OR (a.bank IS NULL XOR b.bank IS NULL)
-                 THEN CONCAT('开票户行: 变更前: ', a.bank, ' 变更后: ', b.bank) ELSE NULL END AS bank_diff,
-            CASE WHEN a.qualification_certificate != b.qualification_certificate OR (a.qualification_certificate IS NULL XOR b.qualification_certificate IS NULL)
-                 THEN CONCAT('一般纳税人资格证明: 变更前: ', a.qualification_certificate, ' 变更后: ', b.qualification_certificate) ELSE NULL END AS qualification_certificate_diff
-        FROM
-            (SELECT * FROM cosco_supplier_change_invoice
-             WHERE supplier_id = #{oldSupplierId}) a, -- 变更前供应商ID
-            (SELECT * FROM cosco_supplier_change_invoice
-             WHERE supplier_id = #{newSupplierId}) b  -- 变更后供应商ID
-        HAVING
-            taxpayer_type_diff IS NOT NULL OR
-            taxpayer_code_diff IS NOT NULL OR
-            phone_diff IS NOT NULL OR
-            account_diff IS NOT NULL OR
-            head_diff IS NOT NULL OR
-            address_diff IS NOT NULL OR
-            bank_diff IS NOT NULL OR
-            qualification_certificate_diff IS NOT NULL;
-    </select>
 
     <select id="selectCoscoSupplierChangeInvoiceById" parameterType="String"
             resultMap="CoscoSupplierChangeInvoiceResult">