From dc6b257a40fdd74efb3c41ca65b0aa8c8a53712a Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Mon, 23 Jun 2025 20:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=87=86=E5=85=A5?= =?UTF-8?q?=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zyhy/ebtp/supplier/common/CoscoType.java | 13 ++ .../CoscoSupplierBankController.java | 87 ++++++++ .../CoscoSupplierBaseController.java | 21 ++ .../CoscoSupplierChangeApplyController.java | 14 +- .../CoscoSupplierInvoiceController.java | 87 ++++++++ ...CoscoSupplierQualificationsController.java | 90 ++++++++ ...coSupplierSurveyAttachmentsController.java | 88 ++++++++ .../CoscoAccessSupplierCategoryMapper.java | 7 + .../dao/mapper/CoscoAccessSupplierMapper.java | 3 + .../dao/mapper/CoscoMessageMapper.java | 61 ++++++ .../dao/mapper/CoscoSupplierBankMapper.java | 2 +- .../CoscoSupplierChangeHistoryMapper.java | 63 ++++++ .../mapper/CoscoSupplierInvoiceMapper.java | 7 + .../CoscoSupplierQualificationsMapper.java | 4 + .../CoscoSupplierSurveyAttachmentsMapper.java | 6 + .../entity/CoscoAccessSupplier.java | 11 +- .../entity/CoscoAccessSupplierCategory.java | 2 + .../coscosupplier/entity/CoscoMessage.java | 36 ++++ .../entity/CoscoSupplierBase.java | 82 +++---- .../entity/CoscoSupplierChangeApply.java | 14 ++ .../entity/CoscoSupplierChangeHistory.java | 58 +++++ .../entity/CoscoSupplierDiffVo.java | 6 +- .../CoscoSupplierSurveyAttachments.java | 2 + .../coscosupplier/entity/CoscoSupplierVo.java | 7 + .../service/ICoscoMessageService.java | 60 ++++++ .../service/ICoscoSupplierBankService.java | 9 +- .../service/ICoscoSupplierBaseService.java | 17 ++ .../ICoscoSupplierChangeApplyService.java | 3 + .../ICoscoSupplierChangeHistoryService.java | 61 ++++++ .../service/ICoscoSupplierInvoiceService.java | 11 +- .../ICoscoSupplierQualificationsService.java | 14 +- ...CoscoSupplierSurveyAttachmentsService.java | 11 +- .../impl/CoscoAccessWorkServiceImpl.java | 11 + .../service/impl/CoscoMessageServiceImpl.java | 94 ++++++++ .../impl/CoscoSupplierBankServiceImpl.java | 33 +-- .../impl/CoscoSupplierBaseServiceImpl.java | 202 ++++++++++++++++-- .../CoscoSupplierChangeApplyServiceImpl.java | 28 ++- ...CoscoSupplierChangeHistoryServiceImpl.java | 90 ++++++++ .../impl/CoscoSupplierInvoiceServiceImpl.java | 33 ++- ...oscoSupplierQualificationsServiceImpl.java | 34 ++- ...oSupplierSurveyAttachmentsServiceImpl.java | 33 ++- .../impl/CoscoSupplierexitServiceImpl.java | 46 +++- .../coscosupplier/task/SupplierSyncTask.java | 165 ++++++++++++++ .../CoscoAccessSupplierCategoryMapper.xml | 24 ++- .../dao/mapper/CoscoAccessSupplierMapper.xml | 27 ++- .../base/dao/mapper/CoscoMessageMapper.xml | 111 ++++++++++ .../dao/mapper/CoscoSupplierBankMapper.xml | 2 +- .../dao/mapper/CoscoSupplierBaseMapper.xml | 2 +- .../mapper/CoscoSupplierChangeApplyMapper.xml | 161 +++++++++----- .../CoscoSupplierChangeHistoryMapper.xml | 156 ++++++++++++++ .../dao/mapper/CoscoSupplierInvoiceMapper.xml | 40 +++- .../CoscoSupplierQualificationsMapper.xml | 41 +++- .../CoscoSupplierSurveyAttachmentsMapper.xml | 62 +++++- .../CoscoSupplierexitSupplierMapper.xml | 1 + 54 files changed, 2184 insertions(+), 169 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeHistoryMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeHistoryService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java create mode 100644 src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml create mode 100644 src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeHistoryMapper.xml diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java index 5d2c064..9a8c7b1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.common; public class CoscoType { //供应商准入状态（0.未准入、1.已准入） + public static final Long ACCESS_STATUS_WZR = 0L; public static final Long ACCESS_STATUS_YZR = 1L; //是否为代理录入（0.否、1.是） @@ -62,4 +63,16 @@ public class CoscoType { public static final Long APPROVE_STATUS_BH = 2l; + //供应商身份类型（dvs.境内企业/机构、ovs.境外企业、pe.个人） + public static final String SUPPLIER_TYPE_DVS = "dvs"; + + public static final String SUPPLIER_TYPE_OVS = "ovs"; + + //表名 + public static final String COSCO_SUPPLIER_BASE = "cosco_supplier_base"; + + + + + } 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 new file mode 100644 index 0000000..715198b --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java @@ -0,0 +1,87 @@ +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; + + +/** + * 中远海运_供应商_银行账户Controller + * + * @author ruoyi + * @date 2025-06-16 + */ +@RestController +@RequestMapping("/bank") +public class CoscoSupplierBankController extends BaseController { + @Autowired + private ICoscoSupplierBankService coscoSupplierBankService; + + /** + * 查询中远海运_供应商_银行账户列表 + */ + @GetMapping("/list") + public BaseResponse> list(CoscoSupplierBank coscoSupplierBank) { + List list = coscoSupplierBankService.selectCoscoSupplierBankList(coscoSupplierBank); + return BaseResponse.success(list); + } + + /** + * 分页查询 + * @param vo + * @return + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBank vo) { + return BaseResponse.success(coscoSupplierBankService.getPage(vo)); + } + + /** + * 获取中远海运_供应商_银行账户详细信息 + */ + @GetMapping(value = "/{id}") + public BaseResponse getInfo(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierBankService.selectCoscoSupplierBankById(id)); + } + + /** + * 新增中远海运_供应商_银行账户 + */ + @PostMapping + public BaseResponse add(@RequestBody CoscoSupplierBank coscoSupplierBank) { + return BaseResponse.success(coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank)); + } + + /** + * 修改中远海运_供应商_银行账户 + */ + @PutMapping + public BaseResponse edit(@RequestBody CoscoSupplierBank coscoSupplierBank) { + return BaseResponse.success(coscoSupplierBankService.updateCoscoSupplierBank(coscoSupplierBank)); + } + + /** + * 删除中远海运_供应商_银行账户 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable String[] ids) { + return BaseResponse.success(coscoSupplierBankService.deleteCoscoSupplierBankByIds(ids)); + } +} 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 d0df9a2..68d402a 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 @@ -145,4 +145,25 @@ public class CoscoSupplierBaseController extends BaseController { return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierVo)); } + /** + * 只查供应商基本信息 + * @param id + * @return + */ + @ApiOperation("查询数据") + @GetMapping("/coscoSupplierBase/{id}") + public BaseResponse getCoscoSupplierBase(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + + return BaseResponse.success(coscoSupplierBaseService.getCoscoSupplierBase(id)); + } + + /** + * 修改供应商基本信息、同时判断是否变更 + * @return + */ + @PostMapping("/updateSupplierBase") + public BaseResponse updateSupplierBase(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierVo vo){ + return BaseResponse.success(coscoSupplierBaseService.update(vo)); + } + } 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 e043bed..62f5d84 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 @@ -53,7 +53,7 @@ public class CoscoSupplierChangeApplyController extends BaseController { /** - * 供应商信息主表详情信息 + * 供应商信息主表详情信息(作废) * @param id * @return */ @@ -64,6 +64,18 @@ public class CoscoSupplierChangeApplyController extends BaseController { return BaseResponse.success(coscoSupplierChangeApplyService.selectCoscoSupplierChangeApplyById(id)); } + /** + * 供应商信息主表详情信息 + * @param id + * @return + */ + @ApiOperation("查询数据") + @GetMapping("/supplierChangeApplyById/{id}") + public BaseResponse supplierChangeApplyById(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + + return BaseResponse.success(coscoSupplierChangeApplyService.supplierChangeApplyById(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 new file mode 100644 index 0000000..5056c6e --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java @@ -0,0 +1,87 @@ +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; + + +/** + * 中远海运_供应商_开票信息Controller + * + * @author ruoyi + * @date 2025-06-16 + */ +@RestController +@RequestMapping("/invoice") +public class CoscoSupplierInvoiceController extends BaseController { + @Autowired + private ICoscoSupplierInvoiceService coscoSupplierInvoiceService; + + /** + * 查询中远海运_供应商_开票信息列表 + */ + @GetMapping("/list") + public BaseResponse> list(CoscoSupplierInvoice coscoSupplierInvoice) { + List list = coscoSupplierInvoiceService.selectCoscoSupplierInvoiceList(coscoSupplierInvoice); + return BaseResponse.success(list); + } + + /** + * 分页查询 + * @param vo + * @return + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierInvoice vo) { + return BaseResponse.success(coscoSupplierInvoiceService.getPage(vo)); + } + + /** + * 获取中远海运_供应商_开票信息详细信息 + */ + @GetMapping(value = "/{id}") + public BaseResponse getInfo(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierInvoiceService.selectCoscoSupplierInvoiceById(id)); + } + + /** + * 新增中远海运_供应商_开票信息 + */ + @PostMapping + public BaseResponse add(@RequestBody CoscoSupplierInvoice coscoSupplierInvoice) { + return BaseResponse.success(coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice)); + } + + /** + * 修改中远海运_供应商_开票信息 + */ + @PutMapping + public BaseResponse edit(@RequestBody CoscoSupplierInvoice coscoSupplierInvoice) { + return BaseResponse.success(coscoSupplierInvoiceService.updateCoscoSupplierInvoice(coscoSupplierInvoice)); + } + + /** + * 删除中远海运_供应商_开票信息 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable String[] ids) { + return BaseResponse.success(coscoSupplierInvoiceService.deleteCoscoSupplierInvoiceByIds(ids)); + } +} 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 new file mode 100644 index 0000000..0d67205 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java @@ -0,0 +1,90 @@ +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; + + +/** + * 中远海运_供应商_资质信息Controller + * + * @author ruoyi + * @date 2025-06-16 + */ +@RestController +@RequestMapping("/qualifications") +public class CoscoSupplierQualificationsController extends BaseController { + @Autowired + private ICoscoSupplierQualificationsService coscoSupplierQualificationsService; + + + /** + * 查询中远海运_供应商_资质信息列表 + */ + @GetMapping("/list") + public BaseResponse> list(CoscoSupplierQualifications coscoSupplierQualifications) { + List list = coscoSupplierQualificationsService.selectCoscoSupplierQualificationsList(coscoSupplierQualifications); + return BaseResponse.success(list); + } + + /** + * 分页查询 + * @param vo + * @return + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierQualifications vo) { + return BaseResponse.success(coscoSupplierQualificationsService.getPage(vo)); + } + + + + /** + * 获取中远海运_供应商_资质信息详细信息 + */ + @GetMapping(value = "/{id}") + public BaseResponse getInfo(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierQualificationsService.selectCoscoSupplierQualificationsById(id)); + } + + /** + * 新增中远海运_供应商_资质信息 + */ + @PostMapping + public BaseResponse add(@RequestBody CoscoSupplierQualifications coscoSupplierQualifications) { + return BaseResponse.success(coscoSupplierQualificationsService.insertCoscoSupplierQualifications(coscoSupplierQualifications)); + } + + /** + * 修改中远海运_供应商_资质信息 + */ + @PutMapping + public BaseResponse edit(@RequestBody CoscoSupplierQualifications coscoSupplierQualifications) { + return BaseResponse.success(coscoSupplierQualificationsService.updateCoscoSupplierQualifications(coscoSupplierQualifications)); + } + + /** + * 删除中远海运_供应商_资质信息 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable String[] ids) { + return BaseResponse.success(coscoSupplierQualificationsService.deleteCoscoSupplierQualificationsByIds(ids)); + } +} 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 new file mode 100644 index 0000000..80091e4 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java @@ -0,0 +1,88 @@ +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; + + +/** + * 中远海运_供应商_承诺书及附件Controller + * + * @author ruoyi + * @date 2025-06-16 + */ +@RestController +@RequestMapping("/attachments") +public class CoscoSupplierSurveyAttachmentsController extends BaseController { + @Autowired + private ICoscoSupplierSurveyAttachmentsService coscoSupplierSurveyAttachmentsService; + + /** + * 查询中远海运_供应商_承诺书及附件列表 + */ + @GetMapping("/list") + public BaseResponse> list(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + List list = coscoSupplierSurveyAttachmentsService.selectCoscoSupplierSurveyAttachmentsList(coscoSupplierSurveyAttachments); + return BaseResponse.success(list); + } + + /** + * 分页查询 + * @param vo + * @return + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierSurveyAttachments vo) { + return BaseResponse.success(coscoSupplierSurveyAttachmentsService.getPage(vo)); + } + + + /** + * 获取中远海运_供应商_承诺书及附件详细信息 + */ + @GetMapping(value = "/{id}") + public BaseResponse getInfo(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierSurveyAttachmentsService.selectCoscoSupplierSurveyAttachmentsById(id)); + } + + /** + * 新增中远海运_供应商_承诺书及附件 + */ + @PostMapping + public BaseResponse add(@RequestBody CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + return BaseResponse.success(coscoSupplierSurveyAttachmentsService.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments)); + } + + /** + * 修改中远海运_供应商_承诺书及附件 + */ + @PutMapping + public BaseResponse edit(@RequestBody CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + return BaseResponse.success(coscoSupplierSurveyAttachmentsService.updateCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments)); + } + + /** + * 删除中远海运_供应商_承诺书及附件 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable String[] ids) { + return BaseResponse.success(coscoSupplierSurveyAttachmentsService.deleteCoscoSupplierSurveyAttachmentsByIds(ids)); + } +} 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 64858e9..fcb0f22 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 @@ -30,6 +30,13 @@ public interface CoscoAccessSupplierCategoryMapper { */ public CoscoAccessSupplierCategory selectCoscoAccessSupplierCategoryById(String id); + /** + * 通过部门id，供应商id查询这个供应商是否还有已准入的品类 + * @param category + * @return + */ + public int selectCount(CoscoAccessSupplierCategory category); + /** * 查询供应商准入_供应商已准入品类列表 * 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 ff29032..80e8623 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 @@ -52,6 +52,9 @@ public interface CoscoAccessSupplierMapper { */ public int updateCoscoAccessSupplier(CoscoAccessSupplier coscoAccessSupplier); + public int updateCoscoAccessSupplierBySupplierIdAndDeptId(CoscoAccessSupplier coscoAccessSupplier); + + /** * 删除供应商准入_关联供应商 * 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 new file mode 100644 index 0000000..d85bae1 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; + +import java.util.List; + +/** + * 供应商业务处理消息推送Mapper接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface CoscoMessageMapper { + /** + * 查询供应商业务处理消息推送 + * + * @param id 供应商业务处理消息推送主键 + * @return 供应商业务处理消息推送 + */ + public CoscoMessage selectCoscoMessageById(String id); + + /** + * 查询供应商业务处理消息推送列表 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 供应商业务处理消息推送集合 + */ + public List selectCoscoMessageList(CoscoMessage coscoMessage); + + /** + * 新增供应商业务处理消息推送 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 结果 + */ + public int insertCoscoMessage(CoscoMessage coscoMessage); + + /** + * 修改供应商业务处理消息推送 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 结果 + */ + public int updateCoscoMessage(CoscoMessage coscoMessage); + + /** + * 删除供应商业务处理消息推送 + * + * @param id 供应商业务处理消息推送主键 + * @return 结果 + */ + public int deleteCoscoMessageById(String id); + + /** + * 批量删除供应商业务处理消息推送 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoMessageByIds(String[] ids); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBankMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBankMapper.java index 3c0bcdb..508021e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBankMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBankMapper.java @@ -16,7 +16,7 @@ import java.util.List; public interface CoscoSupplierBankMapper extends IBaseMapper { - IPage selectPageList(IPage page, @Param("coscoSupplierBank") CoscoSupplierBank vo); + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierBank vo); /** * 查询中远海运_供应商_银行账户 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeHistoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeHistoryMapper.java new file mode 100644 index 0000000..9523c50 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierChangeHistoryMapper.java @@ -0,0 +1,63 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory; + +import java.util.List; + +/** + * 中远海运_供应商_供应商信息变更历史记录Mapper接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface CoscoSupplierChangeHistoryMapper { + /** + * 查询中远海运_供应商_供应商信息变更历史记录 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 中远海运_供应商_供应商信息变更历史记录 + */ + public CoscoSupplierChangeHistory selectCoscoSupplierChangeHistoryById(String id); + + /** + * 查询中远海运_供应商_供应商信息变更历史记录列表 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 中远海运_供应商_供应商信息变更历史记录集合 + */ + public List selectCoscoSupplierChangeHistoryList(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + /** + * 新增中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + public int insertCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + /** + * 修改中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + public int updateCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + public int batchCoscoSupplierChangeHistory(List coscoSupplierChangeHistory); + + /** + * 删除中远海运_供应商_供应商信息变更历史记录 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 结果 + */ + public int deleteCoscoSupplierChangeHistoryById(String id); + + /** + * 批量删除中远海运_供应商_供应商信息变更历史记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierChangeHistoryByIds(String[] ids); +} 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 4484c5e..8ac5647 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 @@ -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.CoscoSupplierInvoice; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -27,6 +30,10 @@ public interface CoscoSupplierInvoiceMapper { */ public List selectCoscoSupplierInvoiceList(CoscoSupplierInvoice coscoSupplierInvoice); + + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierInvoice vo); + + /** * 新增中远海运_供应商_开票信息 * 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 4aa3276..aff9a1e 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,6 +1,7 @@ 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; @@ -30,6 +31,9 @@ public interface CoscoSupplierQualificationsMapper { */ public List selectCoscoSupplierQualificationsList(CoscoSupplierQualifications coscoSupplierQualifications); + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierQualifications vo); + + /** * 新增中远海运_供应商_资质信息 * 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 8968891..5974729 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,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.CoscoSupplierQualifications; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -27,6 +30,9 @@ public interface CoscoSupplierSurveyAttachmentsMapper { */ public List selectCoscoSupplierSurveyAttachmentsList(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); + + IPage selectPageList(IPage page, @Param("vo") CoscoSupplierSurveyAttachments vo); + /** * 新增中远海运_供应商_承诺书及附件 * 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 9eecdbe..b4a5907 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 @@ -19,6 +19,15 @@ import java.util.List; public class CoscoAccessSupplier extends CoscoBaseEntity { private static final long serialVersionUID = 1L; + //主键 + private String id; + + //部门id + private String deptId; + + //供应商准入状态（0.未准入、1.已准入） + private Long accessStatus; + /** 准入工作id(cosco_access_work表主键) */ private String accessWorkId; @@ -40,8 +49,6 @@ public class CoscoAccessSupplier extends CoscoBaseEntity { //申请人 private String createBy; - //部门 - private String deptId; //评审项集合 private List coscoAccessItemList; 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 5a6843f..6b94ae2 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 @@ -23,6 +23,8 @@ public class CoscoAccessSupplierCategory extends CoscoBaseEntity { /** 主键ID */ private String id; + private String deptId; + /** 准入工作id(cosco_access_work表主键) */ //@Excel(name = "准入工作id(cosco_access_work表主键)") private String accessWorkId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java new file mode 100644 index 0000000..592d9c9 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java @@ -0,0 +1,36 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; + +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; +import lombok.Data; + +/** + * 供应商业务处理消息推送对象 cosco_message + * + * @author ruoyi + * @date 2025-06-23 + */ +@Data +public class CoscoMessage extends CoscoBaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 接收人ID */ + //@Excel(name = "接收人ID") + private String receiverId; + + /** 内容 */ + //@Excel(name = "内容") + private String content; + + /** 是否已读（0.未读、1.已读） */ + //@Excel(name = "是否已读", readConverterExp = "0=.未读、1.已读") + private Long read; + + /** 消息类型（数据字典） */ + //@Excel(name = "消息类型", readConverterExp = "数=据字典") + private String type; + + +} 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 efb51cf..b38b6fb 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 @@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -17,156 +18,159 @@ public class CoscoSupplierBase extends CoscoBaseEntity { private static final long serialVersionUID = 1L; /** 主键ID */ + @TableField("主键ID") private String id; /** * 部门id */ + @TableField("部门ID") private String deptId; /** 供应商身份类型（dvs.境内企业/机构、ovs.境外企业、pe.个人） */ - //@Excel(name = "供应商身份类型", readConverterExp = "d=vs.境内企业/机构、ovs.境外企业、pe.个人") + @TableField("供应商身份类型") private String supplierType; /** 营业执照附件文件url */ - //@Excel(name = "营业执照附件文件url") + @TableField("营业执照附件文件URL") private String licenceAccessory; /** 营业执照有效期 */ - //@Excel(name = "营业执照有效期") + @TableField("营业执照有效期") private String licenceDate; /** 企业类型(数据字典code) */ - //@Excel(name = "企业类型(数据字典code)") + @TableField("企业类型") private String enterpriseType; /** 企业名称 */ - //@Excel(name = "企业名称") + @TableField("企业名称") private String name; /** 企业英文名称 */ - //@Excel(name = "企业英文名称") + @TableField("企业英文名称") private String nameEn; /** 统一社会信用代码 */ - //@Excel(name = "统一社会信用代码") + @TableField("统一社会信用代码") private String socialCreditCode; /** 经营范围 */ - //@Excel(name = "经营范围") + @TableField("经营范围") private String range; /** 注册地址 */ - //@Excel(name = "注册地址") + @TableField("注册地址") private String regAddress; /** 办公地址 */ - //@Excel(name = "办公地址") + @TableField("办公地址") private String workAddress; /** 母公司/出资人信息 */ - //@Excel(name = "母公司/出资人信息") + @TableField("母公司/出资人信息") private String parentCompanyInvestor; /** 企业法定代表人/负责人 */ - //@Excel(name = "企业法定代表人/负责人") + @TableField("企业法定代表人/负责人") private String legalPerson; /** 身份证号 */ - //@Excel(name = "身份证号") + @TableField("身份证号") private String idCard; /** 注册资本/实收资本(万元) */ - //@Excel(name = "注册资本/实收资本(万元)") + @TableField("注册资本/实收资本(万元)") private Long capital; /** 联系人姓名 */ - //@Excel(name = "联系人姓名") + @TableField("联系人姓名") private String contactsName; /** 联系人手机 */ - //@Excel(name = "联系人手机") + @TableField("联系人手机") private String contactsPhone; /** 联系人身份类别 */ - //@Excel(name = "联系人身份类别") + @TableField("联系人身份类别") private String contactsType; /** 联系人邮箱 */ - //@Excel(name = "联系人邮箱") + @TableField("联系人邮箱") private String contactsEmail; /** 固定电话 */ - //@Excel(name = "固定电话") + @TableField("固定电话") private String telephone; /** 境外企业 __ 国家地区 */ - //@Excel(name = "境外企业 __ 国家地区") + @TableField("境外企业国家地区") private String nation; /** 境外企业 __ 增值税号VAT */ - //@Excel(name = "境外企业 __ 增值税号VAT") + @TableField("境外企业增值税号VAT") private String vat; /** 境外企业 __ 境外纳税人ID号 */ - //@Excel(name = "境外企业 __ 境外纳税人ID号") + @TableField("境外企业纳税人ID号") private String taxpayerId; /** 境外企业 __ 币种(数据字典code) */ - //@Excel(name = "境外企业 __ 币种(数据字典code)") + @TableField("境外企业币种") private String currency; /** 个人 __ 个人姓名 */ - //@Excel(name = "个人 __ 个人姓名") + @TableField("个人姓名") private String personName; /** 个人 __ 个人联系电话 */ - //@Excel(name = "个人 __ 个人联系电话") + @TableField("个人联系电话") private String personPhone; /** 个人 __ 开户行 */ - //@Excel(name = "个人 __ 开户行") + @TableField("个人开户行") private String personBank; /** 个人 __ 银行账号 */ - //@Excel(name = "个人 __ 银行账号") + @TableField("个人银行账号") private String personAccount; /** 供应商准入状态（0.未准入、1.已准入） */ - //@Excel(name = "供应商准入状态", readConverterExp = "0=.未准入、1.已准入") + @TableField("供应商准入状态") private Long accessStatus; /** 供应商黑名单状态（0.未加入、已加入） */ - //@Excel(name = "供应商黑名单状态", readConverterExp = "0=.未加入、已加入") + @TableField("供应商黑名单状态") private Long blacklistStatus; /** 供应商灰名单状态（0.未加入、已加入） */ - //@Excel(name = "供应商灰名单状态", readConverterExp = "0=.未加入、已加入") + @TableField("供应商灰名单状态") private Long greylistStatus; /** 是否为代理录入（0.否、1.是） */ - //@Excel(name = "是否为代理录入", readConverterExp = "0=.否、1.是") + @TableField("代理录入状态") private Long fillinStatus; /** 代理录入人 */ - //@Excel(name = "代理录入人") + @TableField("代理录入人") private String fillinBy; - /** sap_code 约束付款编码 */ - //@Excel(name = "sap_code 约束付款编码") + /** sap_code 集团数据底座赋码(集团北京SAP系统编码) */ + @TableField("SAP系统编码") private String sapCode; /** 删除标识(normal.正常、deleted.已删除) */ + @TableField("删除标识") private String delFlag; /** 最后更新时间 */ + @TableField("最后更新时间") @JsonFormat(pattern = "yyyy-MM-dd") - //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + @TableField("供应商身份类型中文") private String supplierTypeCn; + + @TableField("准入状态中文") private String accessStatusCn; - - - -} +} \ No newline at end of file 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 b1d655a..89ce2b7 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 @@ -69,4 +69,18 @@ public class CoscoSupplierChangeApply extends CoscoBaseEntity { //变更内容字段 private List textList; + //变更内容 + private List coscoSupplierChangeHistoryList; + + /** + * 新增字段 + */ + + //变更标题 + private String title; + + //变更说明 + private String changeDesc; + + private String deptNames; } 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 new file mode 100644 index 0000000..8440ca2 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeHistory.java @@ -0,0 +1,58 @@ +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_supplier_change_history + * + * @author ruoyi + * @date 2025-06-23 + */ +@Data +public class CoscoSupplierChangeHistory extends CoscoBaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 供应商信息变更申请id(cosco_supplier_change_apply表主键) */ + //@Excel(name = "供应商信息变更申请id(cosco_supplier_change_apply表主键)") + private String supplierChangeApplyId; + + /** 变更表名 */ + //@Excel(name = "变更表名") + private String tableName; + + /** 变更字段名 */ + //@Excel(name = "变更字段名") + private String fieldName; + + /** 变更字段注释(中文名称) */ + //@Excel(name = "变更字段注释(中文名称)") + private String fieldAnnotation; + + /** 旧值 */ + //@Excel(name = "旧值") + private String oldValue; + + /** 新值 */ + //@Excel(name = "新值") + private String newValue; + + /** 删除标识(normal.正常、deleted.已删除) */ + private String delFlag; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdateTime; + + +} 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 e2385da..63b172c 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 @@ -22,6 +22,10 @@ public class CoscoSupplierDiffVo { Map bankListMap; - //变更内容 + //变更内容（作废） List txtList; + + //变更内容集合 + + List coscoSupplierChangeHistoryList; } 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 81f48a9..06c9a15 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 @@ -55,5 +55,7 @@ public class CoscoSupplierSurveyAttachments extends CoscoBaseEntity { //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + private String attachmentsTypeCn; + } 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 29bb876..4a39025 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 @@ -20,4 +20,11 @@ public class CoscoSupplierVo { private List coscoSupplierSurveyQuestionReply; //承诺书&附件表 private List coscoSupplierSurveyAttachments; + + //变更标题 + private String title; + + //变更说明 + private String changeDesc; + } 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 new file mode 100644 index 0000000..c383127 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java @@ -0,0 +1,60 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; + +import java.util.List; + +/** + * 供应商业务处理消息推送Service接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface ICoscoMessageService { + /** + * 查询供应商业务处理消息推送 + * + * @param id 供应商业务处理消息推送主键 + * @return 供应商业务处理消息推送 + */ + public CoscoMessage selectCoscoMessageById(String id); + + /** + * 查询供应商业务处理消息推送列表 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 供应商业务处理消息推送集合 + */ + public List selectCoscoMessageList(CoscoMessage coscoMessage); + + /** + * 新增供应商业务处理消息推送 + * + * @return 结果 + */ + public int pustMessage(String receiverId,String content,String type); + + /** + * 修改供应商业务处理消息推送 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 结果 + */ + public int updateCoscoMessage(CoscoMessage coscoMessage); + + /** + * 批量删除供应商业务处理消息推送 + * + * @param ids 需要删除的供应商业务处理消息推送主键集合 + * @return 结果 + */ + public int deleteCoscoMessageByIds(String[] ids); + + /** + * 删除供应商业务处理消息推送信息 + * + * @param id 供应商业务处理消息推送主键 + * @return 结果 + */ + public int deleteCoscoMessageById(String id); +} 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 7394bb5..737f178 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,6 +2,7 @@ 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; @@ -29,7 +30,7 @@ public interface ICoscoSupplierBankService { public List selectCoscoSupplierBankList(CoscoSupplierBank coscoSupplierBank); - IPage getPage(CoscoSupplierBank coscoSupplierBank); + IPage getPage(CoscoSupplierBank vo); /** @@ -38,7 +39,7 @@ public interface ICoscoSupplierBankService { * @param coscoSupplierBank 中远海运_供应商_银行账户 * @return 结果 */ - public int insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank); + public Boolean insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank); /** * 修改中远海运_供应商_银行账户 @@ -46,7 +47,7 @@ public interface ICoscoSupplierBankService { * @param coscoSupplierBank 中远海运_供应商_银行账户 * @return 结果 */ - public int updateCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank); + public Boolean updateCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank); /** * 批量删除中远海运_供应商_银行账户 @@ -54,7 +55,7 @@ public interface ICoscoSupplierBankService { * @param ids 需要删除的中远海运_供应商_银行账户主键集合 * @return 结果 */ - public int deleteCoscoSupplierBankByIds(String[] ids); + public Boolean deleteCoscoSupplierBankByIds(String[] ids); /** * 删除中远海运_供应商_银行账户信息 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 6c44ca0..edda0a0 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 @@ -71,4 +71,21 @@ public interface ICoscoSupplierBaseService { * @return */ IPage getSupplierPage(BlackSupplierVo supplierVo); + + + /** + * 供应商基本信息 + * @param id + * @return + */ + public CoscoSupplierBase getCoscoSupplierBase(String id); + + /** + * 单独修改供应商基本信息 + * @return + */ + public Boolean update(CoscoSupplierVo vo); + + + } 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 ad52eea..ec56b29 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 @@ -25,6 +25,9 @@ public interface ICoscoSupplierChangeApplyService { */ public CoscoSupplierDiffVo selectCoscoSupplierChangeApplyById(String id); + + public CoscoSupplierDiffVo supplierChangeApplyById(String id); + /** * 查询中远海运_供应商_供应商信息变更申请列表 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeHistoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeHistoryService.java new file mode 100644 index 0000000..68e49f7 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierChangeHistoryService.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeHistory; + +import java.util.List; + +/** + * 中远海运_供应商_供应商信息变更历史记录Service接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface ICoscoSupplierChangeHistoryService { + /** + * 查询中远海运_供应商_供应商信息变更历史记录 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 中远海运_供应商_供应商信息变更历史记录 + */ + public CoscoSupplierChangeHistory selectCoscoSupplierChangeHistoryById(String id); + + /** + * 查询中远海运_供应商_供应商信息变更历史记录列表 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 中远海运_供应商_供应商信息变更历史记录集合 + */ + public List selectCoscoSupplierChangeHistoryList(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + /** + * 新增中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + public int insertCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + /** + * 修改中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + public int updateCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory); + + /** + * 批量删除中远海运_供应商_供应商信息变更历史记录 + * + * @param ids 需要删除的中远海运_供应商_供应商信息变更历史记录主键集合 + * @return 结果 + */ + public int deleteCoscoSupplierChangeHistoryByIds(String[] ids); + + /** + * 删除中远海运_供应商_供应商信息变更历史记录信息 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 结果 + */ + public int deleteCoscoSupplierChangeHistoryById(String id); +} 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 d0384a9..93e7ed3 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 @@ -1,6 +1,8 @@ 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; @@ -27,13 +29,16 @@ public interface ICoscoSupplierInvoiceService { */ public List selectCoscoSupplierInvoiceList(CoscoSupplierInvoice coscoSupplierInvoice); + public IPage getPage(CoscoSupplierInvoice vo); + + /** * 新增中远海运_供应商_开票信息 * * @param coscoSupplierInvoice 中远海运_供应商_开票信息 * @return 结果 */ - public int insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice); + public Boolean insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice); /** * 修改中远海运_供应商_开票信息 @@ -41,7 +46,7 @@ public interface ICoscoSupplierInvoiceService { * @param coscoSupplierInvoice 中远海运_供应商_开票信息 * @return 结果 */ - public int updateCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice); + public Boolean updateCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice); /** * 批量删除中远海运_供应商_开票信息 @@ -49,7 +54,7 @@ public interface ICoscoSupplierInvoiceService { * @param ids 需要删除的中远海运_供应商_开票信息主键集合 * @return 结果 */ - public int deleteCoscoSupplierInvoiceByIds(String[] ids); + public Boolean deleteCoscoSupplierInvoiceByIds(String[] ids); /** * 删除中远海运_供应商_开票信息信息 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 fad0c8e..699a9b7 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,5 +1,8 @@ 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; @@ -27,13 +30,18 @@ public interface ICoscoSupplierQualificationsService { */ public List selectCoscoSupplierQualificationsList(CoscoSupplierQualifications coscoSupplierQualifications); + + public IPage getPage(CoscoSupplierQualifications coscoSupplierQualifications); + + + /** * 新增中远海运_供应商_资质信息 * * @param coscoSupplierQualifications 中远海运_供应商_资质信息 * @return 结果 */ - public int insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications); + public Boolean insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications); /** * 修改中远海运_供应商_资质信息 @@ -41,7 +49,7 @@ public interface ICoscoSupplierQualificationsService { * @param coscoSupplierQualifications 中远海运_供应商_资质信息 * @return 结果 */ - public int updateCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications); + public Boolean updateCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications); /** * 批量删除中远海运_供应商_资质信息 @@ -49,7 +57,7 @@ public interface ICoscoSupplierQualificationsService { * @param ids 需要删除的中远海运_供应商_资质信息主键集合 * @return 结果 */ - public int deleteCoscoSupplierQualificationsByIds(String[] ids); + public Boolean deleteCoscoSupplierQualificationsByIds(String[] ids); /** * 删除中远海运_供应商_资质信息信息 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 846cb6a..22edf1a 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,5 +1,7 @@ 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; @@ -27,13 +29,16 @@ public interface ICoscoSupplierSurveyAttachmentsService { */ public List selectCoscoSupplierSurveyAttachmentsList(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); + public IPage getPage(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); + + /** * 新增中远海运_供应商_承诺书及附件 * * @param coscoSupplierSurveyAttachments 中远海运_供应商_承诺书及附件 * @return 结果 */ - public int insertCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); + public Boolean insertCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); /** * 修改中远海运_供应商_承诺书及附件 @@ -41,7 +46,7 @@ public interface ICoscoSupplierSurveyAttachmentsService { * @param coscoSupplierSurveyAttachments 中远海运_供应商_承诺书及附件 * @return 结果 */ - public int updateCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); + public Boolean updateCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments); /** * 批量删除中远海运_供应商_承诺书及附件 @@ -49,7 +54,7 @@ public interface ICoscoSupplierSurveyAttachmentsService { * @param ids 需要删除的中远海运_供应商_承诺书及附件主键集合 * @return 结果 */ - public int deleteCoscoSupplierSurveyAttachmentsByIds(String[] ids); + public Boolean deleteCoscoSupplierSurveyAttachmentsByIds(String[] ids); /** * 删除中远海运_供应商_承诺书及附件信息 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 f5036c9..64f31e8 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 @@ -241,6 +241,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //供应商集合 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); coscoAccessSupplierMapper.insertCoscoAccessSupplier(coscoAccessSupplier); @@ -551,9 +554,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessSupplierCategory.setUpdateBy("1"); coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } + //修改注册信息表状态 CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(coscoAccessSupplier1.getSupplierId()); coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); @@ -562,6 +567,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierBase.setDeptId(coscoAccessWorkData.getDeptId()); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + + //修改准入供应商表状态 + CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); + coscoAccessSupplier2.setId(coscoAccessSupplier1.getId()); + coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier2); } } 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 new file mode 100644 index 0000000..bbf5aad --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java @@ -0,0 +1,94 @@ +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.common.CoscoIdUtil; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 供应商业务处理消息推送Service业务层处理 + * + * @author ruoyi + * @date 2025-06-23 + */ +@Service +public class CoscoMessageServiceImpl implements ICoscoMessageService { + @Autowired + private CoscoMessageMapper coscoMessageMapper; + + /** + * 查询供应商业务处理消息推送 + * + * @param id 供应商业务处理消息推送主键 + * @return 供应商业务处理消息推送 + */ + @Override + public CoscoMessage selectCoscoMessageById(String id) { + return coscoMessageMapper.selectCoscoMessageById(id); + } + + /** + * 查询供应商业务处理消息推送列表 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 供应商业务处理消息推送 + */ + @Override + public List selectCoscoMessageList(CoscoMessage coscoMessage) { + return coscoMessageMapper.selectCoscoMessageList(coscoMessage); + } + + /** + * 消息保存接口 + * @param receiverId 接收人id + * @param content 内容 + * @param type 消息类型 + * @return + */ + @Override + public int pustMessage(String receiverId,String content,String type) { + CoscoMessage coscoMessage = new CoscoMessage(); + coscoMessage.setId(CoscoIdUtil.getId()); + coscoMessage.setCreateTime(CoscoDateUtils.getNowDate()); + return coscoMessageMapper.insertCoscoMessage(coscoMessage); + } + + /** + * 修改供应商业务处理消息推送 + * + * @param coscoMessage 供应商业务处理消息推送 + * @return 结果 + */ + @Override + public int updateCoscoMessage(CoscoMessage coscoMessage) { + coscoMessage.setUpdateTime(CoscoDateUtils.getNowDate()); + return coscoMessageMapper.updateCoscoMessage(coscoMessage); + } + + /** + * 批量删除供应商业务处理消息推送 + * + * @param ids 需要删除的供应商业务处理消息推送主键 + * @return 结果 + */ + @Override + public int deleteCoscoMessageByIds(String[] ids) { + return coscoMessageMapper.deleteCoscoMessageByIds(ids); + } + + /** + * 删除供应商业务处理消息推送信息 + * + * @param id 供应商业务处理消息推送主键 + * @return 结果 + */ + @Override + public int deleteCoscoMessageById(String id) { + return coscoMessageMapper.deleteCoscoMessageById(id); + } +} 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 fc3f19b..ce851a0 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 @@ -6,6 +6,7 @@ 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; @@ -47,12 +48,10 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService { } @Override - public IPage getPage(CoscoSupplierBank coscoSupplierBaseVO) { + public IPage getPage(CoscoSupplierBank vo) { // 创建分页对象（当前页，每页大小） - IPage page = new Page<>(coscoSupplierBaseVO.getPageNo(), coscoSupplierBaseVO.getPageSize()); - // 调用自定义分页方法 - IPage result = coscoSupplierBankMapper.selectPageList(page, coscoSupplierBaseVO); - return result.convert(c -> BeanUtil.toBean(c, CoscoSupplierBank.class)); + IPage page = new Page<>(vo.getPageNo(), vo.getPageSize()); + return coscoSupplierBankMapper.selectPageList(page, vo); } @@ -65,9 +64,15 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService { * @return 结果 */ @Override - public int insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) { - coscoSupplierBank.setCreateTime(new Date()); - return coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); + public Boolean insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) { + coscoSupplierBank.setId(CoscoIdUtil.getId()); + coscoSupplierBank.setCreateBy("1"); + coscoSupplierBank.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBank.setUpdateBy("1"); + coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); + return true; } /** @@ -77,9 +82,12 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService { * @return 结果 */ @Override - public int updateCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) { + public Boolean updateCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) { + coscoSupplierBank.setUpdateBy("1"); coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierBankMapper.updateCoscoSupplierBank(coscoSupplierBank); + coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBankMapper.updateCoscoSupplierBank(coscoSupplierBank); + return true; } /** @@ -89,8 +97,9 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService { * @return 结果 */ @Override - public int deleteCoscoSupplierBankByIds(String[] ids) { - return coscoSupplierBankMapper.deleteCoscoSupplierBankByIds(ids); + public Boolean deleteCoscoSupplierBankByIds(String[] ids) { + coscoSupplierBankMapper.deleteCoscoSupplierBankByIds(ids); + return true; } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 91a48db..2829d25 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,10 +1,14 @@ 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; @@ -43,6 +47,9 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { private CoscoSupplierSurveyAttachmentsMapper coscoSupplierSurveyAttachmentsMapper; + @Autowired + private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper; + @Autowired private CoscoSupplierChangeBaseMapper coscoSupplierChangeBaseMapper; @@ -144,12 +151,12 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBaseMapper.insertCoscoSupplierBase(coscoSupplierBase); - //变更表基本信息插入 - CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase(); + //变更表基本信息插入---作废 + /* CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase(); BeanUtil.copyProperties(coscoSupplierBase,coscoSupplierChangeBase); coscoSupplierChangeBase.setId(changeSupplierId); coscoSupplierChangeBase.setSupplierId(supplierId); - coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase); + coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase);*/ } //资质信息新增 if(vo.getCoscoSupplierQualifications() != null){ @@ -165,13 +172,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications); - //变更表资质插入 - CoscoSupplierChangeQualifications coscoSupplierChangeQualifications = new CoscoSupplierChangeQualifications(); + //变更表资质插入--作废 + /* CoscoSupplierChangeQualifications coscoSupplierChangeQualifications = new CoscoSupplierChangeQualifications(); BeanUtil.copyProperties(coscoSupplierQualifications,coscoSupplierChangeQualifications); coscoSupplierChangeQualifications.setId(CoscoIdUtil.getId()); coscoSupplierChangeQualifications.setSupplierQualificationsId(supplierQualificationsId); coscoSupplierChangeQualifications.setSupplierId(changeSupplierId); - coscoSupplierChangeQualificationsMapper.insertCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications); + coscoSupplierChangeQualificationsMapper.insertCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications);*/ } } @@ -191,13 +198,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice); - //变更表发票插入 - CoscoSupplierChangeInvoice coscoSupplierChangeInvoice = new CoscoSupplierChangeInvoice(); + //变更表发票插入--作废 + /* CoscoSupplierChangeInvoice coscoSupplierChangeInvoice = new CoscoSupplierChangeInvoice(); BeanUtil.copyProperties(coscoSupplierInvoice,coscoSupplierChangeInvoice); coscoSupplierChangeInvoice.setId(CoscoIdUtil.getId()); coscoSupplierChangeInvoice.setSupplierInvoiceId(supplierInvoiceId); coscoSupplierChangeInvoice.setSupplierId(changeSupplierId); - coscoSupplierChangeInvoiceMapper.insertCoscoSupplierChangeInvoice(coscoSupplierChangeInvoice); + coscoSupplierChangeInvoiceMapper.insertCoscoSupplierChangeInvoice(coscoSupplierChangeInvoice);*/ } @@ -215,13 +222,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); - //变更表银行插入 - CoscoSupplierChangeBank coscoSupplierChangeBank = new CoscoSupplierChangeBank(); + //变更表银行插入---作废 + /*CoscoSupplierChangeBank coscoSupplierChangeBank = new CoscoSupplierChangeBank(); BeanUtil.copyProperties(coscoSupplierBank,coscoSupplierChangeBank); coscoSupplierChangeBank.setId(CoscoIdUtil.getId()); coscoSupplierChangeBank.setSupplierBankId(supplierBankId); coscoSupplierChangeBank.setSupplierId(changeSupplierId); - coscoSupplierChangeBankMapper.insertCoscoSupplierChangeBank(coscoSupplierChangeBank); + coscoSupplierChangeBankMapper.insertCoscoSupplierChangeBank(coscoSupplierChangeBank);*/ } } } @@ -305,7 +312,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); - //删除在新增新资质 + //***********下面代码作废*************** + /*//删除在新增新资质 coscoSupplierQualificationsMapper.deleteCoscoSupplierQualificationsById(supplierId); CoscoSupplierChangeQualifications coscoSupplierChangeQualifications2 = new CoscoSupplierChangeQualifications(); @@ -374,7 +382,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierChangeBank1.setId(coscoSupplierChangeBank.getId()); coscoSupplierChangeBank1.setSupplierBankId(bankId); coscoSupplierChangeBankMapper.updateCoscoSupplierChangeBank(coscoSupplierChangeBank1); - } + }*/ //修改审批状态 CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply(); @@ -415,4 +423,170 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return coscoSupplierBaseMapper.getSupplierPage(page ,supplierVo); } + + @Override + public CoscoSupplierBase getCoscoSupplierBase(String id) { + //基础信息、联系人信息 + return coscoSupplierBaseMapper.selectCoscoSupplierBaseById(id); + } + + @Override + @Transactional + public Boolean update(CoscoSupplierVo vo) { + //基本信息新增 + CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); + + CoscoSupplierBase oldCoscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierBase.getId()); + if(CoscoType.ACCESS_STATUS_YZR.equals(oldCoscoSupplierBase.getAccessStatus())){//已准入的供应商才会走下面变更的逻辑 + boolean nameBlean = baseDiff(oldCoscoSupplierBase.getName(),coscoSupplierBase.getName()); //企业名称 + 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); + } + } + } + //修改基本信息 + coscoSupplierBase.setUpdateBy("1"); + coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + return true; + } + + + /** + * 新增中远海运_供应商_供应商信息变更申请 + * + * @return 结果 + */ + @Transactional + public Boolean insertCoscoSupplierChangeApply(CoscoSupplierBase newCoscoSupplierBase,CoscoSupplierBase oldCoscoSupplierBase,CoscoSupplierVo vo) { + String applyId = PropertyUtils.getSnowflakeId(); + //主体信息---待审批 + CoscoSupplierChangeApply coscoSupplierChangeApply = new CoscoSupplierChangeApply(); + coscoSupplierChangeApply.setId(applyId); + coscoSupplierChangeApply.setSupplierId(newCoscoSupplierBase.getId()); + coscoSupplierChangeApply.setTitle(vo.getTitle()); + coscoSupplierChangeApply.setChangeDesc(vo.getChangeDesc()); + 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); + + + //新增变更后基本信息 + CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase(); + BeanUtil.copyProperties(newCoscoSupplierBase,coscoSupplierChangeBase); + String changeSupplierId = PropertyUtils.getSnowflakeId(); + coscoSupplierChangeBase.setId(changeSupplierId); + coscoSupplierChangeBase.setSupplierChangeApplyId(applyId); + coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase); + + //基础信息对比--将差异内容插入到比对表 + List changeHistories = compareSupplierChanges(newCoscoSupplierBase,oldCoscoSupplierBase,applyId); + coscoSupplierChangeHistoryMapper.batchCoscoSupplierChangeHistory(changeHistories); + + + //变更证明附件 + if(vo.getCoscoSupplierSurveyAttachments() != null){ + if(vo.getCoscoSupplierSurveyAttachments().size() > 0){ + for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){ + coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId()); + coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId()); + coscoSupplierSurveyAttachments.setCreateBy("1"); + coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachments.setUpdateBy("1"); + coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + } + } + } + //**************调用审批接口********************** + + return true; + } + + + + public List compareSupplierChanges( + CoscoSupplierBase newCoscoSupplierBase, + CoscoSupplierBase oldCoscoSupplierBase, + String supplierChangeApplyId) { + + List changeHistories = new ArrayList<>(); + + // 获取对象的所有字段 + Field[] fields = CoscoSupplierBase.class.getDeclaredFields(); + + for (Field field : fields) { + try { + field.setAccessible(true); + // 获取字段值 + Object newValue = field.get(newCoscoSupplierBase); + Object oldValue = field.get(oldCoscoSupplierBase); + // 比较值是否相同 + if ((newValue == null && oldValue != null) || + (newValue != null && !newValue.equals(oldValue))) { + // 创建变更记录 + CoscoSupplierChangeHistory history = new CoscoSupplierChangeHistory(); + history.setId(PropertyUtils.getSnowflakeId()); + history.setSupplierChangeApplyId(supplierChangeApplyId); + history.setTableName(CoscoType.COSCO_SUPPLIER_BASE); // 表名 + history.setFieldName(field.getName()); // 字段名 + + // 获取字段注解（中文名） + if (field.isAnnotationPresent(TableField.class)) { + TableField annotation = field.getAnnotation(TableField.class); + history.setFieldAnnotation(annotation.value()); + } else { + history.setFieldAnnotation(field.getName()); + } + + history.setOldValue(oldValue != null ? oldValue.toString() : null); + history.setNewValue(newValue != null ? newValue.toString() : null); + history.setCreateBy("1"); + history.setCreateTime(CoscoDateUtils.getNowDate()); + history.setUpdateBy("1"); + history.setUpdateTime(CoscoDateUtils.getNowDate()); + history.setLastUpdateTime(CoscoDateUtils.getNowDate()); + changeHistories.add(history); + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + List newChangeHistories = new ArrayList<>(); + for(CoscoSupplierChangeHistory oldc: changeHistories){ + if(oldc.getNewValue() != null){ + oldc.setFieldName(StrUtil.toUnderlineCase(oldc.getFieldName())); + newChangeHistories.add(oldc); + } + } + return newChangeHistories; + } + + + public Boolean baseDiff(String msg1,String msg2) { + if(msg1.equals(msg2)){//无改变 + return false; + }else{//有改变 + return true; + } + + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeApplyServiceImpl.java index 8f39e67..0b262e6 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 @@ -40,6 +40,8 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange @Autowired private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper; + @Autowired + private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper; @Override public IPage getPage(CoscoSupplierChangeApply data) { @@ -61,15 +63,18 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyList(page, data); List coscoSupplierChangeApplies = CoscoSupplierChangeApplyPage.getRecords(); for(CoscoSupplierChangeApply coscoSupplierChangeApply : coscoSupplierChangeApplies){ - CoscoSupplierDiffVo vo = selectCoscoSupplierChangeApplyById(coscoSupplierChangeApply.getId()); - coscoSupplierChangeApply.setTextList(vo.getTxtList()); + //变更基本内容 + CoscoSupplierChangeHistory coscoSupplierChangeHistory = new CoscoSupplierChangeHistory(); + coscoSupplierChangeHistory.setSupplierChangeApplyId(coscoSupplierChangeApply.getId()); + List coscoSupplierChangeHistoryList = coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory); + coscoSupplierChangeApply.setCoscoSupplierChangeHistoryList(coscoSupplierChangeHistoryList); } return CoscoSupplierChangeApplyPage; } /** - * 查询中远海运_供应商_供应商信息变更申请 + * 查询中远海运_供应商_供应商信息变更申请——————————————————（作废） * * @return 中远海运_供应商_供应商信息变更申请 */ @@ -250,6 +255,21 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange return diffVo; } + @Override + public CoscoSupplierDiffVo supplierChangeApplyById(String id) { + CoscoSupplierDiffVo diffVo = new CoscoSupplierDiffVo(); + //变更主表 基本信息 + CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(id); + diffVo.setCoscoSupplierChangeApply(coscoSupplierChangeApply); + + //变更基本内容 + CoscoSupplierChangeHistory coscoSupplierChangeHistory = new CoscoSupplierChangeHistory(); + coscoSupplierChangeHistory.setSupplierChangeApplyId(id); + List coscoSupplierChangeHistoryList = coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory); + diffVo.setCoscoSupplierChangeHistoryList(coscoSupplierChangeHistoryList); + return diffVo; + } + //资质对比方法 public Map qualificationsDiff(List oldList,List newList){ @@ -441,7 +461,7 @@ public class CoscoSupplierChangeApplyServiceImpl implements ICoscoSupplierChange /** - * 新增中远海运_供应商_供应商信息变更申请 + * 新增中远海运_供应商_供应商信息变更申请------------原来比对逻辑（作废） * * @return 结果 */ 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 new file mode 100644 index 0000000..c19c3fe --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierChangeHistoryServiceImpl.java @@ -0,0 +1,90 @@ +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; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeHistoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 中远海运_供应商_供应商信息变更历史记录Service业务层处理 + * + * @author ruoyi + * @date 2025-06-23 + */ +@Service +public class CoscoSupplierChangeHistoryServiceImpl implements ICoscoSupplierChangeHistoryService { + @Autowired + private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper; + + /** + * 查询中远海运_供应商_供应商信息变更历史记录 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 中远海运_供应商_供应商信息变更历史记录 + */ + @Override + public CoscoSupplierChangeHistory selectCoscoSupplierChangeHistoryById(String id) { + return coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryById(id); + } + + /** + * 查询中远海运_供应商_供应商信息变更历史记录列表 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 中远海运_供应商_供应商信息变更历史记录 + */ + @Override + public List selectCoscoSupplierChangeHistoryList(CoscoSupplierChangeHistory coscoSupplierChangeHistory) { + return coscoSupplierChangeHistoryMapper.selectCoscoSupplierChangeHistoryList(coscoSupplierChangeHistory); + } + + /** + * 新增中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + @Override + public int insertCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory) { + coscoSupplierChangeHistory.setCreateTime(CoscoDateUtils.getNowDate()); + return coscoSupplierChangeHistoryMapper.insertCoscoSupplierChangeHistory(coscoSupplierChangeHistory); + } + + /** + * 修改中远海运_供应商_供应商信息变更历史记录 + * + * @param coscoSupplierChangeHistory 中远海运_供应商_供应商信息变更历史记录 + * @return 结果 + */ + @Override + public int updateCoscoSupplierChangeHistory(CoscoSupplierChangeHistory coscoSupplierChangeHistory) { + coscoSupplierChangeHistory.setUpdateTime(CoscoDateUtils.getNowDate()); + return coscoSupplierChangeHistoryMapper.updateCoscoSupplierChangeHistory(coscoSupplierChangeHistory); + } + + /** + * 批量删除中远海运_供应商_供应商信息变更历史记录 + * + * @param ids 需要删除的中远海运_供应商_供应商信息变更历史记录主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierChangeHistoryByIds(String[] ids) { + return coscoSupplierChangeHistoryMapper.deleteCoscoSupplierChangeHistoryByIds(ids); + } + + /** + * 删除中远海运_供应商_供应商信息变更历史记录信息 + * + * @param id 中远海运_供应商_供应商信息变更历史记录主键 + * @return 结果 + */ + @Override + public int deleteCoscoSupplierChangeHistoryById(String id) { + return coscoSupplierChangeHistoryMapper.deleteCoscoSupplierChangeHistoryById(id); + } +} 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 b87913e..00aaf94 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 @@ -2,8 +2,12 @@ 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.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 org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +46,13 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer return coscoSupplierInvoiceMapper.selectCoscoSupplierInvoiceList(coscoSupplierInvoice); } + @Override + public IPage getPage(CoscoSupplierInvoice vo) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(vo.getPageNo(), vo.getPageSize()); + return coscoSupplierInvoiceMapper.selectPageList(page, vo); + } + /** * 新增中远海运_供应商_开票信息 * @@ -49,9 +60,15 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer * @return 结果 */ @Override - public int insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) { + public Boolean insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) { + coscoSupplierInvoice.setId(CoscoIdUtil.getId()); + coscoSupplierInvoice.setCreateBy("1"); coscoSupplierInvoice.setCreateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice); + coscoSupplierInvoice.setUpdateBy("1"); + coscoSupplierInvoice.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice); + return true; } /** @@ -61,9 +78,12 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer * @return 结果 */ @Override - public int updateCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) { + public Boolean updateCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) { + coscoSupplierInvoice.setUpdateBy("1"); coscoSupplierInvoice.setUpdateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierInvoiceMapper.updateCoscoSupplierInvoice(coscoSupplierInvoice); + coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierInvoiceMapper.updateCoscoSupplierInvoice(coscoSupplierInvoice); + return true; } /** @@ -73,8 +93,9 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer * @return 结果 */ @Override - public int deleteCoscoSupplierInvoiceByIds(String[] ids) { - return coscoSupplierInvoiceMapper.deleteCoscoSupplierInvoiceByIds(ids); + public Boolean deleteCoscoSupplierInvoiceByIds(String[] ids) { + coscoSupplierInvoiceMapper.deleteCoscoSupplierInvoiceByIds(ids); + return true; } /** 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 bd1dd06..d495f57 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 @@ -2,6 +2,11 @@ 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.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; @@ -42,6 +47,13 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua return coscoSupplierQualificationsMapper.selectCoscoSupplierQualificationsList(coscoSupplierQualifications); } + @Override + public IPage getPage(CoscoSupplierQualifications coscoSupplierQualifications) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(coscoSupplierQualifications.getPageNo(), coscoSupplierQualifications.getPageSize()); + return coscoSupplierQualificationsMapper.selectPageList(page, coscoSupplierQualifications); + } + /** * 新增中远海运_供应商_资质信息 * @@ -49,9 +61,15 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua * @return 结果 */ @Override - public int insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) { + public Boolean insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) { + coscoSupplierQualifications.setId(CoscoIdUtil.getId()); + coscoSupplierQualifications.setCreateBy("1"); coscoSupplierQualifications.setCreateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications); + coscoSupplierQualifications.setUpdateBy("1"); + coscoSupplierQualifications.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications); + return true; } /** @@ -61,9 +79,12 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua * @return 结果 */ @Override - public int updateCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) { + public Boolean updateCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) { + coscoSupplierQualifications.setUpdateBy("1"); coscoSupplierQualifications.setUpdateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierQualificationsMapper.updateCoscoSupplierQualifications(coscoSupplierQualifications); + coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierQualificationsMapper.updateCoscoSupplierQualifications(coscoSupplierQualifications); + return true; } /** @@ -73,8 +94,9 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua * @return 结果 */ @Override - public int deleteCoscoSupplierQualificationsByIds(String[] ids) { - return coscoSupplierQualificationsMapper.deleteCoscoSupplierQualificationsByIds(ids); + public Boolean deleteCoscoSupplierQualificationsByIds(String[] ids) { + coscoSupplierQualificationsMapper.deleteCoscoSupplierQualificationsByIds(ids); + return true; } /** 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 227b6a1..1fda85d 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 @@ -2,6 +2,10 @@ 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; @@ -42,6 +46,13 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier return coscoSupplierSurveyAttachmentsMapper.selectCoscoSupplierSurveyAttachmentsList(coscoSupplierSurveyAttachments); } + @Override + public IPage getPage(CoscoSupplierSurveyAttachments vo) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(vo.getPageNo(), vo.getPageSize()); + return coscoSupplierSurveyAttachmentsMapper.selectPageList(page, vo); + } + /** * 新增中远海运_供应商_承诺书及附件 * @@ -49,9 +60,15 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier * @return 结果 */ @Override - public int insertCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + public Boolean insertCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId()); + coscoSupplierSurveyAttachments.setCreateBy("1"); coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + coscoSupplierSurveyAttachments.setUpdateBy("1"); + coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + return true; } /** @@ -61,9 +78,12 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier * @return 结果 */ @Override - public int updateCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + public Boolean updateCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + coscoSupplierSurveyAttachments.setUpdateBy("1"); coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); - return coscoSupplierSurveyAttachmentsMapper.updateCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachmentsMapper.updateCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + return true; } /** @@ -73,8 +93,9 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier * @return 结果 */ @Override - public int deleteCoscoSupplierSurveyAttachmentsByIds(String[] ids) { - return coscoSupplierSurveyAttachmentsMapper.deleteCoscoSupplierSurveyAttachmentsByIds(ids); + public Boolean deleteCoscoSupplierSurveyAttachmentsByIds(String[] ids) { + coscoSupplierSurveyAttachmentsMapper.deleteCoscoSupplierSurveyAttachmentsByIds(ids); + return true; } /** 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 64b2e4a..d39438d 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 @@ -8,10 +8,7 @@ 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.dao.mapper.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +34,13 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { @Autowired private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper; + + @Autowired + private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + + @Autowired + private CoscoAccessSupplierMapper coscoAccessSupplierMapper; + @Override public IPage getPage(CoscoSupplierexit data) { // 创建分页对象（当前页，每页大小） @@ -156,8 +160,42 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); coscoAccessSupplierCategory.setCategoryId(category1.getCategoryId()); coscoAccessSupplierCategory.setSupplierId(category1.getSupplierId()); + coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(coscoAccessSupplierCategory); } + + CoscoSupplierexitSupplier coscoSupplierexitSupplier = new CoscoSupplierexitSupplier(); + coscoSupplierexitSupplier.setSupplierexitId(vo.getId()); + List coscoSupplierexitSuppliers = coscoSupplierexitSupplierMapper.selectCoscoSupplierexitSupplierList(coscoSupplierexitSupplier); + for(CoscoSupplierexitSupplier coscoSupplierexitSupplier1 : coscoSupplierexitSuppliers){ + //查询该供应商是否还有准入的品类数据 + CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); + Integer countNum = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory); + if(countNum == 0){//说明当前部门下没有品类了 + //查询该供应商是否还有准入的品类数据 + CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + Integer countNum2 = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory2); + if(countNum2 == 0){//别的部门也没有品类了 + //修改注册信息表状态 + CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId()); + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoSupplierBase.setUpdateBy("1"); + coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + } + //修改准入供应商表状态 + CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); + coscoAccessSupplier2.setDeptId(coscoSupplierexit.getDeptId()); + coscoAccessSupplier2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoAccessSupplierMapper.updateCoscoAccessSupplierBySupplierIdAndDeptId(coscoAccessSupplier2); + } + } return true; } 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 new file mode 100644 index 0000000..f41a7c5 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java @@ -0,0 +1,165 @@ +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.coscosupplier.dao.mapper.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoUnit; +import java.util.*; + +@Component +public class SupplierSyncTask { + + @Autowired + private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + + @Autowired + private ICoscoMessageService coscoMessageService; + + @Autowired + private CoscoAccessSupplierMapper coscoAccessSupplierMapper; + + @Autowired + private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper; + + @Autowired + private CoscoSupplierQualificationsMapper coscoSupplierQualificationsMapper; + + private static final DateTimeFormatter DATE_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + //营业执照 + // 每天凌晨1点检查（生产环境推荐） + @Scheduled(cron = "0 0 1 * * ?") + @Transactional + public void reportCurrentTimeYyzz(){ + System.out.println("开始执行供应商数据同步任务: " + System.currentTimeMillis()); + CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); + + + suppliers.forEach(supplier -> { + LocalDate expiryDate = parseDate(supplier.getLicenceDate()); + if (expiryDate == null) return; + + LocalDate today = LocalDate.now(); + long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate); + + if (daysRemaining == 30) { + sendNotificationYyzz(supplier, "30天到期提醒", supplier.getLicenceDate(),"营业执照"); + } else if (daysRemaining == 15) { + sendNotificationYyzz(supplier, "15天到期紧急提醒", supplier.getLicenceDate(),"营业执照"); + } else if (daysRemaining == 7) { + sendNotificationYyzz(supplier, "7天到期最后通牒", supplier.getLicenceDate(),"营业执照"); + } else if (daysRemaining == 0) { + sendNotificationYyzz(supplier, "营业执照已过期！", supplier.getLicenceDate(),"营业执照"); + removeSupplier(supplier); + } + }); + } + + //资质信息 + // 每天凌晨1点检查（生产环境推荐） + @Scheduled(cron = "0 0 1 * * ?") + @Transactional + public void reportCurrentTimeZzxx(){ + System.out.println("开始执行供应商数据同步任务: " + System.currentTimeMillis()); + CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); + + + suppliers.forEach(supplier -> { + CoscoSupplierQualifications coscoSupplierQualifications = new CoscoSupplierQualifications(); + coscoSupplierQualifications.setSupplierId(supplier.getId()); + List coscoSupplierQualifications1 = coscoSupplierQualificationsMapper.selectCoscoSupplierQualificationsList(coscoSupplierQualifications); + + coscoSupplierQualifications1.forEach(qualifications -> { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LocalDate expiryDate = parseDate(sdf.format(qualifications.getTermOfValidity())); + if (expiryDate == null) return; + + LocalDate today = LocalDate.now(); + long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate); + + if (daysRemaining == 30) { + sendNotificationZzxx(supplier,qualifications, "30天到期提醒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + } else if (daysRemaining == 15) { + sendNotificationZzxx(supplier,qualifications,"15天到期紧急提醒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + } else if (daysRemaining == 7) { + sendNotificationZzxx(supplier,qualifications,"7天到期最后通牒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + } else if (daysRemaining == 0) { + sendNotificationZzxx(supplier,qualifications,"营业执照已过期！", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + } + }); + + }); + } + + //添加推送数据 + private void sendNotificationYyzz(CoscoSupplierBase supplier, String title, String endTime,String type) { + //1.准入单位提示语：您的准入的XXX供应商营业执照将于XXX日到期 + //2.供应商提示语：您的企业营业执照将于XXX日到期，请及时更新 + // + //供应商营业执照过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送营业执照过期提示系统信息，分别发送准入单位及供应商 + coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商营业执照将于"+endTime+"日到期",type); + coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业营业执照将于"+endTime+"日到期，请及时更新",type); + } + + private void sendNotificationZzxx(CoscoSupplierBase supplier,CoscoSupplierQualifications qualifications ,String title, String endTime,String type) { + //1.准入单位提示语：您的准入的XXX供应商XXX资质将于XXX日到期 + //2.供应商提示语：您的企业XXX资质将于XXX日到期，请及时更新 + // + //供应商资质过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送资质过期提示系统信息，分别发送准入单位及供应商 + coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商"+qualifications.getName()+"资质将于"+endTime+"日到期",type); + coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业"+qualifications.getName()+"资质将于"+endTime+"日到期，请及时更新",type); + } + + //移除供应商所有信息 + @Transactional + public void removeSupplier(CoscoSupplierBase supplier) { + //修改注册信息表状态 + CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + coscoSupplierBase.setId(supplier.getId()); + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + + //修改准入供应商表状态 + CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); + coscoAccessSupplier2.setSupplierId(supplier.getId()); + coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoAccessSupplierMapper.updateCoscoAccessSupplierBySupplierIdAndDeptId(coscoAccessSupplier2); + + //删除已准入的品类 + CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory.setSupplierId(supplier.getId()); + coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(coscoAccessSupplierCategory); + + + } + // 安全转换字符串到LocalDate + public static LocalDate parseDate(String dateStr) { + if (dateStr == null || dateStr.isEmpty()) { + return null; + } + try { + return LocalDate.parse(dateStr, DATE_FORMATTER); + } catch (DateTimeParseException e) { + // 日志记录异常，返回null或默认值 + System.err.println("日期格式错误: " + dateStr); + return null; + } + } +} \ No newline at end of file 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 0550e78..c742a59 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 @@ -78,6 +78,16 @@ + + + + + + + and receiver_id = #{receiverId} + + + and content = #{content} + + + and read = #{read} + + + and type = #{type} + + + + + + + + insert into cosco_message + + id, + receiver_id, + content, + read, + type, + create_time, + update_time, + + + #{id}, + #{receiverId}, + #{content}, + #{read}, + #{type}, + #{createTime}, + #{updateTime}, + + + + insert into cosco_message + ( id, receiver_id, content, read, type, create_time, update_time) + values + + ( #{item.id}, #{item.receiverId}, #{item.content}, #{item.read}, #{item.type}, #{item.createTime}, #{item.updateTime}) + + + + update cosco_message + + receiver_id = + #{receiverId}, + + content = + #{content}, + + read = + #{read}, + + type = + #{type}, + + create_time = + #{createTime}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + update cosco_message set del_flag = 2 + where id = #{id} + + + + update cosco_message set del_flag = 2 where id in + + #{id} + + + 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 2b21f1c..3e8b4f0 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 @@ -196,7 +196,7 @@ - update cosco_supplier_bank set del_flag = 2 where id in + update cosco_supplier_bank set del_flag = 'deleted' where id in #{id} 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 aba3995..71a154c 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 @@ -243,7 +243,7 @@ and del_flag = 'normal' - + and dept_id = #{vo.deptId} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml index d67928a..36075a3 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml @@ -21,27 +21,73 @@ + + + - select id, supplier_id, change_by, change_time, approve_status, - CASE - WHEN approve_status = 0 THEN '审批中' - WHEN approve_status = 1 THEN '通过' - WHEN approve_status = 2 THEN '驳回' - ELSE CAST(approve_status AS CHAR) - END AS approve_status_text, - work_flow_id, del_flag, create_by, create_time, update_by, update_time, last_update_time - from cosco_supplier_change_apply + SELECT + c.id, + c.supplier_id, + sb.`name` AS supplierName, + CASE + WHEN sb.supplier_type = 'dvs' THEN + '境内企业' + WHEN sb.supplier_type = 'ovs' THEN + '境外企业' + WHEN sb.supplier_type = 'pe' THEN + '个人' + END AS supplier_type, + c.change_by, + c.change_time, + c.approve_status, + CASE + WHEN c.approve_status = 0 THEN + '审批中' + WHEN c.approve_status = 1 THEN + '通过' + WHEN c.approve_status = 2 THEN + '驳回' ELSE CAST( c.approve_status AS CHAR ) + END AS approve_status_text, + c.work_flow_id, + c.del_flag, + c.create_time, + + c.last_update_time, + c.title, + c.change_desc , + wo.maxTime as update_time, + wo.deptNames + + FROM + cosco_supplier_change_apply c + LEFT JOIN cosco_supplier_base sb ON c.supplier_id = sb.id + left join ( + SELECT + cas.supplier_id, + MAX(w.update_time) AS maxTime, + GROUP_CONCAT(DISTINCT w.dept_id SEPARATOR ',') AS deptNames + FROM + cosco_access_work w + LEFT JOIN + cosco_access_supplier cas ON w.id = cas.access_work_id + WHERE + w.apply_type = 0 + GROUP BY + cas.supplier_id + ) wo on wo.supplier_id = sb.id @@ -121,15 +176,15 @@ @@ -149,6 +204,8 @@ update_by, update_time, last_update_time, + title, + change_desc, #{id}, @@ -163,6 +220,8 @@ #{updateBy}, #{updateTime}, #{lastUpdateTime}, + #{title}, + #{changeDesc}, @@ -209,12 +268,18 @@ last_update_time = #{lastUpdateTime}, + title = + #{title}, + + change_desc = + #{changeDesc}, + where id = #{id} - update cosco_supplier_change_apply set del_flag = 2 + update cosco_supplier_change_apply set del_flag = 'deleted' where id = #{id} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeHistoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeHistoryMapper.xml new file mode 100644 index 0000000..fbbc4b6 --- /dev/null +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeHistoryMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + select id, supplier_change_apply_id, table_name, field_name, field_annotation, old_value, new_value, del_flag, create_by, create_time, update_by, update_time, last_update_time + from cosco_supplier_change_history + + + + + + + + insert into cosco_supplier_change_history + + id, + supplier_change_apply_id, + table_name, + field_name, + field_annotation, + old_value, + new_value, + del_flag, + create_by, + create_time, + update_by, + update_time, + last_update_time, + + + #{id}, + #{supplierChangeApplyId}, + #{tableName}, + #{fieldName}, + #{fieldAnnotation}, + #{oldValue}, + #{newValue}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{lastUpdateTime}, + + + + insert into cosco_supplier_change_history + ( id, supplier_change_apply_id, table_name, field_name, field_annotation, old_value, new_value, create_by, create_time, update_by, update_time, last_update_time) + values + + ( #{item.id}, #{item.supplierChangeApplyId}, #{item.tableName}, #{item.fieldName}, #{item.fieldAnnotation}, #{item.oldValue}, #{item.newValue}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) + + + + update cosco_supplier_change_history + + supplier_change_apply_id = + #{supplierChangeApplyId}, + + table_name = + #{tableName}, + + field_name = + #{fieldName}, + + field_annotation = + #{fieldAnnotation}, + + old_value = + #{oldValue}, + + new_value = + #{newValue}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + last_update_time = + #{lastUpdateTime}, + + + where id = #{id} + + + + update cosco_supplier_change_history set del_flag = 2 + where id = #{id} + + + + update cosco_supplier_change_history set del_flag = 2 where id in + + #{id} + + + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml index dad332c..fc160a8 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierInvoiceMapper.xml @@ -28,6 +28,44 @@ from cosco_supplier_invoice + + + + + + + and supplier_id = #{vo.supplierId} + + + and certificate_type = #{vo.certificateType} + + + and name like concat('%', #{vo.name}, '%') + + + and code = #{vo.code} + + + and type_level = #{vo.typeLevel} + + + and authority = #{vo.authority} + + + and date_time = #{vo.dateTime} + + + and term_of_validity = #{vo.termOfValidity} + + + and accessory = #{vo.accessory} + + + and last_update_time = #{vo.lastUpdateTime} + + + order by create_time desc + + + + + + + and supplier_id = #{vo.supplierId} + + + and attachments_type = #{vo.attachmentsType} + + + and file_name like concat('%', #{vo.fileName}, '%') + + + and file_type = #{vo.fileType} + + + and file_size = #{vo.fileSize} + + + and file_path = #{vo.filePath} + + + and file_url = #{vo.fileUrl} + + + and last_update_time = #{vo.lastUpdateTime} + + + order by create_time desc + + + supplierexit_id = #{supplierexitId}