From 36a014b02216ef0c0dacbf6bc619999aaab147ba Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Tue, 15 Jul 2025 13:36:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CoscoAccessItemController.java | 9 +++------ .../controller/CoscoSupplierBaseController.java | 1 + .../service/impl/CoscoAccessWorkServiceImpl.java | 2 +- .../supplier/coscosupplier/vo/SupplierPageVo.java | 7 +++++++ .../dao/mapper/CoscoAccessSupplierCategoryMapper.xml | 5 ++++- .../base/dao/mapper/CoscoAccessSupplierMapper.xml | 4 +++- .../base/dao/mapper/CoscoSupplierBaseMapper.xml | 12 +++++++++++- .../CoscoSupplierexitSupplierCategoryMapper.xml | 4 +++- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessItemController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessItemController.java index 47d744a..09d28f2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessItemController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessItemController.java @@ -2,10 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.CoscoAccessCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItem; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,14 +20,14 @@ import java.util.List; @RequestMapping("/coscoAccessItem") public class CoscoAccessItemController extends BaseController { @Autowired - private ICoscoAccessCategoryService coscoAccessCategoryService; + private ICoscoAccessItemService coscoAccessItemService; /** * 分组查询工作任务下的评审项 */ @GetMapping("/groupByList") - public BaseResponse> groupByList(CoscoAccessCategory coscoAccessCategory) { - List list = coscoAccessCategoryService.selectCoscoAccessCategoryList(coscoAccessCategory); + public BaseResponse> groupByList(CoscoAccessItem coscoAccessItem) { + List list = coscoAccessItemService.selectGroupByItemList(coscoAccessItem); return BaseResponse.success(list); } 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 a9a0210..e1869b8 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 @@ -286,6 +286,7 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + id = "1944943451761344512"; return BaseResponse.success(coscoSupplierBaseService.selectCoscoSupplierBaseById(id)); } 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 9f922a1..66e3ef8 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 @@ -440,7 +440,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Transactional public int updateCoscoAccessWork(CoscoAccessUserItemVo vo) { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = "USER002"; + String userId = currentUser.getUserId(); Date date = CoscoDateUtils.getNowDate(); //修改评审项关联评审人员表 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 36893aa..04714fb 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 @@ -20,6 +20,8 @@ public class SupplierPageVo { */ private String name; + + private String nameEn; /** * 部门ID */ @@ -83,6 +85,11 @@ public class SupplierPageVo { private String socialCreditCode; + /** + * 三合一统一信用代码 + */ + private String unifiedCode; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } 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 394b9be..7e9043f 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 @@ -135,7 +135,9 @@