部门修改
This commit is contained in:
@ -23,6 +23,9 @@ public class CoscoAccessSupplierCategory extends CoscoBaseEntity {
|
||||
//准入单位
|
||||
private String orgId;
|
||||
|
||||
//准入单位
|
||||
private String orgName;
|
||||
|
||||
// 准入部门id
|
||||
private String deptId;
|
||||
|
||||
|
@ -230,10 +230,10 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
|
||||
coscoAccessSupplierMapper.updateCoscoAccessSupplierByIds(coscoAccessSupplierUp);
|
||||
|
||||
|
||||
//根据任务id与部门id查询需要准入的品类,并且排除每个供应商已存在该部门下的品类
|
||||
//根据任务id与单位id查询需要准入的品类,并且排除每个供应商已存在该单位下的品类
|
||||
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
|
||||
coscoAccessCategory.setAccessWorkId(coscoAccessWorkData.getId());
|
||||
coscoAccessCategory.setDeptId(coscoAccessWorkData.getDeptId());
|
||||
coscoAccessCategory.setDeptId(coscoAccessWorkData.getOrgId());
|
||||
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryByDeptIdList(coscoAccessCategory);
|
||||
|
||||
//审批通过,将需要插入到已准入品类表的品类插入到数据库中
|
||||
|
@ -6,6 +6,7 @@ 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.SysOrg;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrgVO;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.SysSupplierUser;
|
||||
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
|
||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||
@ -182,10 +183,9 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
|
||||
IPage<CoscoAccessSupplierCategory> page = new Page<>(vo.getPageNo(), vo.getPageSize());
|
||||
IPage<CoscoAccessSupplierCategory> pageData = coscoAccessSupplierCategoryMapper.selectPageList(page, vo);
|
||||
for(CoscoAccessSupplierCategory category : pageData.getRecords()){
|
||||
SysOrg dept = orgService.getOrgInfo(category.getDeptId());
|
||||
if(!ObjectUtils.isEmpty(dept)){
|
||||
category.setDeptName(dept.getOrgName());
|
||||
}
|
||||
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId());
|
||||
category.setOrgName(orgDeptVo.getOrgName());
|
||||
category.setDeptName(orgDeptVo.getDeptName());
|
||||
category.setCategoryName(coscoCategoryService.getCategoryNameById(category.getCategoryId()));
|
||||
}
|
||||
return pageData;
|
||||
|
@ -32,7 +32,7 @@
|
||||
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
|
||||
LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id and csb.del_flag = 'normal'
|
||||
LEFT JOIN cosco_access_supplier_category casc ON casc.category_id = cac.category_id AND casc.dept_id = #{deptId} and cas.supplier_id = casc.supplier_id and casc.del_flag = 'normal'
|
||||
LEFT JOIN cosco_access_supplier_category casc ON casc.category_id = cac.category_id AND casc.org_id = #{deptId} and cas.supplier_id = casc.supplier_id and casc.del_flag = 'normal'
|
||||
where caw.id = #{accessWorkId} AND casc.id IS NULL;
|
||||
</select>
|
||||
|
||||
|
Reference in New Issue
Block a user