Commit 060c3383 authored by wangqiang's avatar wangqiang

ExtPlanController:业务代码迁入(2.x版本->4.1版本)--已全部编译通过

parent d0a5ece1
...@@ -24,8 +24,11 @@ import com.yonde.dex.dao.service.util.DxPageUtils; ...@@ -24,8 +24,11 @@ import com.yonde.dex.dao.service.util.DxPageUtils;
import com.yonde.dex.dict.feign.DictDataFeignService; import com.yonde.dex.dict.feign.DictDataFeignService;
import com.yonde.dex.dict.service.vo.DictDataVO; import com.yonde.dex.dict.service.vo.DictDataVO;
import com.yonde.dex.user.common.vo.DxOrganizationVO; import com.yonde.dex.user.common.vo.DxOrganizationVO;
import com.yonde.dex.user.common.vo.DxUserInfoVO;
import com.yonde.dex.user.feign.DxUserInfoFeign;
import com.yonde.dex.version.plugin.core.deleteType.IterationDeleteVO; import com.yonde.dex.version.plugin.core.deleteType.IterationDeleteVO;
import dm.jdbc.util.StringUtil; import dm.jdbc.util.StringUtil;
import lombok.val;
import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.CellStyle;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -77,16 +80,22 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V ...@@ -77,16 +80,22 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
@Autowired @Autowired
private ExtDistributeRecordService extDistributeRecordService; private ExtDistributeRecordService extDistributeRecordService;
@Autowired
private DxUserInfoFeign userService;
/** /**
* 通过userId获取组织名 * 通过userId获取组织名
* *
* @param userId * @param userId
* @return * @return
*/ */
//todo wq:如何在4.1获取通过userId获取组织名?将2.0业务逻辑暂时注释,改为下方逻辑。
@Override @Override
public List<DxOrganizationVO> searchOrgNameByUserId(Long userId, String code) { public List<DxOrganizationVO> searchOrgNameByUserId(Long userId, String code) {
//todo 4.1中未找到对应的userservice,业务逻辑暂时注释 List<DxOrganizationVO> organizationVOs = new ArrayList<>();
// UserVO user = this.userService.get(userId); DxUserInfoVO user = this.userService.getByUserId(userId);
organizationVOs.add(user.getDxOrganization());
return organizationVOs;
// List<UserGroupRefVO> vos = this.userGroupRefService.findAllByUserAccount(user.getUserAccount()); // List<UserGroupRefVO> vos = this.userGroupRefService.findAllByUserAccount(user.getUserAccount());
// List<Long> groupIds = (List) vos.stream().filter((o) -> { // List<Long> groupIds = (List) vos.stream().filter((o) -> {
// return Objects.nonNull(o.getGroupId()); // return Objects.nonNull(o.getGroupId());
...@@ -105,7 +114,6 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V ...@@ -105,7 +114,6 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
// } // }
// List<OrganizationVO> organizationVO = this.searchOrganization(user, code); // List<OrganizationVO> organizationVO = this.searchOrganization(user, code);
// return organizationVO; // return organizationVO;
return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment