修改数据
This commit is contained in:
@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
|
||||
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||
@ -183,6 +184,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
|
||||
listCoscoCategoryLibrarySupplierApplyVoIPage.getRecords().forEach(vo -> {
|
||||
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
|
||||
vo.setDeptName(orgDeptInfo.getOrgName());
|
||||
SysUser userById = userService.getUserById(vo.getCreateBy());
|
||||
if(userById!=null){
|
||||
vo.setApplyUser(userById.getName());
|
||||
}
|
||||
});
|
||||
return listCoscoCategoryLibrarySupplierApplyVoIPage;
|
||||
}
|
||||
|
@ -21,7 +21,11 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable {
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String deptName="部门";
|
||||
private String deptName;
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
private String createBy;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
|
@ -214,7 +214,7 @@
|
||||
ccl.id,
|
||||
ccl.name,
|
||||
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
|
||||
ccl.area,
|
||||
max(dp.dic_name) AS area,
|
||||
ccl.create_by,
|
||||
ccl.apply_dept_id,
|
||||
ccl.term_of_validity AS termOfValidity,
|
||||
@ -232,7 +232,7 @@
|
||||
WHEN ccl.approve_status = 1 THEN '通过'
|
||||
WHEN ccl.approve_status = 2 THEN '驳回'
|
||||
END AS approveResult,
|
||||
COUNT(DISTINCT cclsa.id) AS snumber
|
||||
COUNT(DISTINCT ccls.id) AS snumber
|
||||
FROM
|
||||
cosco_category_library ccl
|
||||
LEFT JOIN
|
||||
@ -240,10 +240,11 @@
|
||||
LEFT JOIN
|
||||
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
|
||||
LEFT JOIN
|
||||
cosco_category_library_supplier ccls ON ccl.id = ccls.category_library_id
|
||||
cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1
|
||||
LEFT JOIN
|
||||
cosco_category_library_supplier_apply cclsa ON ccls.category_library_supplier_apply_id = cclsa.id
|
||||
AND cclsa.approve_status = 1
|
||||
cosco_category_library_supplier ccls ON cclsa.id = ccls.category_library_supplier_apply_id
|
||||
left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
|
||||
|
||||
<where>
|
||||
and ccl.del_flag = 'normal'
|
||||
<if test="vo.name!=null and vo.name!=''">
|
||||
|
@ -184,7 +184,7 @@
|
||||
|
||||
<select id="selectPageList" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo">
|
||||
|
||||
select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
|
||||
select cclsa.id, ccl.name,max(dp.dic_name) AS area,cclsa.create_by as createBy ,
|
||||
ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId,
|
||||
case when cclsa.approve_status=0 and cclsa.work_flow_id is null then '未开始'
|
||||
when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
|
||||
@ -203,6 +203,7 @@
|
||||
join cosco_category_library ccl on cclsa.category_library_id=ccl.id
|
||||
left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id
|
||||
left join cosco_supplier_base csb on csb.id= ccls.supplier_id
|
||||
left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
|
||||
where cclsa.del_flag ='normal'
|
||||
<if test="vo.name!=null and vo.name!=''">
|
||||
and ccl.name like concat('%',#{vo.name},'%')
|
||||
|
Reference in New Issue
Block a user