供应商品类准入

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java

@@ -6,6 +6,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,10 @@ public class SynchronousController {
     @Autowired
     private ICoscoAccessWorkService coscoAccessWorkService;
 
+    @Autowired
+    private ICoscoAccessWorkCategoryService coscoAccessWorkCategoryService;
+
+
     /**
      * 品类库审批同步
      */
@@ -54,5 +59,14 @@ public class SynchronousController {
     }
 
 
+    /**
+     * 供应商品类准入审批
+     */
+    @PostMapping("/receiveCategoryApprove")
+    public BaseResponse receiveCategoryApprove(@RequestBody CoscoAccessWork vo) {
+        return BaseResponse.success(coscoAccessWorkCategoryService.receiveApprove(vo));
+    }
+
+
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java

@@ -2,6 +2,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.common;
 
 public class CoscoType {
 
+    //供应商准入状态（0.未准入、1.已准入）
+    public static final Long ACCESS_STATUS_YZR = 1L;
+
+
+
     //评审项单项
     public static final String ITEMTYPE_ITEM = "item";
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java

@@ -0,0 +1,113 @@
+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.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 java.util.List;
+
+
+/**
+ * 供应商准入_准入申请工作主Controller
+ *
+ * @author ruoyi
+ * @date 2025-06-16
+ */
+@RestController
+@RequestMapping("/coscoAccessWorkCategory")
+public class CoscoAccessWorkCategoryController extends BaseController {
+
+    @Autowired
+    private ICoscoAccessWorkCategoryService coscoAccessWorkCategoryService;
+
+    /**
+     * 供应商品类准入管理列表
+     * @return 返回结果
+     */
+    @ApiOperation("查询分页数据")
+    @PostMapping("/getPage")
+    public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
+        return BaseResponse.success(coscoAccessWorkCategoryService.getPage(data));
+    }
+
+
+
+    /**
+     * 品类准入申请
+     * @param vo
+     * @return
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/add")
+    public BaseResponse<Boolean> add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWorkVo vo){
+        return BaseResponse.success(coscoAccessWorkCategoryService.insertCoscoAccessWork(vo));
+    }
+
+    /**
+     * 品类详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("查询数据")
+    @GetMapping("/{id}")
+    public BaseResponse<CoscoAccessWorkVo> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
+        return BaseResponse.success(coscoAccessWorkCategoryService.selectCoscoAccessWorkById(id));
+    }
+
+
+    /**
+     * 发布审批页详情
+     * @param id
+     * @return
+     */
+    @ApiOperation("查询数据")
+    @GetMapping("/startApproveInfo/{id}")
+    public BaseResponse<CoscoAccessWorkCategoryVo> startApproveInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){
+        return BaseResponse.success(coscoAccessWorkCategoryService.startApproveInfo(id));
+    }
+
+    /**
+     * 发布审批页中的供应商分页列表
+     * @return 返回结果
+     */
+    @ApiOperation("查询分页数据")
+    @PostMapping("/approveSupplierPage")
+    public BaseResponse<IPage<CoscoAccessSupplier>> approveSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplier data) {
+        return BaseResponse.success(coscoAccessWorkCategoryService.approveSupplierPage(data));
+    }
+
+
+    /**
+     * 发布审批页中的供应商详情
+     * @return
+     */
+    @ApiOperation("查询数据")
+    @GetMapping("/supplier")
+    public BaseResponse<CoscoAccessSupplier> supplierInfo(@ApiParam(value = "任务id", required = true) String accessWorkId,@ApiParam(value = "供应商id", required = true) String supplierId){
+        CoscoAccessSupplier data = new CoscoAccessSupplier();
+        data.setSupplierId(supplierId);
+        data.setAccessWorkId(accessWorkId);
+        return BaseResponse.success(coscoAccessWorkCategoryService.supplierInfo(data));
+    }
+
+
+    /**
+     * 发起审批
+     * @return
+     */
+    @ApiOperation("修改数据")
+    @GetMapping("/startApprove")
+    public BaseResponse<Boolean> startApprove(@ApiParam(value = "任务id", required = true) String accessWorkId){
+        return BaseResponse.success(coscoAccessWorkCategoryService.startApprove(accessWorkId));
+    }
+
+
+
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java

