Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/service/CommonCostServiceImpl.java

@@ -276,16 +276,7 @@ public class CommonCostServiceImpl implements CommonCostService {
         PageResult<CommonCostRespVO> commonCostRespVOPageResult = CommonCostConvert.INSTANCE.convertPage(pageResult);
         if(pageResult.getTotal()>0){
             List<CommonCostRespVO> resultList = commonCostRespVOPageResult.getList();
-            Set<String> projectIds = convertSet(resultList, CommonCostRespVO::getProjectId);
-            List<Project> projectList = projectService.selectByIds(projectIds);
             resultList.forEach(commonCostRespVO -> {
-                Integer isAgent = commonCostRespVO.getIsAgent();
-                //不是代办项目
-                if(0==isAgent){
-                    Project projectDO = projectList.stream().filter(project -> project.getId().equals(commonCostRespVO.getProjectId())).findFirst().get();
-                    commonCostRespVO.setProjectName(projectDO.getXmmc());
-                    commonCostRespVO.setProjectDeptName(projectDO.getZrbm());
-                }
                 Integer flowStatus = commonCostRespVO.getFlowStatus();
                 if (FLOW_FINISHED == flowStatus) {
                     commonCostRespVO.setStatus("已报");

zjugis-business/src/main/java/com/zjugis/business/service/CommonService.java

@@ -2,6 +2,8 @@ package com.zjugis.business.service;
 
 import com.zjugis.framework.workflow.model.SerialNumberDto;
 import com.zjugis.framework.workflow.utils.zTree;
+import com.zjugis.module.adm.api.workday.dto.WorkdayListReqDTO;
+import com.zjugis.module.adm.api.workday.dto.WorkdayRespDTO;
 
 import java.util.List;
 
@@ -28,4 +30,6 @@ public interface CommonService {
     List<zTree> getAreaManagerTree();
 
     String createProcess(String mark);
+
+    List<WorkdayRespDTO> getWorkDayList(WorkdayListReqDTO reqDTO);
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/CommonServiceImpl.java

@@ -12,6 +12,9 @@ import com.zjugis.framework.workflow.model.ProcessDto;
 import com.zjugis.framework.workflow.model.SerialNumberDto;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.utils.zTree;
+import com.zjugis.module.adm.api.workday.WorkdayApi;
+import com.zjugis.module.adm.api.workday.dto.WorkdayListReqDTO;
+import com.zjugis.module.adm.api.workday.dto.WorkdayRespDTO;
 import com.zjugis.module.system.api.area.dto.AreaNodeRespVO;
 import com.zjugis.module.system.api.company.CompanyApi;
 import com.zjugis.module.system.api.company.dto.CompanyRespDTO;
@@ -20,6 +23,7 @@ import com.zjugis.module.system.api.dept.dto.DeptRespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -45,6 +49,9 @@ public class CommonServiceImpl implements CommonService {
     @Autowired
     DeptApi deptApi;
 
+    @Resource
+    private WorkdayApi workdayApi;
+
     @Override
     public List<zTree> getProjectTypeZTree() {
         List<ProjectTypeNode> tree = projectTypeService.tree();
@@ -139,6 +146,11 @@ public class CommonServiceImpl implements CommonService {
         return workflowClient.createProcess(processDto);
     }
 
+    @Override
+    public List<WorkdayRespDTO> getWorkDayList(WorkdayListReqDTO reqDTO) {
+        return workdayApi.getWorkdayList(reqDTO).getCheckedData();
+    }
+
     private void convertProjectType2Ztree(List<ProjectTypeNode> tree, String pid,List<zTree>  zTrees){
         for (ProjectTypeNode projectTypeNode : tree) {
             zTree node = new zTree();

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -248,7 +248,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         if (CollUtil.isEmpty(deptIds)) {
             return Collections.emptyList();
         }
-        Set<String> userIds = convertSet(userDeptMapper.selectListByDeptIds(deptIds), UserDeptDO::getUserId);
+        Set<String> userIds = convertSet(userMapper.selectListByDeptIds(deptIds), AdminUserDO::getId);
         if (CollUtil.isEmpty(userIds)) {
             return Collections.emptyList();
         }