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:
YY
2025-07-17 16:07:47 +08:00
parent 742bdc86a4
commit 70b82ceb7a
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,15 +150,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(), IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(),
coscoCategoryLibrary.getBasePageRequest().getPageSize()); coscoCategoryLibrary.getBasePageRequest().getPageSize());
IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary); IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary);
coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> { getOrg(coscoCategoryLibraryVoIPage);
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId());
coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy());
if(userById!=null){
coscoCategoryLibraryVo.setCreateName(userById.getName());
}
});
return coscoCategoryLibraryVoIPage; return coscoCategoryLibraryVoIPage;
} }
@ -174,8 +166,23 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
public IPage<CoscoCategoryLibraryVo> selectCategoryLibraryBySupplierIdPage(CoscoCategoryLibraryVo coscoCategoryLibrary) { public IPage<CoscoCategoryLibraryVo> selectCategoryLibraryBySupplierIdPage(CoscoCategoryLibraryVo coscoCategoryLibrary) {
IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(), IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(),
coscoCategoryLibrary.getBasePageRequest().getPageSize()); coscoCategoryLibrary.getBasePageRequest().getPageSize());
return coscoCategoryLibraryMapper.selectCategoryLibraryBySupplierIdPage(p, coscoCategoryLibrary); IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectCategoryLibraryBySupplierIdPage(p, coscoCategoryLibrary);
getOrg(coscoCategoryLibraryVoIPage);
return coscoCategoryLibraryVoIPage;
}
private void getOrg(IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage) {
coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> {
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getApplyDeptId());
coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
SysUser userById = userService.getUserById(coscoCategoryLibraryVo.getCreateBy());
if(userById!=null){
coscoCategoryLibraryVo.setCreateName(userById.getName());
}
});
} }
/** /**

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

@ -275,20 +275,29 @@
ccl.id, ccl.id,
ccl.name, ccl.name,
ccl.area, ccl.area,
"集团" AS deptName, max(dp.dic_name) AS area,
"张三" AS createName, GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
ccl.term_of_validity AS termOfValidity, ccl.term_of_validity AS termOfValidity,
ccl.approve_status AS approveStatus, ccl.approve_status AS approveStatus,
ccl.last_update_time as approveTime, ccl.last_update_time as approveTime,
ccl.create_by,
ccl.apply_dept_id,
ccl.remark ccl.remark
from cosco_category_library_supplier ccls from cosco_category_library_supplier ccls
left join cosco_category_library_supplier_apply cclsa on cclsa.id = ccls.category_library_supplier_apply_id left join cosco_category_library_supplier_apply cclsa on cclsa.id = ccls.category_library_supplier_apply_id
left join cosco_category_library ccl on ccls.category_library_id = ccl.id left join cosco_category_library ccl on ccls.category_library_id = ccl.id
LEFT JOIN
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId} where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
<if test="vo.name!=null and vo.name!=''"> <if test="vo.name!=null and vo.name!=''">
AND ccl.name LIKE CONCAT('%',#{vo.name},'%') AND ccl.name LIKE CONCAT('%',#{vo.name},'%')
</if> </if>
group by ccl.id
</select> </select>
</mapper> </mapper>