@@ -27,6 +27,8 @@ public interface CoscoAccessSupplierCategoryMapper {
      */
     public List<CoscoAccessSupplierCategory> selectCoscoAccessSupplierCategoryList(CoscoAccessSupplierCategory coscoAccessSupplierCategory);
 
+    public Integer selectBySupplierIdAndCategoryId(CoscoAccessSupplierCategory coscoAccessSupplierCategory);
+
     /**
      * 新增供应商准入_供应商已准入品类
      *

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java

@@ -1,6 +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.CoscoAccessSupplier;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -19,6 +22,9 @@ public interface CoscoAccessSupplierMapper {
      */
     public CoscoAccessSupplier selectCoscoAccessSupplierByAccessWorkId(String accessWorkId);
 
+    public CoscoAccessSupplier selectBySupplierId(CoscoAccessSupplier coscoAccessSupplier);
+
+
     /**
      * 查询供应商准入_关联供应商列表
      *
@@ -27,6 +33,9 @@ public interface CoscoAccessSupplierMapper {
      */
     public List<CoscoAccessSupplier> selectCoscoAccessSupplierList(CoscoAccessSupplier coscoAccessSupplier);
 
+    IPage<CoscoAccessSupplier> selectSupplierPageList(IPage<CoscoAccessSupplier> page, @Param("vo") CoscoAccessSupplier vo);
+
+
     /**
      * 新增供应商准入_关联供应商
      *

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java

@@ -28,6 +28,20 @@ public class CoscoAccessSupplier extends CoscoBaseEntity {
     //供应商名
     private String supplierName;
 
+    //品类名
+    private String categoryName;
+
+    //品类名
+    private String categoryNameYzr;
+
+    //企业类型
+    private String supplierType;
+
+    //申请人
+    private String createBy;
+
+    //部门
+    private String deptId;
 
     //评审项集合
     private List<CoscoAccessItem> coscoAccessItemList;

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java

@@ -0,0 +1,17 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CoscoAccessWorkCategoryVo {
+
+    //准入申请主表
+    private CoscoAccessWork coscoAccessWork;
+
+
+
+
+
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java

@@ -0,0 +1,35 @@
+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;
+
+/**
+ * 供应商准入_准入申请工作主Service接口
+ *
+ * @author ruoyi
+ * @date 2025-06-16
+ */
+public interface ICoscoAccessWorkCategoryService {
+
+    IPage<CoscoAccessWork> getPage(CoscoAccessWork data);
+
+    IPage<CoscoAccessSupplier> approveSupplierPage(CoscoAccessSupplier data);
+
+    public Boolean insertCoscoAccessWork(CoscoAccessWorkVo coscoAccessWork);
+
+    public CoscoAccessWorkVo selectCoscoAccessWorkById(String id);
+
+    public CoscoAccessSupplier supplierInfo(CoscoAccessSupplier data);
+
+
+    public CoscoAccessWorkCategoryVo startApproveInfo(String id);
+
+
+    public Boolean startApprove(String id);
+
+    public Boolean receiveApprove(CoscoAccessWork vo);
+
+
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java

@@ -0,0 +1,236 @@
+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.coscosupplier.dao.mapper.*;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 供应商准入_准入申请工作主Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-06-16
+ */
+@Service
+public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCategoryService {
+
+    @Autowired
+    private CoscoAccessWorkMapper coscoAccessWorkMapper;
+
+    @Autowired
+    private CoscoAccessWorkAttachmentsMapper coscoAccessWorkAttachmentsMapper;
+
+    @Autowired
+    private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
+
+
+    @Autowired
+    private CoscoAccessCategoryMapper coscoAccessCategoryMapper;
+
+
+    @Autowired
+    private CoscoAccessSupplierMapper coscoAccessSupplierMapper;
+
+    @Autowired
+    private CoscoAccessUserMapper coscoAccessUserMapper;
+
+    @Autowired
+    private CoscoAccessItemMapper coscoAccessItemMapper;
+
+    @Autowired
+    private CoscoAccessUserItemMapper coscoAccessUserItemMapper;
+
+    @Autowired
+    private CoscoAccessItemAttachmentsMapper coscoAccessItemAttachmentsMapper;
+
+
+
+    @Override
+    public IPage<CoscoAccessWork> getPage(CoscoAccessWork data) {
+        // 创建分页对象（当前页，每页大小）
+        IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
+        data.setApplyType(CoscoType.APPLY_TYPE_PLZR);
+        return coscoAccessWorkMapper.selectPageList(page, data);
+    }
+
+    @Override
+    public IPage<CoscoAccessSupplier> approveSupplierPage(CoscoAccessSupplier data) {
+        // 创建分页对象（当前页，每页大小）
+        IPage<CoscoAccessSupplier> page = new Page<>(data.getPageNo(), data.getPageSize());
+        return coscoAccessSupplierMapper.selectSupplierPageList(page, data);
+    }
+
+    @Override
+    public CoscoAccessSupplier supplierInfo(CoscoAccessSupplier data) {
+        return coscoAccessSupplierMapper.selectBySupplierId(data);
+    }
+
+    /**
+     * 品类准入
+     * @param vo
+     * @return
+     */
+    @Override
+    @Transactional
+    public Boolean insertCoscoAccessWork(CoscoAccessWorkVo vo) {
+        String workId = CoscoIdUtil.getId();//工作主体id
+        //任务主体新增/供应商准入
+        CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork();
+        coscoAccessWork.setId(workId);
+        coscoAccessWork.setApplyType(CoscoType.APPLY_TYPE_PLZR);
+        coscoAccessWork.setCreateBy("1");
+        coscoAccessWork.setCreateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWork.setUpdateBy("1");
+        coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWorkMapper.insertCoscoAccessWork(coscoAccessWork);
+
+        //品类集合
+        for(String cId : vo.getCategoryIds()){
+            CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
+            coscoAccessCategory.setAccessWorkId(workId);
+            coscoAccessCategory.setCategoryId(cId);
+            coscoAccessCategoryMapper.insertCoscoAccessCategory(coscoAccessCategory);
+        }
+
+        //供应商集合
+        for(String sId : vo.getSupplierIds()){
+            CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
+            coscoAccessSupplier.setAccessWorkId(workId);
+            coscoAccessSupplier.setSupplierId(sId);
+            coscoAccessSupplierMapper.insertCoscoAccessSupplier(coscoAccessSupplier);
+        }
+
+        return true;
+    }
+
+    @Override
+    public CoscoAccessWorkVo selectCoscoAccessWorkById(String id) {
+        CoscoAccessWorkVo vo = new CoscoAccessWorkVo();
+
+        //准入基础信息
+        CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
+        vo.setCoscoAccessWork(coscoAccessWork);
+
+        //供应商信息
+        CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
+        coscoAccessSupplier.setAccessWorkId(id);
+        vo.setCoscoAccessSupplierList(coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier));
+
+        //品类
+        CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
+        coscoAccessCategory.setAccessWorkId(id);
+        vo.setCoscoAccessCategoryList(coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory));
+
+        return vo;
+    }
+
+
+    @Override
+    public CoscoAccessWorkCategoryVo startApproveInfo(String id) {
+        CoscoAccessWorkCategoryVo vo = new CoscoAccessWorkCategoryVo();
+        //准入基础信息
+        CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
+        vo.setCoscoAccessWork(coscoAccessWork);
+        return vo;
+    }
+
+    @Override
+    public Boolean startApprove(String id) {
+        //修改任务主表审批状态--通过或者驳回
+        CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
+        coscoAccessWork.setId(id);
+        coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
+        coscoAccessWork.setUpdateBy("1");
+        coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
+
+
+        //*************调用三方审批接口***********
+
+        return true;
+    }
+
+
+    /**
+     * 接受审批返回值
+     * @return
+     */
+    @Override
+    @Transactional
+    public Boolean receiveApprove(CoscoAccessWork vo) {
+
+        //先验证一下主任务表数据状态
+        CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
+        if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
+                CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
+            return true;
+        }
+
+        //修改任务主表审批状态--通过或者驳回
+        CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
+        coscoAccessWork.setId(vo.getId());
+        coscoAccessWork.setApproveStatus(vo.getApproveStatus());
+        coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
+
+        //审批通过
+        if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){
+            //把准入的品类添加到已准入品类表
+
+            //供应商信息
+            CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
+            coscoAccessSupplier.setAccessWorkId(vo.getId());
+            List<CoscoAccessSupplier>  supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier);
+
+
+            for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
+                //根据id查询全部需要已准入的品类
+                CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
+                coscoAccessCategory.setAccessWorkId(vo.getId());
+                List<CoscoAccessCategory>  coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
+
+                for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
+                    //验证该品类是否已经准入过了
+                    CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory();
+                    coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId());
+                    coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId());
+                    Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2);
+                    //如果是0 说明没准入过
+                    if(num == 0){
+                        CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory();
+                        coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId());
+                        coscoAccessSupplierCategory.setAccessWorkId(vo.getId());
+                        coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId());
+                        coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId());
+                        coscoAccessSupplierCategory.setCreateBy("1");
+                        coscoAccessSupplierCategory.setCreateTime(CoscoDateUtils.getNowDate());
+                        coscoAccessSupplierCategory.setUpdateBy("1");
+                        coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate());
+                        coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate());
+                        coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
+                    }
+                }
+            }
+
+        }
+
+
+        return true;
+    }
+
+
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java

