From c543e14e8311b28683993891d69fefecc652f93d Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Wed, 6 Aug 2025 16:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=BC=E5=B3=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8B=E5=87=86?= =?UTF-8?q?=E5=85=A5=E4=B8=8E=E9=9B=B6=E6=98=9F=E5=87=86=E5=85=A5=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/supplier/base/service/IOrgService.java | 5 +++++ .../base/service/impl/OrgServiceImpl.java | 9 +++++++++ .../service/impl/CoscoAccessWorkServiceImpl.java | 13 +++++++------ .../base/dao/mapper/CoscoAccessCategoryMapper.xml | 5 ++++- .../mapper/CoscoAccessSupplierCategoryMapper.xml | 11 ++++++++--- .../base/dao/mapper/CoscoAccessSupplierMapper.xml | 15 +++++++++------ .../base/dao/mapper/CoscoAccessUserItemMapper.xml | 6 ++++-- .../base/dao/mapper/CoscoAccessWorkMapper.xml | 6 +++++- .../base/dao/mapper/CoscoSupplierBaseMapper.xml | 3 ++- .../dao/mapper/CoscoSupplierChangeApplyMapper.xml | 6 +++++- .../CoscoSupplierexitSupplierCategoryMapper.xml | 3 ++- 11 files changed, 60 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java index 46f3c20..301a4c9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java @@ -30,6 +30,11 @@ public interface IOrgService { Map getOrgDeptInfo(String orgIds); + /** + * 通过orgFullId查询所有,所有下级单位 + * @return + */ + BaseResponse> getOrgFullIdOrglist(); /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java index a6dc86a..ea562a0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java @@ -57,6 +57,15 @@ public class OrgServiceImpl implements IOrgService { return orgMap; } + @Override + public BaseResponse> getOrgFullIdOrglist() { + SysOrgVO param = new SysOrgVO(); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + param.setOrgFullId(currentUser.getOrganizationFullId()); + BaseResponse> orgBaseResponse =systemClient.getOrglist(param); + return orgBaseResponse; + } + /** * 查询机构列表 * @param param 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 a45efd9..e442434 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 @@ -324,16 +324,17 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //给各个评审人员发送消息,告知有新的供应商需要评审 coscoMessageService.userMessage(coscoAccessUserls); } - //如果是线下准入,需要上传审查附件,不需要走评审流程 - if(CoscoType.ACCESS_TYPE_OFFLINE.equals(coscoAccessWork.getAccessType())){ + //如果是零星采购/应急采购,不需要走评审流程,走审批流程 + if(CoscoType.ACCESS_TYPE_SCATTERED.equals(coscoAccessWork.getAccessType())){ //如果是线下准入、评审状态直接为完成 coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); //新增线下审批需要的附件 - addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_OFFLINE,userId); + addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_SCATTERED,userId); } - //如果是零星采购/应急采购,不需要走任何流程直接审核通过 - if(CoscoType.ACCESS_TYPE_SCATTERED.equals(coscoAccessWork.getAccessType())){ + + //如果是线下准入,不需要走任何流程直接审核通过 + if(CoscoType.ACCESS_TYPE_OFFLINE.equals(coscoAccessWork.getAccessType())){ //如果是零星采购/应急采购、评审状态直接为完成 coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); //如果是零星采购/应急采购、审批状态直接为通过 @@ -341,7 +342,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //零星采购,直接把准入品类添加到已准入品类表,并给供应商发送消息 sporadicHandling(coscoAccessWork,vo.getCoscoAccessCategoryList()); //新增零星采购需要的附件 - addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_SCATTERED,userId); + addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_OFFLINE,userId); } //保存工作主表 diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml index 6ee1b96..dc99d98 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml @@ -10,6 +10,9 @@ + + + @@ -33,7 +36,7 @@ CASE WHEN csb.supplier_type = 'ovs' THEN name_en ELSE name - END AS supplierName + END AS supplier_name from cosco_access_work caw left join cosco_access_category cac on caw.id = cac.access_work_id left join cosco_access_supplier cas on caw.id = cas.access_work_id 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 f191dcb..5c263bc 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 @@ -21,6 +21,11 @@ + + + + + @@ -42,8 +47,8 @@ c.org_id, c.dept_id, c.supplierexit_id, - cse.exit_time as exitTime, - cse.exit_reason as exitReason + cse.exit_time, + cse.exit_reason FROM cosco_access_supplier_category c left join cosco_supplier_base s on c.supplier_id = s.id and s.del_flag = 'normal' @@ -131,7 +136,7 @@ SELECT CASE WHEN s.supplier_type = 'ovs' THEN - name_en ELSE name END AS supplierName, + name_en ELSE name END AS supplier_name, c.id, c.access_work_id, c.supplier_id, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml index f79b974..068159f 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml @@ -9,6 +9,9 @@ + + + @@ -41,7 +44,7 @@ a.id, CASE WHEN s.supplier_type = 'ovs' THEN name_en - ELSE name END AS supplierName, + ELSE name END AS supplier_name, a.access_work_id, a.access_status, CASE a.access_status @@ -63,7 +66,7 @@ a.id, CASE WHEN s.supplier_type = 'ovs' THEN - name_en ELSE name END AS supplierName, + name_en ELSE name END AS supplier_name, CASE s.supplier_type WHEN 'dvs' THEN '境内企业' WHEN 'ovs' THEN '境外企业' @@ -80,7 +83,7 @@ WHEN caw.access_type = 'scattered' THEN '零星采购/应急采购/个人供应商' ELSE caw.access_type END AS accessTypeText, - YEAR(caw.update_time) AS updateYear + YEAR(caw.update_time) AS update_year FROM cosco_access_supplier a LEFT JOIN cosco_supplier_base s ON a.supplier_id = s.id and s.del_flag = 'normal' @@ -176,12 +179,12 @@ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessUserItemMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessUserItemMapper.xml index 0c2c44b..942c1d6 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessUserItemMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessUserItemMapper.xml @@ -18,6 +18,8 @@ + + SELECT - i.item_name AS itemName, - i.item_type as itemType, + i.item_name, + i.item_type, ui.review_by, ui.id, ui.access_work_id, 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 671e0f3..2588a66 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 @@ -23,6 +23,10 @@ + + + + + @@ -716,7 +717,7 @@ WHEN 'pe' THEN '个人' END AS supplier_type_cn, - COUNT(0) as countNum + COUNT(0) as count_num FROM cosco_supplier_base 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 51a1aeb..0dcd7af 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 @@ -25,6 +25,10 @@ + + + + + @@ -23,7 +24,7 @@ e.create_time, CASE WHEN s.supplier_type = 'ovs' THEN - name_en ELSE name END AS supplierName, + name_en ELSE name END AS supplier_name, sc.supplierexit_id, sc.supplier_id, sc.category_id,