liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改驼峰字段，修改线下准入与零星准入规则

Browse Source
This commit is contained in:
TL
2025-08-06 16:26:33 +08:00
parent b6f2442b49
commit c543e14e83
11 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java
View File

@ -30,6 +30,11 @@ public interface IOrgService {
Map<String, SysOrg> getOrgDeptInfo(String orgIds);
/**
* 通过orgFullId查询所有，所有下级单位
* @return
*/
BaseResponse<List<SysOrg>> getOrgFullIdOrglist();
/**

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
View File

@ -57,6 +57,15 @@ public class OrgServiceImpl implements IOrgService {
return orgMap;
}
@Override
public BaseResponse<List<SysOrg>> getOrgFullIdOrglist() {
SysOrgVO param = new SysOrgVO();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
param.setOrgFullId(currentUser.getOrganizationFullId());
BaseResponse<List<SysOrg>> orgBaseResponse =systemClient.getOrglist(param);
return orgBaseResponse;
}
/**
* 查询机构列表
* @param param

13
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -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);
}
//保存工作主表

5
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessCategoryMapper.xml
View File

@ -10,6 +10,9 @@
<result property="categoryName" column="category_name"/>
<result property="categoryPathName" column="category_path_name"/>
<result property="categoryPathId" column="category_path_id"/>
<result property="supplierName" column="supplier_name"/>
</resultMap>
<sql id="selectCoscoAccessCategoryVo">
@ -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

11
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml
View File

@ -21,6 +21,11 @@
<result property="supplierexitId" column="supplierexit_id"/>
<result property="orgId" column="org_id"/>
<result property="deptId" column="dept_id"/>
<result property="exitTime" column="exit_time"/>
<result property="exitReason" column="exit_reason"/>
<result property="supplierName" column="supplier_name"/>
</resultMap>
<sql id="selectCoscoAccessSupplierCategoryVo">
@ -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,

15
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml
View File

@ -9,6 +9,9 @@
<result property="supplierId" column="supplier_id"/>
<result property="accessStatus" column="access_status"/>
<result property="accessStatusCn" column="access_status_cn"/>
<result property="supplierName" column="supplier_name"/>
<result property="updateYear" column="update_year"/>
<result property="countNum" column="count_num"/>
<result property="orgId" column="org_id"/>
@ -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 @@
<select id="selectUpdateYearcountNum" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier">
SELECT
YEAR(caw.update_time) AS updateYear,
COUNT(0) as countNum
YEAR(caw.update_time) AS update_year,
COUNT(0) as count_num
FROM
cosco_access_supplier a
left join cosco_access_work caw on caw.id = a.access_work_id and caw.del_flag = 'normal'
GROUP BY updateYear
GROUP BY update_year
</select>
<insert id="insertCoscoAccessSupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier">

6
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessUserItemMapper.xml
View File

@ -18,6 +18,8 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<result property="itemName" column="item_name"/>
<result property="itemType" column="item_type"/>
<collection property="coscoAccessTtemAttachments"
column="{accessUserItemId=id}"
@ -44,8 +46,8 @@
<sql id="selectCoscoAccessUserItemVo">
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,

6
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml
View File

@ -23,6 +23,10 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="lastUpdateTime" column="last_update_time"/>
<result property="countNum" column="count_num"/>
<collection property="categoryNameList"
column="{accessWorkId=id}"
ofType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory"
@ -338,7 +342,7 @@
WHEN access_type = 'scattered' THEN
'零星采购/应急采购/个人供应商' ELSE access_type
END AS access_type_text,
count(0) as countNum
count(0) as count_num
FROM
cosco_access_work

3
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
View File

@ -52,6 +52,7 @@
<result property="currencyCn" column="currency_cn"/>
<result property="deptId" column="dept_id"/>
<result property="unifiedCode" column="unified_code"/>
<result property="countNum" column="count_num"/>
</resultMap>
@ -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

6
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml
View File

@ -25,6 +25,10 @@
<result property="title" column="title"/>
<result property="changeDesc" column="change_desc"/>
<result property="enterpriseTypeCn" column="enterprise_type_cn"/>
<result property="supplierName" column="supplier_name"/>
<collection property="coscoSupplierChangeHistoryList"
column="{supplierChangeApplyId=id}"
@ -123,7 +127,7 @@
CASE
WHEN supplier_type = 'ovs' THEN name_en
ELSE sb.`name`
END AS supplierName,
END AS supplier_name,
sb.enterprise_type,
c.change_by,
c.change_time,

3
src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitSupplierCategoryMapper.xml
View File

@ -14,6 +14,7 @@
<result property="exitTheme" column="exit_theme"/>
<result property="deptId" column="dept_id"/>
<result property="createTime" column="create_time"/>
<result property="supplierName" column="supplier_name"/>
</resultMap>
<sql id="selectCoscoSupplierexitSupplierCategoryVo">
@ -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,