@@ -24,12 +24,17 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
+
+    @Autowired
+    private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
     @Autowired
     private CoscoAccessWorkMapper coscoAccessWorkMapper;
 
     @Autowired
     private CoscoAccessWorkAttachmentsMapper coscoAccessWorkAttachmentsMapper;
 
+    @Autowired
+    private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
 
 
     @Autowired
@@ -56,6 +61,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
     public IPage<CoscoAccessWork> getPage(CoscoAccessWork data) {
         // 创建分页对象（当前页，每页大小）
         IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
+        data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
         return coscoAccessWorkMapper.selectPageList(page, data);
     }
 
@@ -63,6 +69,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
     public IPage<CoscoAccessWork> getApprovePage(CoscoAccessWork data) {
         // 创建分页对象（当前页，每页大小）
         IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
+        data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
         return coscoAccessWorkMapper.selectPageList(page, data);
     }
 
@@ -493,7 +500,16 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
      * @return
      */
     @Override
+    @Transactional
     public Boolean receiveApprove(CoscoAccessWork vo) {
+
+        //先验证一下主任务表数据状态
+        CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
+        if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) ||
+                CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){
+            return true;
+        }
+
         //修改任务主表审批状态--通过或者驳回
         CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
         coscoAccessWork.setId(vo.getId());
