From 37b2daa04f165e5fb9ec1eaeeda88fafc4c9ca5a Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Wed, 18 Jun 2025 13:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=93=81=E7=B1=BB=E9=80=80?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SynchronousController.java | 20 +- .../CoscoSupplierexitController.java | 71 +++++++ .../CoscoAccessSupplierCategoryMapper.java | 10 +- .../dao/mapper/CoscoSupplierexitMapper.java | 68 +++++++ ...scoSupplierexitSupplierCategoryMapper.java | 69 +++++++ .../CoscoSupplierexitSupplierMapper.java | 61 ++++++ .../entity/CoscoAccessSupplierCategory.java | 15 ++ .../entity/CoscoSupplierexit.java | 61 ++++++ .../entity/CoscoSupplierexitSupplier.java | 26 +++ .../CoscoSupplierexitSupplierCategory.java | 44 ++++ .../entity/CoscoSupplierexitVo.java | 20 ++ .../ICoscoAccessSupplierCategoryService.java | 7 - .../service/ICoscoSupplierexitService.java | 70 +++++++ ...coSupplierexitSupplierCategoryService.java | 61 ++++++ .../ICoscoSupplierexitSupplierService.java | 61 ++++++ ...oscoAccessSupplierCategoryServiceImpl.java | 11 - .../CoscoAccessWorkCategoryServiceImpl.java | 1 + .../impl/CoscoAccessWorkServiceImpl.java | 1 + .../impl/CoscoSupplierexitServiceImpl.java | 182 +++++++++++++++++ ...pplierexitSupplierCategoryServiceImpl.java | 87 ++++++++ .../CoscoSupplierexitSupplierServiceImpl.java | 87 ++++++++ .../CoscoAccessSupplierCategoryMapper.xml | 75 ++++++- .../dao/mapper/CoscoSupplierexitMapper.xml | 191 ++++++++++++++++++ ...oscoSupplierexitSupplierCategoryMapper.xml | 107 ++++++++++ .../CoscoSupplierexitSupplierMapper.xml | 69 +++++++ 25 files changed, 1444 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierCategoryService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java create mode 100644 src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml create mode 100644 src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml create mode 100644 src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierMapper.xml diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java index f81f469..98d8460 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java @@ -6,8 +6,10 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -30,6 +32,11 @@ public class SynchronousController { @Autowired private ICoscoAccessWorkCategoryService coscoAccessWorkCategoryService; + @Autowired + private ICoscoSupplierexitService coscoSupplierexitService; + + + /** * 品类库审批同步 @@ -51,7 +58,7 @@ public class SynchronousController { /** - * 供应商准入审批 + * 供应商准入审批回调接口 */ @PostMapping("/receiveApprove") public BaseResponse receiveApprove(@RequestBody CoscoAccessWork vo) { @@ -60,7 +67,7 @@ public class SynchronousController { /** - * 供应商品类准入审批 + * 供应商品类准入审批回调接口 */ @PostMapping("/receiveCategoryApprove") public BaseResponse receiveCategoryApprove(@RequestBody CoscoAccessWork vo) { @@ -68,5 +75,14 @@ public class SynchronousController { } + /** + * 供应商品类退出审批回调接口 + */ + @PostMapping("/supplierCategoryTcApprove") + public BaseResponse supplierCategoryTcApprove(@RequestBody CoscoSupplierexit vo) { + return BaseResponse.success(coscoSupplierexitService.updateCoscoSupplierexit(vo)); + } + + } 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 new file mode 100644 index 0000000..c30eeac --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -0,0 +1,71 @@ +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.service.ICoscoSupplierexitService; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + + +/** + * 供应商退出_供应商退出任务表 + * + */ +@RestController +@RequestMapping("/coscoSupplierexit") +public class CoscoSupplierexitController extends BaseController { + + @Autowired + private ICoscoSupplierexitService coscoSupplierexitService; + + /** + * 供应商退出任务分页查询 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexit data) { + return BaseResponse.success(coscoSupplierexitService.getPage(data)); + } + + /** + * 供应商退出任务申请 + * @param vo + * @return + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexitVo vo){ + return BaseResponse.success(coscoSupplierexitService.insertCoscoSupplierexit(vo)); + } + + + /** + * 供应商退出任务发起页中的供应商品类分页列表 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @PostMapping("/getSupplierCategoryPage") + public BaseResponse> getSupplierCategoryPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplierCategory data) { + return BaseResponse.success(coscoSupplierexitService.getSupplierCategoryPage(data)); + } + + + /** + * 供应商退出任务详情查询 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @PostMapping("/getExitInfoPage") + public BaseResponse> getExitInfoPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexitSupplierCategory data) { + return BaseResponse.success(coscoSupplierexitService.getExitInfoPage(data)); + } + + +} 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 4895f38..c250078 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 @@ -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.CoscoAccessSupplierCategory; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -11,6 +14,10 @@ import java.util.List; * @date 2025-06-16 */ public interface CoscoAccessSupplierCategoryMapper { + + IPage selectExitCategoryList(IPage page, @Param("vo") CoscoAccessSupplierCategory vo); + + /** * 查询供应商准入_供应商已准入品类 * @@ -48,10 +55,9 @@ public interface CoscoAccessSupplierCategoryMapper { /** * 删除供应商准入_供应商已准入品类 * - * @param id 供应商准入_供应商已准入品类主键 * @return 结果 */ - public int deleteCoscoAccessSupplierCategoryById(String id); + public int deleteCoscoAccessSupplierCategoryById(CoscoAccessSupplierCategory coscoAccessSupplierCategory); /** * 批量删除供应商准入_供应商已准入品类 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java new file mode 100644 index 0000000..375bdb2 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java @@ -0,0 +1,68 @@ +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.CoscoSupplierexit; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +/** + * 供应商退出_供应商退出任务Mapper接口 + * + * @author ruoyi + * @date 2025-06-17 + */ +public interface CoscoSupplierexitMapper { + + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierexit vo); + + + /** + * 查询供应商退出_供应商退出任务 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 供应商退出_供应商退出任务 + */ + public CoscoSupplierexit selectCoscoSupplierexitById(String id); + + /** + * 查询供应商退出_供应商退出任务列表 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 供应商退出_供应商退出任务集合 + */ + public List selectCoscoSupplierexitList(CoscoSupplierexit coscoSupplierexit); + + /** + * 新增供应商退出_供应商退出任务 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 结果 + */ + public int insertCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit); + + /** + * 修改供应商退出_供应商退出任务 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 结果 + */ + public int updateCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit); + + /** + * 删除供应商退出_供应商退出任务 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitById(String id); + + /** + * 批量删除供应商退出_供应商退出任务 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitByIds(String[] ids); +} 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 new file mode 100644 index 0000000..e79839a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.java @@ -0,0 +1,69 @@ +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; + +import java.util.List; + +/** + * 供应商退出_退出任务供应商关联品类Mapper接口 + * + * @author ruoyi + * @date 2025-06-17 + */ +public interface CoscoSupplierexitSupplierCategoryMapper { + + + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierexitSupplierCategory vo); + + + /** + * 查询供应商退出_退出任务供应商关联品类 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 供应商退出_退出任务供应商关联品类 + */ + public CoscoSupplierexitSupplierCategory selectCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId); + + /** + * 查询供应商退出_退出任务供应商关联品类列表 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 供应商退出_退出任务供应商关联品类集合 + */ + public List selectCoscoSupplierexitSupplierCategoryList(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 新增供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + public int insertCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 修改供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + public int updateCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 删除供应商退出_退出任务供应商关联品类 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId); + + /** + * 批量删除供应商退出_退出任务供应商关联品类 + * + * @param supplierexitIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitIds(String[] supplierexitIds); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierMapper.java new file mode 100644 index 0000000..5275554 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitSupplierMapper.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplier; + +import java.util.List; + +/** + * 供应商退出_退出任务关联供应商Mapper接口 + * + * @author ruoyi + * @date 2025-06-17 + */ +public interface CoscoSupplierexitSupplierMapper { + /** + * 查询供应商退出_退出任务关联供应商 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 供应商退出_退出任务关联供应商 + */ + public CoscoSupplierexitSupplier selectCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId); + + /** + * 查询供应商退出_退出任务关联供应商列表 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 供应商退出_退出任务关联供应商集合 + */ + public List selectCoscoSupplierexitSupplierList(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 新增供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + public int insertCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 修改供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + public int updateCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 删除供应商退出_退出任务关联供应商 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId); + + /** + * 批量删除供应商退出_退出任务关联供应商 + * + * @param supplierexitIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierBySupplierexitIds(String[] supplierexitIds); +} 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 454fb82..5a6843f 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 @@ -43,5 +43,20 @@ public class CoscoAccessSupplierCategory extends CoscoBaseEntity { //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + //供应商名称 + private String supplierName; + + //品类名称 + private String categoryName; + + //评价等级 + private String reviewResult; + + //评价时间 + private String evaTime; + + + + } 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 new file mode 100644 index 0000000..630ed8a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java @@ -0,0 +1,61 @@ +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; + +/** + * 供应商退出_供应商退出任务对象 cosco_supplierexit + * + * @author ruoyi + * @date 2025-06-17 + */ +@Data +public class CoscoSupplierexit extends CoscoBaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 退出主题 */ + //@Excel(name = "退出主题") + private String exitTheme; + + /** 退出原因 */ + //@Excel(name = "退出原因") + private String exitReason; + + /** 发起单位id */ + //@Excel(name = "发起单位id") + private String deptId; + + /** 审批状态(0.待审批、1.通过、2.驳回) */ + //@Excel(name = "审批状态(0.待审批、1.通过、2.驳回)") + private Long approveStatus; + + private String approveStatusText; + + + /** 审批工作流id */ + //@Excel(name = "审批工作流id") + private String workFlowId; + + /** 删除标识(normal.正常、deleted.已删除) */ + private String delFlag; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdateTime; + + private String startTime; + + private String endTime; + + +} 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 new file mode 100644 index 0000000..d8ddcf3 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplier.java @@ -0,0 +1,26 @@ +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; + +/** + * 供应商退出_退出任务关联供应商对象 cosco_supplierexit_supplier + * + * @author ruoyi + * @date 2025-06-17 + */ +@Data +public class CoscoSupplierexitSupplier extends CoscoBaseEntity { + private static final long serialVersionUID = 1L; + + /** 供应商退出任务id(cosco_supplierexit表主键) */ + private String supplierexitId; + + /** 供应商id(cosco_supplier_base表主键) */ + private String supplierId; + + +} 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 new file mode 100644 index 0000000..f12a1e5 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitSupplierCategory.java @@ -0,0 +1,44 @@ +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; + +/** + * 供应商退出_退出任务供应商关联品类对象 cosco_supplierexit_supplier_category + * + * @author ruoyi + * @date 2025-06-17 + */ +@Data +public class CoscoSupplierexitSupplierCategory extends CoscoBaseEntity { + private static final long serialVersionUID = 1L; + + /** 供应商退出任务id(cosco_supplierexit表主键) */ + private String supplierexitId; + + /** 供应商id(cosco_supplier_base表主键) */ + private String supplierId; + + /** 品类id(cosco_category表主键) */ + private String categoryId; + + //主题名 + private String exitTheme; + + //部门 + private String deptId; + + //商品名称 + private String supplierName; + + //品类名称 + private String categoryName; + + private String startTime; + + private String endTime; + +} 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 new file mode 100644 index 0000000..df149ba --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java @@ -0,0 +1,20 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class CoscoSupplierexitVo { + + //退出任务主体 + public CoscoSupplierexit coscoSupplierexit; + + //供应商id集合 + public List supplierIdList; + + //退出任务供应商关联品类表 + public List coscoSupplierexitSupplierCategoryList; + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java index 8c1690d..c2f68a5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java @@ -51,11 +51,4 @@ public interface ICoscoAccessSupplierCategoryService { */ public int deleteCoscoAccessSupplierCategoryByIds(String[] ids); - /** - * 删除供应商准入_供应商已准入品类信息 - * - * @param id 供应商准入_供应商已准入品类主键 - * @return 结果 - */ - public int deleteCoscoAccessSupplierCategoryById(String id); } 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 new file mode 100644 index 0000000..5fa2c53 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java @@ -0,0 +1,70 @@ +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-17 + */ +public interface ICoscoSupplierexitService { + + + IPage getPage(CoscoSupplierexit data); + + IPage getSupplierCategoryPage(CoscoAccessSupplierCategory data); + + IPage getExitInfoPage(CoscoSupplierexitSupplierCategory data); + + + /** + * 查询供应商退出_供应商退出任务 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 供应商退出_供应商退出任务 + */ + public CoscoSupplierexit selectCoscoSupplierexitById(String id); + + /** + * 查询供应商退出_供应商退出任务列表 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 供应商退出_供应商退出任务集合 + */ + public List selectCoscoSupplierexitList(CoscoSupplierexit coscoSupplierexit); + + /** + * 新增供应商退出_供应商退出任务 + * + * @return 结果 + */ + public Boolean insertCoscoSupplierexit(CoscoSupplierexitVo vo); + + /** + * 修改供应商退出_供应商退出任务 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 结果 + */ + public Boolean updateCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit); + + /** + * 批量删除供应商退出_供应商退出任务 + * + * @param ids 需要删除的供应商退出_供应商退出任务主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitByIds(String[] ids); + + /** + * 删除供应商退出_供应商退出任务信息 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitById(String id); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierCategoryService.java new file mode 100644 index 0000000..1ecb2dd --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierCategoryService.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory; + +import java.util.List; + +/** + * 供应商退出_退出任务供应商关联品类Service接口 + * + * @author ruoyi + * @date 2025-06-17 + */ +public interface ICoscoSupplierexitSupplierCategoryService { + /** + * 查询供应商退出_退出任务供应商关联品类 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 供应商退出_退出任务供应商关联品类 + */ + public CoscoSupplierexitSupplierCategory selectCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId); + + /** + * 查询供应商退出_退出任务供应商关联品类列表 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 供应商退出_退出任务供应商关联品类集合 + */ + public List selectCoscoSupplierexitSupplierCategoryList(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 新增供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + public int insertCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 修改供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + public int updateCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory); + + /** + * 批量删除供应商退出_退出任务供应商关联品类 + * + * @param supplierexitIds 需要删除的供应商退出_退出任务供应商关联品类主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitIds(String[] supplierexitIds); + + /** + * 删除供应商退出_退出任务供应商关联品类信息 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierService.java new file mode 100644 index 0000000..f0839c6 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitSupplierService.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplier; + +import java.util.List; + +/** + * 供应商退出_退出任务关联供应商Service接口 + * + * @author ruoyi + * @date 2025-06-17 + */ +public interface ICoscoSupplierexitSupplierService { + /** + * 查询供应商退出_退出任务关联供应商 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 供应商退出_退出任务关联供应商 + */ + public CoscoSupplierexitSupplier selectCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId); + + /** + * 查询供应商退出_退出任务关联供应商列表 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 供应商退出_退出任务关联供应商集合 + */ + public List selectCoscoSupplierexitSupplierList(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 新增供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + public int insertCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 修改供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + public int updateCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier); + + /** + * 批量删除供应商退出_退出任务关联供应商 + * + * @param supplierexitIds 需要删除的供应商退出_退出任务关联供应商主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierBySupplierexitIds(String[] supplierexitIds); + + /** + * 删除供应商退出_退出任务关联供应商信息 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 结果 + */ + public int deleteCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId); +} 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 fda0784..00e6025 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 @@ -76,15 +76,4 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl public int deleteCoscoAccessSupplierCategoryByIds(String[] ids) { return coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryByIds(ids); } - - /** - * 删除供应商准入_供应商已准入品类信息 - * - * @param id 供应商准入_供应商已准入品类主键 - * @return 结果 - */ - @Override - public int deleteCoscoAccessSupplierCategoryById(String id) { - return coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(id); - } } 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 dee3585..66587c6 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 @@ -182,6 +182,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //修改任务主表审批状态--通过或者驳回 CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getId()); + coscoAccessWork.setWorkFlowId(vo.getWorkFlowId()); coscoAccessWork.setApproveStatus(vo.getApproveStatus()); coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); 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 7df2d19..0826f39 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 @@ -514,6 +514,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getId()); coscoAccessWork.setApproveStatus(vo.getApproveStatus()); + coscoAccessWork.setWorkFlowId(vo.getWorkFlowId()); coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); 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 new file mode 100644 index 0000000..ffcc94e --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -0,0 +1,182 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; + +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; +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.CoscoAccessSupplierCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitSupplierCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitSupplierMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 供应商退出_供应商退出任务Service业务层处理 + * + * @author ruoyi + * @date 2025-06-17 + */ +@Service +public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { + @Autowired + private CoscoSupplierexitMapper coscoSupplierexitMapper; + @Autowired + private CoscoSupplierexitSupplierCategoryMapper coscoSupplierexitSupplierCategoryMapper; + + @Autowired + private CoscoSupplierexitSupplierMapper coscoSupplierexitSupplierMapper; + + @Autowired + private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper; + + @Override + public IPage getPage(CoscoSupplierexit data) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + return coscoSupplierexitMapper.selectPageList(page, data); + } + + @Override + public IPage getSupplierCategoryPage(CoscoAccessSupplierCategory data) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + return coscoAccessSupplierCategoryMapper.selectExitCategoryList(page, data); + } + + @Override + public IPage getExitInfoPage(CoscoSupplierexitSupplierCategory data) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + return coscoSupplierexitSupplierCategoryMapper.selectPageList(page, data); + } + + /** + * 查询供应商退出_供应商退出任务 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 供应商退出_供应商退出任务 + */ + @Override + public CoscoSupplierexit selectCoscoSupplierexitById(String id) { + return coscoSupplierexitMapper.selectCoscoSupplierexitById(id); + } + + /** + * 查询供应商退出_供应商退出任务列表 + * + * @param coscoSupplierexit 供应商退出_供应商退出任务 + * @return 供应商退出_供应商退出任务 + */ + @Override + public List selectCoscoSupplierexitList(CoscoSupplierexit coscoSupplierexit) { + return coscoSupplierexitMapper.selectCoscoSupplierexitList(coscoSupplierexit); + } + + /** + * 新增供应商退出_供应商退出任务 + * @return 结果 + */ + @Override + @Transactional + public Boolean insertCoscoSupplierexit(CoscoSupplierexitVo vo) { + String exitId = PropertyUtils.getSnowflakeId(); + //基础信息保存--审批中 + CoscoSupplierexit coscoSupplierexit = vo.getCoscoSupplierexit(); + coscoSupplierexit.setId(exitId); + coscoSupplierexit.setCreateBy("1"); + coscoSupplierexit.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexit.setUpdateBy("1"); + coscoSupplierexit.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexit.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexit.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ); + coscoSupplierexitMapper.insertCoscoSupplierexit(coscoSupplierexit); + + //供应商id集合 去重 + List supplierIdList = vo.supplierIdList.stream().distinct().collect(Collectors.toList()); + for(String supplierId : supplierIdList){ + CoscoSupplierexitSupplier coscoSupplierexitSupplier = new CoscoSupplierexitSupplier(); + coscoSupplierexitSupplier.setSupplierexitId(exitId); + coscoSupplierexitSupplier.setSupplierId(supplierId); + coscoSupplierexitSupplierMapper.insertCoscoSupplierexitSupplier(coscoSupplierexitSupplier); + } + + //品类集合 + List categoryList = vo.getCoscoSupplierexitSupplierCategoryList(); + for(CoscoSupplierexitSupplierCategory category : categoryList){ + CoscoSupplierexitSupplierCategory category1 = new CoscoSupplierexitSupplierCategory(); + category1.setSupplierexitId(exitId); + category1.setSupplierId(category.getSupplierId()); + category1.setCategoryId(category.getCategoryId()); + coscoSupplierexitSupplierCategoryMapper.insertCoscoSupplierexitSupplierCategory(category1); + } + + //****************调用三方接口********************* + + return true; + } + + /** + * 供应商退出审批回调 + */ + @Override + @Transactional + public Boolean updateCoscoSupplierexit(CoscoSupplierexit vo) { + //先验证一下主任务表数据状态 + CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId()); + if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || + CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus()) ){ + return true; + } + + //修改主表状态 + CoscoSupplierexit coscoSupplierexit1 = new CoscoSupplierexit(); + coscoSupplierexit1.setApproveStatus(vo.getApproveStatus()); + coscoSupplierexit1.setWorkFlowId(vo.getWorkFlowId()); + coscoSupplierexit1.setId(vo.getId()); + coscoSupplierexit1.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexit1.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexitMapper.updateCoscoSupplierexit(coscoSupplierexit1); + + //查询该任务下的所有供应商品类 + CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory(); + category.setSupplierexitId(vo.getId()); + List categoryList = coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(category); + for(CoscoSupplierexitSupplierCategory category1 : categoryList){ + CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory.setCategoryId(category1.getCategoryId()); + coscoAccessSupplierCategory.setSupplierId(category1.getSupplierId()); + coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(coscoAccessSupplierCategory); + } + return true; + } + + /** + * 批量删除供应商退出_供应商退出任务 + * + * @param ids 需要删除的供应商退出_供应商退出任务主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitByIds(String[] ids) { + return coscoSupplierexitMapper.deleteCoscoSupplierexitByIds(ids); + } + + /** + * 删除供应商退出_供应商退出任务信息 + * + * @param id 供应商退出_供应商退出任务主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitById(String id) { + return coscoSupplierexitMapper.deleteCoscoSupplierexitById(id); + } +} 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 new file mode 100644 index 0000000..a03fbff --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierCategoryServiceImpl.java @@ -0,0 +1,87 @@ +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; + +/** + * 供应商退出_退出任务供应商关联品类Service业务层处理 + * + * @author ruoyi + * @date 2025-06-17 + */ +@Service +public class CoscoSupplierexitSupplierCategoryServiceImpl implements ICoscoSupplierexitSupplierCategoryService { + @Autowired + private CoscoSupplierexitSupplierCategoryMapper coscoSupplierexitSupplierCategoryMapper; + + /** + * 查询供应商退出_退出任务供应商关联品类 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 供应商退出_退出任务供应商关联品类 + */ + @Override + public CoscoSupplierexitSupplierCategory selectCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId) { + return coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryBySupplierexitId(supplierexitId); + } + + /** + * 查询供应商退出_退出任务供应商关联品类列表 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 供应商退出_退出任务供应商关联品类 + */ + @Override + public List selectCoscoSupplierexitSupplierCategoryList(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory) { + return coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(coscoSupplierexitSupplierCategory); + } + + /** + * 新增供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + @Override + public int insertCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory) { + return coscoSupplierexitSupplierCategoryMapper.insertCoscoSupplierexitSupplierCategory(coscoSupplierexitSupplierCategory); + } + + /** + * 修改供应商退出_退出任务供应商关联品类 + * + * @param coscoSupplierexitSupplierCategory 供应商退出_退出任务供应商关联品类 + * @return 结果 + */ + @Override + public int updateCoscoSupplierexitSupplierCategory(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory) { + return coscoSupplierexitSupplierCategoryMapper.updateCoscoSupplierexitSupplierCategory(coscoSupplierexitSupplierCategory); + } + + /** + * 批量删除供应商退出_退出任务供应商关联品类 + * + * @param supplierexitIds 需要删除的供应商退出_退出任务供应商关联品类主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitIds(String[] supplierexitIds) { + return coscoSupplierexitSupplierCategoryMapper.deleteCoscoSupplierexitSupplierCategoryBySupplierexitIds(supplierexitIds); + } + + /** + * 删除供应商退出_退出任务供应商关联品类信息 + * + * @param supplierexitId 供应商退出_退出任务供应商关联品类主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitSupplierCategoryBySupplierexitId(String supplierexitId) { + return coscoSupplierexitSupplierCategoryMapper.deleteCoscoSupplierexitSupplierCategoryBySupplierexitId(supplierexitId); + } +} 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 new file mode 100644 index 0000000..0cb00f4 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitSupplierServiceImpl.java @@ -0,0 +1,87 @@ +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; + +/** + * 供应商退出_退出任务关联供应商Service业务层处理 + * + * @author ruoyi + * @date 2025-06-17 + */ +@Service +public class CoscoSupplierexitSupplierServiceImpl implements ICoscoSupplierexitSupplierService { + @Autowired + private CoscoSupplierexitSupplierMapper coscoSupplierexitSupplierMapper; + + /** + * 查询供应商退出_退出任务关联供应商 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 供应商退出_退出任务关联供应商 + */ + @Override + public CoscoSupplierexitSupplier selectCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId) { + return coscoSupplierexitSupplierMapper.selectCoscoSupplierexitSupplierBySupplierexitId(supplierexitId); + } + + /** + * 查询供应商退出_退出任务关联供应商列表 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 供应商退出_退出任务关联供应商 + */ + @Override + public List selectCoscoSupplierexitSupplierList(CoscoSupplierexitSupplier coscoSupplierexitSupplier) { + return coscoSupplierexitSupplierMapper.selectCoscoSupplierexitSupplierList(coscoSupplierexitSupplier); + } + + /** + * 新增供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + @Override + public int insertCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier) { + return coscoSupplierexitSupplierMapper.insertCoscoSupplierexitSupplier(coscoSupplierexitSupplier); + } + + /** + * 修改供应商退出_退出任务关联供应商 + * + * @param coscoSupplierexitSupplier 供应商退出_退出任务关联供应商 + * @return 结果 + */ + @Override + public int updateCoscoSupplierexitSupplier(CoscoSupplierexitSupplier coscoSupplierexitSupplier) { + return coscoSupplierexitSupplierMapper.updateCoscoSupplierexitSupplier(coscoSupplierexitSupplier); + } + + /** + * 批量删除供应商退出_退出任务关联供应商 + * + * @param supplierexitIds 需要删除的供应商退出_退出任务关联供应商主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitSupplierBySupplierexitIds(String[] supplierexitIds) { + return coscoSupplierexitSupplierMapper.deleteCoscoSupplierexitSupplierBySupplierexitIds(supplierexitIds); + } + + /** + * 删除供应商退出_退出任务关联供应商信息 + * + * @param supplierexitId 供应商退出_退出任务关联供应商主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierexitSupplierBySupplierexitId(String supplierexitId) { + return coscoSupplierexitSupplierMapper.deleteCoscoSupplierexitSupplierBySupplierexitId(supplierexitId); + } +} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml index 783c0f1..2db9d79 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml @@ -18,29 +18,86 @@ - select id, access_work_id, supplier_id, category_id, del_flag, create_by, create_time, update_by, update_time, last_update_time - from cosco_access_supplier_category + SELECT + s.`name`, + ca.category_name, + c.id, + c.access_work_id, + c.supplier_id, + c.category_id, + c.del_flag, + c.create_by, + c.create_time, + c.update_by, + c.update_time, + c.last_update_time + FROM + cosco_access_supplier_category c + left join cosco_supplier_base s on c.supplier_id = s.id and s.del_flag = 'normal' + left join cosco_category ca on c.category_id = ca.id and ca.del_flag = 'normal' + + + + + + + and del_flag = 'normal' + + and exit_theme like concat('%', #{vo.exitTheme}, '%') + + + and exit_reason = #{vo.exitReason} + + + and dept_id = #{vo.deptId} + + + and approve_status = #{vo.approveStatus} + + + and work_flow_id = #{vo.workFlowId} + + + and last_update_time = #{vo.astUpdateTime} + + + and create_time >= #{vo.startTime} + + + and create_time <= #{vo.endTime} + + + order by create_time desc + + + + + + + + insert into cosco_supplierexit + + id, + exit_theme, + exit_reason, + dept_id, + approve_status, + work_flow_id, + del_flag, + create_by, + create_time, + update_by, + update_time, + last_update_time, + + + #{id}, + #{exitTheme}, + #{exitReason}, + #{deptId}, + #{approveStatus}, + #{workFlowId}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{lastUpdateTime}, + + + + insert into cosco_supplierexit + ( id, exit_theme, exit_reason, dept_id, approve_status, work_flow_id, del_flag, create_by, create_time, update_by, update_time, last_update_time) + values + + ( #{item.id}, #{item.exitTheme}, #{item.exitReason}, #{item.deptId}, #{item.approveStatus}, #{item.workFlowId}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) + + + + update cosco_supplierexit + + exit_theme = + #{exitTheme}, + + exit_reason = + #{exitReason}, + + dept_id = + #{deptId}, + + approve_status = + #{approveStatus}, + + work_flow_id = + #{workFlowId}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + last_update_time = + #{lastUpdateTime}, + + + where id = #{id} + + + + update cosco_supplierexit set del_flag = 2 + where id = #{id} + + + + update cosco_supplierexit set del_flag = 2 where id in + + #{id} + + + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml new file mode 100644 index 0000000..59f4524 --- /dev/null +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + SELECT + e.exit_theme, + e.dept_id, + e.create_time, + s.`name` as supplierName, + ca.category_name as categoryName, + sc.supplierexit_id, + sc.supplier_id, + sc.category_id + FROM + cosco_supplierexit_supplier_category sc + left join cosco_supplierexit e on sc.supplierexit_id = e.id + left join cosco_supplier_base s on sc.supplier_id = s.id and s.del_flag = 'normal' + left join cosco_category ca on sc.category_id = ca.id and ca.del_flag = 'normal' + + + + + + + + + + insert into cosco_supplierexit_supplier_category + + supplierexit_id, + supplier_id, + category_id, + + + #{supplierexitId}, + #{supplierId}, + #{categoryId}, + + + + insert into cosco_supplierexit_supplier_category + ( supplierexit_id, supplier_id, category_id) + values + + ( #{item.supplierexitId}, #{item.supplierId}, #{item.categoryId}) + + + + update cosco_supplierexit_supplier_category + + supplier_id = + #{supplierId}, + + category_id = + #{categoryId}, + + + where supplierexit_id = #{supplierexitId} + + + + update cosco_supplierexit_supplier_category set del_flag = 2 + where supplierexit_id = #{supplierexitId} + + + + update cosco_supplierexit_supplier_category set del_flag = 2 where supplierexit_id in + + #{supplierexitId} + + + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierMapper.xml new file mode 100644 index 0000000..4cfc5e5 --- /dev/null +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + select supplierexit_id, supplier_id + from cosco_supplierexit_supplier + + + + + + + + insert into cosco_supplierexit_supplier + + supplierexit_id, + supplier_id, + + + #{supplierexitId}, + #{supplierId}, + + + + insert into cosco_supplierexit_supplier + ( supplierexit_id, supplier_id) + values + + ( #{item.supplierexitId}, #{item.supplierId}) + + + + update cosco_supplierexit_supplier + + supplier_id = + #{supplierId}, + + + where supplierexit_id = #{supplierexitId} + + + + update cosco_supplierexit_supplier set del_flag = 2 + where supplierexit_id = #{supplierexitId} + + + + update cosco_supplierexit_supplier set del_flag = 2 where supplierexit_id in + + #{supplierexitId} + + +