Merge branch 'dev' of http://59.110.10.99:53000/liuc/biz_supplier_manage into dev

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java

@@ -2,12 +2,17 @@ package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.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.SysOrg;
+import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
+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.CoscoAnnualreviewTaskSupplierMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierexitMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.service.DataStatisticeService;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo;
@@ -32,6 +37,10 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
     private CoscoSupplierexitMapper coscoSupplierexitMapper;
     @Autowired
     private ICoscoCategoryService coscoCategoryService;
+    @Autowired
+    private IUserService userService;
+    @Autowired
+    private IOrgService orgService;
 
     @Autowired
     private CoscoSupplierQualificationsMapper coscoSupplierQualificationsMapper;
@@ -41,6 +50,7 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
         IPage<CoscoEvaluateTaskListVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
                 vo.getBasePageRequest().getPageSize());
         IPage<SupplierEvaluateStatisticsVo> supplierEvaluateStatistics = coscoEvaluateTaskMapper.getSupplierEvaluateStatistics(p, vo);
+
         supplierEvaluateStatistics.getRecords().forEach(item -> {
 
             if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) {
@@ -102,6 +112,14 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
         IPage<SupplierExitStatisticsVo> supplierExitStatistics = coscoSupplierexitMapper.getSupplierExitStatistics(p, vo);
         supplierExitStatistics.getRecords().forEach(item -> {
             getCateName(item);
+            SysUser userById = userService.getUserById(item.getApplyUser());
+            if(userById!=null){
+                SysOrg orgInfo = orgService.getOrgInfo(userById.getOrgId());
+                item.setAccessUnit(orgInfo.getCuCompanyName());
+                item.setAccessDept(orgInfo.getOrgName());
+                item.setApplyUser(userById.getName());
+            }
+
         });
         return supplierExitStatistics;
     }