@@ -502,6 +518,46 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate());
         coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
 
+        //审批通过
+        if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){
+            //把准入的品类添加到已准入品类表
+
+            //供应商信息
+            CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
+            coscoAccessSupplier.setAccessWorkId(vo.getId());
+            List<CoscoAccessSupplier>  supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier);
+
+
+            for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){
+                //根据id查询全部已准入的品类
+                CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
+                coscoAccessCategory.setAccessWorkId(vo.getId());
+                List<CoscoAccessCategory>  coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
+
+                for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
+                    CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory();
+                    coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId());
+                    coscoAccessSupplierCategory.setAccessWorkId(vo.getId());
+                    coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId());
+                    coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId());
+                    coscoAccessSupplierCategory.setCreateBy("1");
+                    coscoAccessSupplierCategory.setCreateTime(CoscoDateUtils.getNowDate());
+                    coscoAccessSupplierCategory.setUpdateBy("1");
+                    coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate());
+                    coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate());
+                    coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
+                }
+
+                CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
+                coscoSupplierBase.setId(coscoAccessSupplier1.getSupplierId());
+                coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
+                coscoSupplierBase.setUpdateBy("1");
+                coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate());
+                coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate());
+                coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
+            }
+
+        }
 
 
         return true;

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml

@@ -40,6 +40,15 @@
         </where>
     </select>
 
+
+    <select id="selectBySupplierIdAndCategoryId" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory" resultType="Integer">
+        select COUNT(0)  from cosco_access_supplier_category
+                         where supplier_id = #{supplierId}
+                           and category_id = #{categoryId}
+                           and del_flag = 'normal'
+    </select>
+
+
     <select id="selectCoscoAccessSupplierCategoryById" parameterType="String"
             resultMap="CoscoAccessSupplierCategoryResult">
             <include refid="selectCoscoAccessSupplierCategoryVo"/>

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml

