From b09efb3ec71f665f0adf9af2b21a4426d154832c Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Fri, 27 Jun 2025 09:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/supplier/common/CoscoBaseEntity.java | 1 + .../controller/CoscoMessageController.java | 52 ++++++ .../CoscoSupplierBaseController.java | 76 ++++++++- .../CoscoSupplierexitController.java | 14 +- .../controller/TycAndFxController.java | 76 +++++++++ .../dao/mapper/CoscoMessageMapper.java | 7 +- .../dao/mapper/CoscoSupplierBaseMapper.java | 5 + .../entity/CoscoAccessWorkVo.java | 4 + .../coscosupplier/entity/CoscoMessage.java | 3 + .../entity/CoscoSupplierBase.java | 50 +++++- .../entity/CoscoSupplierexitVo.java | 4 + .../service/ICoscoMessageService.java | 13 +- .../service/ICoscoSupplierBaseService.java | 13 ++ .../service/ICoscoSupplierexitService.java | 2 +- .../CoscoAccessWorkCategoryServiceImpl.java | 23 +-- .../impl/CoscoAccessWorkServiceImpl.java | 20 +-- .../service/impl/CoscoMessageServiceImpl.java | 21 +-- .../impl/CoscoSupplierBaseServiceImpl.java | 82 ++++----- .../impl/CoscoSupplierexitServiceImpl.java | 15 +- .../coscosupplier/task/SupplierSyncTask.java | 1 + .../coscosupplier/vo/SupplierPageVo.java | 4 + .../base/dao/mapper/CoscoAccessWorkMapper.xml | 11 ++ .../base/dao/mapper/CoscoMessageMapper.xml | 42 +++-- .../dao/mapper/CoscoSupplierBaseMapper.xml | 157 ++++++++++++++++++ .../dao/mapper/CoscoSupplierexitMapper.xml | 2 + 25 files changed, 583 insertions(+), 115 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java index 2f94df9..af67625 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.common; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java new file mode 100644 index 0000000..d01eb85 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java @@ -0,0 +1,52 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + + +/** + * 供应商业务处理消息推送Controller + * + * @author ruoyi + * @date 2025-06-23 + */ +@RestController +@RequestMapping("/supplierMessage") +public class CoscoMessageController extends BaseController { + @Autowired + private ICoscoMessageService coscoMessageService; + + /** + * 查询供应商业务处理消息推送列表 + */ + @ApiOperation("查询分页数据") + @PostMapping("/page") + public BaseResponse> page(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoMessage coscoMessage) { + return BaseResponse.success(coscoMessageService.getPage(coscoMessage)); + } + + @ApiOperation("修改数据") + @PostMapping("/update") + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoMessage coscoMessage){ + return BaseResponse.success(coscoMessageService.updateCoscoMessage(coscoMessage)); + } + +} 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 9e63414..e1abf2e 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 @@ -2,17 +2,19 @@ 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 java.net.URLEncoder; +import java.util.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; @@ -105,7 +107,7 @@ public class CoscoSupplierBaseController extends BaseController { @PostMapping("/getPageMy") public BaseResponse> getPageMy(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { coscoSupplierBase.setCreateBy("1"); - return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); + return BaseResponse.success(coscoSupplierBaseService.getMySupplierBasePage(coscoSupplierBase)); } @@ -119,10 +121,74 @@ public class CoscoSupplierBaseController extends BaseController { public BaseResponse> getPageQualified(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W); - coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W); + //coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W);//灰名单字段暂时不用 return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); } + + + /** + * 导出合格供应商列表查询分页数据 + * @return + */ + + @GetMapping("/getPageMyExport") + public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception { + coscoSupplierBase.setCreateBy("1"); + List list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase); + + // 动态设置导出字段（忽略未标注字段） + Set includeFields = new HashSet<>(Arrays.asList( + "name","supplierTypeCn", "enterpriseType","categoryName","updateTime" // 指定要导出的字段名 + )); + + String fileName = URLEncoder.encode("我的供应商.xlsx", "UTF-8"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setCharacterEncoding("utf-8"); + + EasyExcel.write(response.getOutputStream()) + .includeColumnFieldNames(includeFields) + .head(CoscoSupplierBase.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽 + .sheet("我的供应商") + .doWrite(list); + } + + + /** + * 导出合格供应商列表查询分页数据 + * @return + */ + + @GetMapping("/getPageQualifiedExport") + public void getPageQualifiedExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception { + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W); + List list = coscoSupplierBaseService.selectCoscoSupplierBaseList(coscoSupplierBase); + + // 动态设置导出字段（忽略未标注字段） + Set includeFields = new HashSet<>(Arrays.asList( + "name", "socialCreditCode","supplierTypeCn", "enterpriseType","createTime" // 指定要导出的字段名 + )); + + String fileName = URLEncoder.encode("合格供应商.xlsx", "UTF-8"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setCharacterEncoding("utf-8"); + + EasyExcel.write(response.getOutputStream()) + .includeColumnFieldNames(includeFields) + .head(CoscoSupplierBase.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽 + .sheet("合格供应商") + .doWrite(list); + } + + + + + @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java index 3de7d08..bbeae10 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -59,7 +59,7 @@ public class CoscoSupplierexitController extends BaseController { /** - * 供应商退出任务详情查询 + * 供应商退出任务详情查询(只查询退出品类分页) * @return 返回结果 */ @ApiOperation("查询分页数据") @@ -69,4 +69,16 @@ public class CoscoSupplierexitController extends BaseController { } + + /** + * 供应商退出任务详情查询，以及品类信息 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @GetMapping("/{id}") + public BaseResponse getExitInfoPage(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierexitService.selectCoscoSupplierexitById(id)); + } + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java new file mode 100644 index 0000000..08ac89a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java @@ -0,0 +1,76 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.rm.client.RmFeignClient; +import com.chinaunicom.mall.ebtp.common.rm.entity.RmBaseResponse; +import com.chinaunicom.mall.ebtp.common.tyc.client.TycFeignClient; +import com.chinaunicom.mall.ebtp.common.tyc.entity.TianyanchaNormal; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/tycAndFxSupplierBase") +public class TycAndFxController { + + @Autowired + private TycFeignClient tycFeignClient; + + @Autowired + private RmFeignClient rmFeignClient; + + + @Autowired + private ICoscoSupplierBaseService coscoSupplierBaseService; + + + /** + * 企业基本信息 查询 + * 当前接口是直接查询数据库中企业基本信息 + * 前端可以根据实体是否存在，来判断是否调用更新接口 + * 当前代码中直接调用更新接口的方法没有开启，因为api次数较为珍贵，如果前端调用后是空的，让客户手动决定是否获取天眼查数据 + * @return 企业基本信息 + */ + @GetMapping("/query") + public BaseResponse query(@RequestParam("supplierId") String supplierId){ + CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseService.selectSocialCreditCodeById(supplierId); + return tycFeignClient.query(coscoSupplierBase.getSocialCreditCode()); + } + + /** + * 企业基本信息 更新后 查询 + * ... + * @return 企业基本信息 + */ + @ApiOperation("天眼查企业基本信息*更新*后查询接口") + @GetMapping("/queryAndUpdate") + public BaseResponse queryAndUpdate(@RequestParam("supplierId") String supplierId){ + CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseService.selectSocialCreditCodeById(supplierId); + return tycFeignClient.queryAndUpdate(coscoSupplierBase.getSocialCreditCode()); + } + + /** + * 精确查询-核心风险信息 + * 返回： + { + "code":200, + "message":"success", + "success":true, + "data":[{"hit":"Shield AI,Inc.","hitlight":"Shield AI,Inc.","similar":100,"hittype":"Also Known As","activestatus":"Active","d1":"Special Interest Entity (SIE)","d2":["Sanctions Lists","Other Official Lists"],"d3":[],"countries":["United States"],"docid":"13467649","systemdate":"2025-05-16 12:10:12.703","details":{"date":"15-May-2025","descriptions":{"description":[{"description1":"Special Interest Entity (SIE)","description2":"Sanctions Lists","description3":""},{"description1":"Special Interest Entity (SIE)","description2":"Other Official Lists","description3":""}]},"nameDetails":{"Primary Name":["Shield AI, Inc.","护盾人工智能公司","護盾人工智能公司"],"Also Known As":["Shield AI,Inc."]},"sanctionsReferences":{"Sanctions Lists":[{"date":"05-Dec-2024 to ","value":"4755 Ministry of Foreign Affairs (China) - Countering Foreign Sanctions"}],"Other Official Lists":[{"date":"10-Apr-2025 to ","value":"5355 MOFCOM (China) Unreliable Entity List"},{"date":"04-Mar-2025 to ","value":"5983 MOFCOM (China) Export Control List"}]},"companyDetails":[],"vesselDetails":[],"countryDetails":{"Country of Affiliation":["United States"]},"profileNotes":"MOFCOM (CHINA) UNRELIABLE ENTITY LIST:\n\n来源：商务部新闻办公室 类型：原创 分类：新闻 2025-05-14 22:00\n \n商务部新闻发言人就暂停17家美国实体不可靠实体清单措施答记者问\n\n有记者问：中美日内瓦经贸会谈联合声明中提到中方将暂停或取消自2025年4月2日起针对美国的非关税反制措施，请问在不可靠实体清单方面有什么考虑？\n\n答： 根据《中华人民共和国反外国制裁法》《不可靠实体清单规定》及有关规定，不可靠实体清单工作机制于2025年4月4日和9日，将17家美国实体列入不可靠实体清单，禁止上述企业从事与中国有关的进出口活动，以及在中国境内新增投资。为落实中美经贸高层会谈共识，自2025年5月14日起，暂停4月4日公告（不可靠实体清单工作机制〔2025〕7号）相关措施90天，暂停4月9日公告（不可靠实体清单工作机制〔2025〕8号）相关措施。根据《不可靠实体清单规定》相关规定，国内企业可申请与上述实体进行交易，不可靠实体清单工作机制将依法进行审核，对符合条件的申请予以批准。\n\n不可靠实体清单工作机制关于将护盾人工智能公司等6家美国企业列入不可靠实体清单的公告\n【发布单位】安全与管制局\n【发布文号】不可靠实体清单工作机制〔2025〕8号\n【发文日期】2025年04月09日\n\n不可靠实体清单工作机制\n\n公 告\n\n2025年 第8号\n\n 为维护国家主权、安全和发展利益，根据《中华人民共和国对外贸易法》《中华人民共和国国家安全法》《中华人民共和国反外国制裁法》等有关法律，不可靠实体清单工作机制依据《不可靠实体清单规定》第二条、第八条和第十条等有关规定，决定将护盾人工智能公司（Shield AI,Inc.）、内华达山脉公司（Sierra Nevada Corporation）、赛博勒克斯公司（Cyberlux Corporation）、边缘自治运营公司（Edge Autonomy Operations LLC）、Group W公司（Group W）和哈德森技术公司（Hudson Technologies Co.）等6家实体列入不可靠实体清单，并采取以下处理措施：\n\n一、禁止上述企业从事与中国有关的进出口活动；\n\n二、禁止上述企业在中国境内新增投资。\n\n本公告未尽事宜，按《不可靠实体清单规定》执行。\n\n本公告自2025年4月10日12时01分起实施。\n\nMOFCOM (CHINA) EXPORT CONTROL LIST NOTES:\n\n商务部公告2025年第13号 公布将15家美国实体列入出口管制管控名单\n【发布单位】安全与管制局\n【发布文号】商务部公告2025年第13号\n【发文日期】2025年03月04日\n\n根据《中华人民共和国出口管制法》和《中华人民共和国两用物项出口管制条例》等法律法规有关规定，为维护国家安全和利益，履行防扩散等国际义务，决定将莱多斯公司等15家美国实体列入出口管制管控名单（见附件），并采取以下措施：\n\n一、禁止向上述15家美国实体出口两用物项；正在开展的相关出口活动应当立即停止。\n\n二、特殊情况下确需出口的，出口经营者应当向商务部提出申请。\n\n本公告自公布之日起正式实施。\n\n附件：出口管制管控名单（2025年3月4日）\n\n商务部 \n\n2025年3月4日\n\n附件\n\n出口管制管控名单\n\n （2025年3月4日）\n\n1. 莱多斯公司（Leidos）\n\n2. 吉布斯和考克斯公司（Gibbs&Cox, Inc.）\n\n3. 监控研究公司（IP Video Market Info, Inc.）\n\n4. SourceMap公司（Sourcemap, Inc.）\n\n5. 斯凯迪奥公司（Skydio, Inc.）\n\n6. 急速飞行公司（Rapid Flight LLC）\n\n7. 红色六方案公司（Red Six Solutions）\n\n8. 护盾人工智能公司（Shield AI, Inc.）\n\n9. 浩劫人工智能公司（HavocAI）\n\n10. 尼罗斯科技公司（Neros Technologies）\n\n11. Group W公司（Group W）\n\n12. 爱尔康公司（Aerkomm Inc.）\n\n13. 通用原子航空系统公司（General Atomics Aeronautical Systems, Inc.）\n\n14. 通用动力陆地系统公司（General Dynamics Land Systems）\n\n15. 宇航环境公司（Aero Vironment）\n\nCHINA MINISTRY OF FOREIGN AFFAIRS NOTES:\n\n关于对美国军工企业及高级管理人员采取反制措施的决定\n2024-12-05 15:00\n\n（2024年12月5日中华人民共和国外交部令第14号公布，自2024年12月5日起施行）\n\n美国近日再次宣布向中国台湾地区出售武器，严重违反一个中国原则和中美三个联合公报，严重干涉中国内政，严重损害中国主权和领土完整。依据《中华人民共和国反外国制裁法》第三条、第四条、第五条、第六条、第九条、第十五条规定，中方决定对以下美国军工企业及高级管理人员采取反制措施：\n\n一、对特励达·布朗工程公司、BRINC无人机公司、急速飞行公司、红色六方案公司、护盾人工智能公司、赛尼克斯公司、火风暴实验室公司、奎托斯无人机系统公司、浩劫人工智能公司、尼罗斯科技公司、赛博勒克斯公司、多莫战术通信公司、Group W公司等13家后附《反制清单》列明的企业，冻结在我国境内的动产、不动产和其他各类财产；禁止我国境内的组织、个人与其进行有关交易、合作等活动。\n\n二、对芭芭拉·博尔戈诺维（雷神公司海军力量战略业务部总裁）、杰拉德·许贝尔（雷神公司海军力量战略业务部副总裁）、查尔斯·伍德伯恩（贝宜陆上和武器系统公司首席执行官）、理查德·克劳福德（联合技术系统运营公司创始人、首席执行官）、贝丝·艾德勒（数据链路解决方案公司总裁）、布莱克·雷斯尼克（BRINC无人机公司创始人、首席执行官）等6名后附《反制清单》列明的企业高级管理人员，冻结在我国境内的动产、不动产和其他各类财产；禁止我国境内的组织、个人与其本人进行有关交易、合作等活动；对其本人不予签发签证、不准入境（包括香港、澳门）。\n\n本决定自2024年12月5日起施行。\n\n附件：反制清单\n\n外交部　　\n\n2024年12月5日\n\n附件\n\n反制清单\n\n　　一、企业\n\n　　（一）特励达·布朗工程公司（Teledyne Brown Engineering, Inc.）\n\n　　（二）BRINC无人机公司（BRINC Drones, Inc.）\n\n　　（三）急速飞行公司（Rapid Flight LLC）\n\n　　（四）红色六方案公司（Red Six Solutions）\n\n　　（五）护盾人工智能公司（Shield AI, Inc.）\n\n　　（六）赛尼克斯公司（SYNEXXUS, Inc.）\n\n　　（七）火风暴实验室公司（Firestorm Labs, Inc.）\n\n　　（八）奎托斯无人机系统公司（Kratos Unmanned Aerial Systems, Inc.）\n\n　　（九）浩劫人工智能公司（HavocAI）\n\n　　（十）尼罗斯科技公司（Neros Technologies）\n\n　　（十一）赛博勒克斯公司（Cyberlux Corporation）\n\n　　（十二）多莫战术通信公司（Domo Tactical Communications)\n\n　　（十三）Group W公司（Group W）\n\n　　二、高级管理人员\n\n　　（一）芭芭拉·博尔戈诺维（Barbara Borgonovi），女，雷神公司海军力量战略业务部总裁\n\n　　（二）杰拉德·许贝尔（Gerard Hueber），男，雷神公司海军力量战略业务部副总裁\n\n　　（三）查尔斯·伍德伯恩（Charles Woodburn），男，贝宜陆上和武器系统公司首席执行官\n\n　　（四）理查德·克劳福德（Richard D. Crawford），男，联合技术系统运营公司创始人、首席执行官\n\n　　（五）贝丝·艾德勒（Beth Edler），女，数据链路解决方案公司总裁\n\n　　（六）布莱克·雷斯尼克（Blake Resnick），男，BRINC无人机公司创始人、首席执行官","sourceDescription":["https://www.mfa.gov.cn/web/wjb_673085/zfxxgk_674865/gknrlb/fzcqdcs/202412/t20241205_11538936.shtml","https://www.fmprc.gov.cn/eng/xw/fyrbt/","https://www.mfa.gov.cn/web/wjb_673085/zfxxgk_674865/gknrlb/fzcqdcs/","https://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/art/2025/art_23aa2fcf1fca4e4c9edb6bec193acfe0.html","https://www.gov.cn/zhengce/content/202410/content_6981399.htm","http://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/index.html","http://www.mofcom.gov.cn/article/b/fwzl/202009/20200903002593.shtml","http://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/art/2025/art_81fd0e00d5aa4be39db90f2c183c809a.html","https://www.mofcom.gov.cn/xwfb/xwfyrth/art/2025/art_53ec1f591dba49a39b65fd89b6d73e6f.html"],"associate":[]}},{"hit":"Shield AI, Inc","hitlight":"Shield AI, Inc","similar":100,"hittype":"Primary Name","activestatus":"Active","d1":"法务与风险机构 Legal and Risk Entity","d2":["中远海运集团法务与风险机构 Legal and Risk Entity"],"d3":["禁止交易及交往 Prohibited transactions and interactions"],"countries":[null],"docid":"C00361","systemdate":"2025-05-20 15:04:01.751","details":{"date":"23-Apr-2025","descriptions":{"description":[{"description1":"法务与风险机构 Legal and Risk Entity","description2":"中远海运集团法务与风险机构 Legal and Risk Entity","description3":"禁止交易及交往 Prohibited transactions and interactions"}]},"nameDetails":{"Primary Name":["Shield AI, Inc"]},"idNumberTypes":{"":["唯一实体标识（UEI):DVEJNK717BB6,商业和政府实体代码（CAGE）7GVZ9"]},"companyDetails":[{"companyDetails":"注册地址：美国加利福尼亚州圣地亚哥百老汇大道，华盛顿特区办事处地址：2450 Crystal Dr, Ste. 200,Arlington, Virginia,22202。德克萨斯州达拉斯办事处地址：16240 Gateway Path,Ste 100,TX 75033 美国"}],"countryDetails":{"Country of Registration":[null]},"profileNotes":"","sourceDescription":[""],"associate":[]}}] + } + * @return List 风险信息列表 + */ + @GetMapping("/queryRiskInfo") + BaseResponse> queryRiskInfo(@RequestParam("supplierName") String supplierName){ + return rmFeignClient.queryRiskInfo(supplierName); + } + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java index 10a51ac..8f5e9be 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java @@ -1,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.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -22,10 +25,10 @@ public interface CoscoMessageMapper { /** * 查询供应商业务处理消息推送列表 * - * @param coscoMessage 供应商业务处理消息推送 * @return 供应商业务处理消息推送集合 */ - public List selectCoscoMessageList(CoscoMessage coscoMessage); + IPage selectCoscoMessageList(IPage page, @Param("vo") CoscoMessage vo); + /** * 新增供应商业务处理消息推送 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java index 75c6e02..ed29d21 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java @@ -35,6 +35,11 @@ public interface CoscoSupplierBaseMapper { IPage selectPageList(IPage page, @Param("vo") CoscoSupplierBase vo); + //我准入的供应商 + IPage getMySupplierBasePage(IPage page, @Param("vo") CoscoSupplierBase vo); + + List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase); + /** * 新增中远海运_供应商_基本信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java index d9dc9c6..568bd5e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java @@ -15,9 +15,13 @@ public class CoscoAccessWorkVo { private CoscoAccessWork coscoAccessWork; //准入申请关联品类id集合 + @NotNull(message = "准入品类不能为空") + @Valid private List categoryIds; //准入申请供应商id集合 + @NotNull(message = "准入供应商不能为空") + @Valid private List supplierIds; //评审人员 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 index 592d9c9..5853a88 100644 --- 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 @@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 供应商业务处理消息推送对象 cosco_message * @@ -18,6 +20,7 @@ public class CoscoMessage extends CoscoBaseEntity { /** 接收人ID */ //@Excel(name = "接收人ID") + @NotBlank(message = "接收人id不能为空") private String receiverId; /** 内容 */ 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 4c44e9b..0dba31e 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,9 +2,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -16,7 +19,7 @@ import javax.validation.constraints.NotBlank; * @date 2025-06-16 */ @Data -public class CoscoSupplierBase extends CoscoBaseEntity { +public class CoscoSupplierBase { private static final long serialVersionUID = 1L; /** 主键ID */ @@ -43,11 +46,13 @@ public class CoscoSupplierBase extends CoscoBaseEntity { /** 企业类型(数据字典code) */ @TableField("企业类型") + @ExcelProperty("企业类型") private String enterpriseType; /** 企业名称 */ @NotBlank(message = "企业名称不能为空") @TableField("企业名称") + @ExcelProperty("供应商名称") private String name; /** 企业英文名称 */ @@ -56,6 +61,7 @@ public class CoscoSupplierBase extends CoscoBaseEntity { /** 统一社会信用代码 */ @TableField("统一社会信用代码") + @ExcelProperty("统一社会信用代码") private String socialCreditCode; /** 经营范围 */ @@ -172,8 +178,50 @@ public class CoscoSupplierBase extends CoscoBaseEntity { private Date lastUpdateTime; @TableField("供应商身份类型中文") + @ExcelProperty("境内/境外") private String supplierTypeCn; @TableField("准入状态中文") private String accessStatusCn; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + @ExcelProperty("注册时间") + private Date createTime; + + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改时间") + @ExcelProperty("准入时间") + private Date updateTime; + + + + @ApiModelProperty("当前页") + private Integer pageNo; + @ApiModelProperty("每页显示条数") + private Integer pageSize; + + /** 搜索值 */ + @JsonIgnore + @ApiModelProperty(value = "搜索值") + private String searchValue; + + /** 创建者 */ + @ApiModelProperty(value = "创建人") + private String createBy; + + /** 更新者 */ + @ApiModelProperty(value = "修改人") + private String updateBy; + + + //搜索条件品类 + private String categoryId; + + @ExcelProperty("品类名称") + private String categoryName; + } \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java index 93bb5c8..9ac2f4d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java @@ -16,9 +16,13 @@ public class CoscoSupplierexitVo { public CoscoSupplierexit coscoSupplierexit; //供应商id集合 + @NotNull(message = "供应商id集合不能为空") + @Valid // 关键注解：启用嵌套验证 public List supplierIdList; //退出任务供应商关联品类表 + @NotNull(message = "供应商关联品类集合不能空") + @Valid // 关键注解：启用嵌套验证 public List coscoSupplierexitSupplierCategoryList; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java index d6ed0b0..0625553 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java @@ -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.CoscoAccessUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; @@ -13,6 +15,10 @@ import java.util.List; * @date 2025-06-23 */ public interface ICoscoMessageService { + + + IPage getPage(CoscoMessage data); + /** * 查询供应商业务处理消息推送 * @@ -21,13 +27,6 @@ public interface ICoscoMessageService { */ public CoscoMessage selectCoscoMessageById(String id); - /** - * 查询供应商业务处理消息推送列表 - * - * @param coscoMessage 供应商业务处理消息推送 - * @return 供应商业务处理消息推送集合 - */ - public List selectCoscoMessageList(CoscoMessage coscoMessage); public int insertCoscoMessage(CoscoMessage coscoMessage); 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 655b06f..4d3dcdb 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 @@ -17,8 +17,12 @@ public interface ICoscoSupplierBaseService { IPage getPage(CoscoSupplierBase coscoSupplierBase); + IPage getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase); + + IPage getZrCategoryPage(CoscoAccessSupplierCategory coscoSupplierBase); + public List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase); /** @@ -29,6 +33,15 @@ public interface ICoscoSupplierBaseService { */ public CoscoSupplierVo selectCoscoSupplierBaseById(String id); + /** + * 查询中远海运_供应商_基本信息 + * + * @param id 中远海运_供应商_基本信息主键 + * @return 中远海运_供应商_基本信息 + */ + public CoscoSupplierBase selectSocialCreditCodeById(String id); + + /** * 查询中远海运_供应商_基本信息列表 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java index 2af70c1..0648988 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java @@ -28,7 +28,7 @@ public interface ICoscoSupplierexitService { * @param id 供应商退出_供应商退出任务主键 * @return 供应商退出_供应商退出任务 */ - public CoscoSupplierexit selectCoscoSupplierexitById(String id); + public CoscoSupplierexitVo selectCoscoSupplierexitById(String id); /** * 查询供应商退出_供应商退出任务列表 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 5f95545..460e289 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -17,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWo import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.Date; @@ -177,7 +178,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); - if(coscoAccessWorkData == null){ + if (!ObjectUtils.isEmpty(coscoAccessWorkData)) { throw new IllegalArgumentException("任务信息不能为空"); } @@ -212,7 +213,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(vo.getId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); - List coscoAccessCategoryListAop = new ArrayList<>(); for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ //验证该品类是否已经准入过了 CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); @@ -226,14 +226,13 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierCategory.setAccessWorkId(vo.getId()); coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); - coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setUpdateBy("1"); + coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy()); + coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } - coscoAccessCategoryListAop.add(coscoAccessCategory1); } - coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); + coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList); supplierIdList.add(coscoAccessSupplier1); } @@ -243,17 +242,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(vo.getId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); - List coscoAccessCategoryListAop = new ArrayList<>(); - for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ - //验证该品类是否已经准入过了 - CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId()); - coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId()); - coscoAccessSupplierCategory2.setDeptId(coscoAccessWorkData.getDeptId()); - Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2); - coscoAccessCategoryListAop.add(coscoAccessCategory1); - } - coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); + coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList); supplierIdList.add(coscoAccessSupplier1); } } 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 ffc1170..ee5722b 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 @@ -18,6 +18,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * 供应商准入_准入申请工作主Service业务层处理 @@ -309,10 +311,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { if(CoscoType.ACCESS_TYPE_ONLINE.equals(coscoAccessWork.getAccessType())){ String zuZhangId = "";//组长id //评审人员集合 - List coscoAccessUserls = vo.getCoscoAccessUserls(); - if(coscoAccessUserls.size() > 0){ + List coscoAccessUserls = vo.getCoscoAccessUserls(); + if (!CollectionUtils.isEmpty(coscoAccessUserls)) { for(CoscoAccessUser user: coscoAccessUserls){ - //判断是否是组长 if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){ zuZhangId = user.getUserId(); @@ -324,7 +325,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { } //评审项集合 - if(vo.getCoscoAccessItems().size() > 0){ + if (!CollectionUtils.isEmpty(vo.getCoscoAccessItems())) { //首先循环所有供应商 for(String sId : vo.getSupplierIds()){ @@ -394,12 +395,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //String userId = "USER001"; Date date = CoscoDateUtils.getNowDate(); String userId =vo.getUserId(); - if(vo.getCoscoAccessUserItemList() != null){ + if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) { for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){ //修改评审项关联评审人员表 coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem); - - if(coscoAccessUserItem.getCoscoAccessTtemAttachments() != null){ + if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) { //插入附件表 CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments(); coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId()); @@ -537,7 +537,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); - if(coscoAccessWorkData == null){ + if (!ObjectUtils.isEmpty(coscoAccessWorkData)) { throw new IllegalArgumentException("任务信息不能为空"); } @@ -580,8 +580,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); - coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setUpdateBy("1"); + coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy()); + coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy()); coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java index f286f16..aaa8871 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java @@ -2,12 +2,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; @@ -25,6 +29,12 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { @Autowired private CoscoMessageMapper coscoMessageMapper; + @Override + public IPage getPage(CoscoMessage data) { + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + return coscoMessageMapper.selectCoscoMessageList(page, data); + } + /** * 查询供应商业务处理消息推送 * @@ -36,16 +46,6 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { return coscoMessageMapper.selectCoscoMessageById(id); } - /** - * 查询供应商业务处理消息推送列表 - * - * @param coscoMessage 供应商业务处理消息推送 - * @return 供应商业务处理消息推送 - */ - @Override - public List selectCoscoMessageList(CoscoMessage coscoMessage) { - return coscoMessageMapper.selectCoscoMessageList(coscoMessage); - } /** * 消息保存接口 @@ -78,6 +78,7 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { @Override public int updateCoscoMessage(CoscoMessage coscoMessage) { coscoMessage.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoMessage.setRead(1l);//已读 return coscoMessageMapper.updateCoscoMessage(coscoMessage); } 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 d2fe237..08667f4 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 @@ -8,7 +8,6 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,6 +25,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * 中远海运_供应商_基本信息Service业务层处理 @@ -58,17 +59,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { private ICoscoSupplierBankService coscoSupplierBankService; - @Autowired - private CoscoSupplierSurveyMapper coscoSupplierSurveyMapper; @Autowired private ICoscoSupplierSurveyService coscoSupplierSurveyService; - - @Autowired - private CoscoSupplierSurveyQuestionReplyMapper coscoSupplierSurveyQuestionReplyMapper; - @Autowired private ICoscoSupplierSurveyQuestionReplyService coscoSupplierSurveyQuestionReplyService; @@ -88,15 +83,6 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { @Autowired private CoscoSupplierChangeBaseMapper coscoSupplierChangeBaseMapper; - @Autowired - private CoscoSupplierChangeQualificationsMapper coscoSupplierChangeQualificationsMapper; - - @Autowired - private CoscoSupplierChangeInvoiceMapper coscoSupplierChangeInvoiceMapper; - - @Autowired - private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper; - //变更 @Autowired private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper; @@ -111,6 +97,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase); } + @Override + public IPage getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); + return coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase); + } + @Override public IPage getZrCategoryPage(CoscoAccessSupplierCategory coscoAccessSupplierCategory) { // 创建分页对象（当前页，每页大小） @@ -118,6 +111,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return coscoAccessSupplierCategoryMapper.selectPageList(page, coscoAccessSupplierCategory); } + @Override + public List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase) { + return coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); + } + /** * 查询中远海运_供应商_基本信息 * @@ -153,6 +151,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return vo; } + @Override + public CoscoSupplierBase selectSocialCreditCodeById(String id) { + return coscoSupplierBaseMapper.selectCoscoSupplierBaseById(id); + } + /** * 查询中远海运_供应商_基本信息列表 * @@ -175,8 +178,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { String supplierId = CoscoIdUtil.getId();//企业id Date date = new Date(); //基本信息新增 - CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); - if(coscoSupplierBase != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierBase())) { + CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); coscoSupplierBase.setId(supplierId); coscoSupplierBase.setCreateBy("1"); coscoSupplierBase.setCreateTime(date); @@ -194,8 +197,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { } } //发票信息 - CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice(); - if(coscoSupplierInvoice != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierInvoice())) { + CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice(); coscoSupplierInvoice.setSupplierId(supplierId); coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice); } @@ -206,12 +209,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank); } } - //填写人信息 - CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey(); - if(coscoSupplierSurvey != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierSurvey())) { + //填写人信息 + CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey(); coscoSupplierSurvey.setSupplierId(supplierId); coscoSupplierSurveyService.insertCoscoSupplierSurvey(coscoSupplierSurvey); } + //问题回复 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) { for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){ @@ -241,7 +245,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { String appid = vo.getId();//任务主体id CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid); - if(coscoSupplierChangeApply == null){ + if (!ObjectUtils.isEmpty(coscoSupplierChangeApply)) { throw new IllegalArgumentException("任务信息不能为空"); } //先验证一下主任务表数据状态 @@ -249,13 +253,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){ throw new IllegalArgumentException("任务已处理完成"); } - + Date date = CoscoDateUtils.getNowDate(); //修改主体审批状态，封装实体 CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply(); //审批通过 if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ - Date date = CoscoDateUtils.getNowDate(); + //新基本信息 CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid); @@ -276,8 +280,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierChangeApply1.setId(coscoSupplierChangeApply.getId()); coscoSupplierChangeApply1.setApproveStatus(vo.getApproveStatus()); - coscoSupplierChangeApply1.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierChangeApply1.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierChangeApply1.setUpdateTime(date); + coscoSupplierChangeApply1.setLastUpdateTime(date); coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(coscoSupplierChangeApply1); @@ -401,18 +405,16 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { //变更证明附件 - 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); - } + if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) { + 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); } } //**************调用审批接口********************** 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 acfb371..805686e 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 @@ -19,6 +19,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupp import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; /** * 供应商退出_供应商退出任务Service业务层处理 @@ -74,8 +75,15 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { * @return 供应商退出_供应商退出任务 */ @Override - public CoscoSupplierexit selectCoscoSupplierexitById(String id) { - return coscoSupplierexitMapper.selectCoscoSupplierexitById(id); + public CoscoSupplierexitVo selectCoscoSupplierexitById(String id) { + CoscoSupplierexitVo vo = new CoscoSupplierexitVo(); + CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(id); + CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory(); + category.setSupplierexitId(id); + List categoryList = coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(category); + vo.setCoscoSupplierexit(coscoSupplierexit); + vo.setCoscoSupplierexitSupplierCategoryList(categoryList); + return vo; } /** @@ -143,7 +151,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { //先验证一下主任务表数据状态 CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId()); - if(coscoSupplierexit == null){ + if (!ObjectUtils.isEmpty(coscoSupplierexit)) { throw new IllegalArgumentException("任务信息不能为空"); } if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || @@ -198,7 +206,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId()); coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); - coscoSupplierBase.setUpdateBy("1"); coscoSupplierBase.setUpdateTime(date); coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java index 74eecb5..a2ef26e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java @@ -52,6 +52,7 @@ public class SupplierSyncTask { @Transactional public void reportCurrentTimeYyzz(){ CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + coscoSupplierBase.setSupplierType(CoscoType.SUPPLIER_TYPE_DVS); List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index 6e7051e..c53345f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -40,6 +40,10 @@ public class SupplierPageVo { /** 最新评价时间 */ private Date evaluationTime; + + /** 最新评价时间 */ + private String supplierType; + /** * 黑名单部门list */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml index 9bb5e80..e8ba19b 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml @@ -75,6 +75,8 @@ END AS access_type_text, w.start_time, w.end_time, + w.review_status, + w.approve_status, CASE WHEN w.review_status = 0 THEN '未开始' WHEN w.review_status = 1 THEN '进行中' @@ -140,6 +142,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -154,6 +158,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc @@ -196,6 +201,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -210,6 +217,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc @@ -256,6 +264,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -270,6 +280,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml index 2f37504..9fc5b6b 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml @@ -15,32 +15,40 @@ - select id, receiver_id, content, read, type, create_time, update_time - from cosco_message + SELECT + m.id, + m.receiver_id, + m.content, + m.`read`, + m.type, + m.create_time, + m.update_time + FROM + cosco_message m @@ -81,7 +89,7 @@ content = #{content}, - read = + `read` = #{read}, type = @@ -94,7 +102,7 @@ #{updateTime}, - where id = #{id} + where receiver_id = #{receiverId} 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 d308d17..c1d5c67 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 @@ -125,6 +125,32 @@ cosco_supplier_base + + + SELECT + GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName, + CASE supplier_type + WHEN 'dvs' THEN '境内企业' + WHEN 'ovs' THEN '境外企业' + WHEN 'pe' THEN '个人' + END AS supplier_type_cn, + csb.enterprise_type, + cas.id, + cas.access_work_id, + cas.supplier_id, + csb.`name`, + caw.update_time + FROM + cosco_access_supplier cas + LEFT JOIN cosco_access_work caw ON cas.access_work_id = caw.id + LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id + left join cosco_access_supplier_category casc on csb.id = casc.supplier_id and casc.del_flag = 'normal' + left join cosco_category cc on casc.category_id = cc.id and cc.del_flag = 'normal' + + + + + + + + + + + +