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

Merge remote-tracking branch '99/dev' into 99dev

Browse Source
This commit is contained in:
TL
2025-08-11 17:00:13 +08:00
parent dcee90fe7b 7c74ba9424
commit e18f7ed7b4
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
View File

@ -273,7 +273,11 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
} }
} }
SysOrg sysOrg = orgService.getOrgInfo(coscoCategoryLibrary.getApplyDeptId()); SysOrg sysOrg = orgService.getOrgInfo(coscoCategoryLibrary.getApplyDeptId());
vo.setDeptName(sysOrg.getOrgName()); vo.setApplyDeptName(sysOrg.getOrgName());
vo.setApplyOrgName(sysOrg.getCuCompanyName());
SysOrg orgName = orgService.getOrgInfo(coscoCategoryLibrary.getDeptId());
vo.setDeptName(orgName.getOrgName());
vo.setOrgName(orgName.getCuCompanyName());
vo.setCategoryName(sb.toString()); vo.setCategoryName(sb.toString());
vo.setCategoryPathName(categoryPathNames.toString()); vo.setCategoryPathName(categoryPathNames.toString());
vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id)); vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java
View File

@ -14,6 +14,12 @@ public class CoscoCategoryLibraryDetailVo extends CoscoCategoryLibrary {
private String deptName; private String deptName;
private String applyDeptName;
private String applyOrgName;
private String orgName;
private String createByName; private String createByName;
private String categoryName; private String categoryName;

2
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
View File

@ -290,7 +290,7 @@
<if test="vo.orgId!=null and vo.orgId!=''"> <if test="vo.orgId!=null and vo.orgId!=''">
and cat.org_id = #{vo.orgId} and cat.org_id = #{vo.orgId}
</if> </if>
and cat.level_name is not null and cats.review_result is not null
</where> </where>
order by cats.create_time desc order by cats.create_time desc

1
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
View File

@ -29,6 +29,7 @@
select id, select id,
name, name,
apply_dept_id, apply_dept_id,
apply_org_id,
approve_type, approve_type,
org_id, org_id,
term_of_validity, term_of_validity,