@@ -21,12 +21,86 @@
         </where>
     </select>
 
+
+    <select id="selectSupplierPageList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier" resultMap="CoscoAccessSupplierResult">
+        SELECT
+            GROUP_CONCAT( DISTINCT d.category_name SEPARATOR ', ' ) AS categoryName,
+            GROUP_CONCAT( DISTINCT cat.category_name SEPARATOR ', ' ) AS categoryNameYzr,
+            s.supplier_id,
+            ca.NAME AS supplierName,
+            CASE
+
+                WHEN ca.supplier_type = 'dvs' THEN
+                    '境内企业'
+                WHEN ca.supplier_type = 'ovs' THEN
+                    '境外企业'
+                WHEN ca.supplier_type = 'pe' THEN
+                    '个人' ELSE CAST( ca.supplier_type AS CHAR )
+                END AS supplierType,
+            w.create_time
+        FROM
+            cosco_access_supplier s
+                LEFT JOIN cosco_access_work w ON w.id = s.access_work_id
+                LEFT JOIN cosco_supplier_base ca ON ca.id = s.supplier_id
+                LEFT JOIN cosco_access_category c ON w.id = c.access_work_id
+                LEFT JOIN cosco_category d ON c.category_id = d.id AND d.del_flag = 'normal'
+                left join cosco_access_supplier_category sc on sc.supplier_id = s.supplier_id
+                left join cosco_category cat ON sc.category_id = cat.id AND cat.del_flag = 'normal'
+        WHERE
+            w.apply_type = '1'
+          AND w.id = #{vo.accessWorkId}
+        GROUP BY
+            s.supplier_id,
+            ca.NAME,
+            w.create_time,
+            supplierType
+    </select>
+
     <select id="selectCoscoAccessSupplierByAccessWorkId" parameterType="String"
             resultMap="CoscoAccessSupplierResult">
             <include refid="selectCoscoAccessSupplierVo"/>
             where a.access_work_id = #{accessWorkId}
     </select>
 
+
+    <select id="selectBySupplierId" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier" resultMap="CoscoAccessSupplierResult">
+        SELECT
+            GROUP_CONCAT( DISTINCT d.category_name SEPARATOR ', ' ) AS categoryName,
+            GROUP_CONCAT( DISTINCT cat.category_name SEPARATOR ', ' ) AS categoryNameYzr,
+            s.supplier_id,
+            ca.NAME AS supplierName,
+            CASE
+
+                WHEN ca.supplier_type = 'dvs' THEN
+                    '境内企业'
+                WHEN ca.supplier_type = 'ovs' THEN
+                    '境外企业'
+                WHEN ca.supplier_type = 'pe' THEN
+                    '个人' ELSE CAST( ca.supplier_type AS CHAR )
+                END AS supplierType,
+            w.create_by,
+            w.dept_id,
+            w.create_time
+        FROM
+            cosco_access_supplier s
+                LEFT JOIN cosco_access_work w ON w.id = s.access_work_id
+                LEFT JOIN cosco_supplier_base ca ON ca.id = s.supplier_id
+                LEFT JOIN cosco_access_category c ON w.id = c.access_work_id
+                LEFT JOIN cosco_category d ON c.category_id = d.id AND d.del_flag = 'normal'
+                left join cosco_access_supplier_category sc on sc.supplier_id = s.supplier_id
+                left join cosco_category cat ON sc.category_id = cat.id AND cat.del_flag = 'normal'
+        WHERE
+            w.apply_type = '1'
+          AND s.supplier_id = #{supplierId} AND w.id = #{accessWorkId}
+        GROUP BY
+            s.supplier_id,
+            ca.NAME,
+            w.create_by,
+            w.dept_id,
+            w.create_time,
+            supplierType
+    </select>
+
     <insert id="insertCoscoAccessSupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier">
         insert into cosco_access_supplier
         <trim prefix="(" suffix=")" suffixOverrides=",">

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml

@@ -49,6 +49,7 @@
                 WHEN w.approve_status = 2 THEN '驳回'
                 ELSE CAST(w.approve_status AS CHAR)
                 END AS approve_status_text,
+            w.approve_status,
             w.work_flow_id,
             w.create_by,
             w.create_time,