diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java index a0f045b..fce8aab 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java @@ -70,6 +70,8 @@ public class CoscoAnnualreviewTemplate extends BaseEntity { private String categoryName; + private String deptName; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java index 2c85f6c..d6c57a2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java @@ -3,9 +3,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.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.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator; @@ -13,6 +16,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnual import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +37,10 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT private CoscoAnnualreviewTemplateMapper coscoAnnualreviewTemplateMapper; @Autowired private ICoscoAnnualreviewTemplateIndicatorService coscoAnnualreviewTemplateIndicatorService; + @Autowired + private IUserService userService; + @Autowired + private IOrgService orgService; /** * 查询供应商年审_年审模板主 @@ -132,9 +140,13 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT template.getBasePageRequest().getPageSize()); IPage coscoAnnualreviewTemplateIPage = coscoAnnualreviewTemplateMapper.selectMyPage(p, template); //TODO 待完善 - List creaters = new ArrayList<>(); coscoAnnualreviewTemplateIPage.getRecords().forEach(vo -> { - creaters.add(vo.getCreateBy()); + SysUser userById = userService.getUserById(vo.getCreateBy()); + if (userById != null) { + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userById.getOrgId()); + vo.setDeptName(orgDeptInfo.getDeptName()); + vo.setTenantName(orgDeptInfo.getOrgName()); + } }); //根据creaters获取创建部门创建单位 //封装创建部门 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java index 164d663..9c2be1e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.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.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant; @@ -15,6 +16,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTe import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -148,7 +150,12 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS IPage coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template); //TODO 人员添加 coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> { - + SysUser userById = userService.getUserById(vo.getCreateBy()); + if(userById!=null){ + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userById.getOrgId()); + vo.setDeptName(orgDeptInfo.getDeptName()); + vo.setTenantName(orgDeptInfo.getOrgName()); + } }); return coscoEvaluateTemplateVoIPage;