项目组织名称

src/main/java/com/fdkankan/fusion/service/ITmDepartmentService.java

@@ -36,4 +36,6 @@ public interface ITmDepartmentService extends IService<TmDepartment> {
     HashMap<String, TmDepartment> getMapByDeptIds(Set<String> deptIdSet);
 
     List<String> getByZdDeptIds();
+
+    List<TmDepartment> getLikeName(String organizerDeptName);
 }

src/main/java/com/fdkankan/fusion/service/impl/TmDepartmentServiceImpl.java

@@ -236,4 +236,11 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
         }
         return map;
     }
+
+    @Override
+    public List<TmDepartment> getLikeName(String organizerDeptName) {
+        LambdaQueryWrapper<TmDepartment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(TmDepartment::getName,organizerDeptName);
+        return this.list(wrapper);
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
+import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -71,6 +72,16 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         if(deptIds.size() <=0){
             throw new BusinessException(ResultCode.NOT_DEPT);
         }
+        //承办单位
+        if(StringUtils.isNotBlank(tmProject.getOrganizerDeptName())){
+           List<TmDepartment> list =  tmDepartmentService.getLikeName(tmProject.getOrganizerDeptName());
+           if(list.size() <=0){
+               return PageInfo.PageInfo(new Page<>(tmProject.getPageNum(),tmProject.getPageSize()));
+           }
+            List<String> collect = list.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            deptIds = deptIds.stream().filter(collect::contains).collect(Collectors.toList());
+        }
+
         wrapper.in(TmProject::getDeptId,deptIds);
         //起火项目对象
         if(StringUtils.isNotBlank(tmProject.getProjectSn())){
@@ -90,10 +101,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
                 wrapper.likeRight(TmProject::getProjectSiteCode , tmProject.getProjectSiteCode());
             }
         }
-        //承办单位
-        if(StringUtils.isNotBlank(tmProject.getOrganizerDeptName())){
-            wrapper.like(TmProject::getOrganizerDeptName , tmProject.getOrganizerDeptName());
-        }
+
         //起火对象
         if(StringUtils.isNotBlank(tmProject.getOrganizerUsers())){
             wrapper.like(TmProject::getOrganizerUsers , tmProject.getOrganizerUsers());
@@ -122,12 +130,18 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         wrapper.orderByDesc(TmProject::getCreateTime);
         Page<TmProject> page = this.page(new Page<>(tmProject.getPageNum(), tmProject.getPageSize()), wrapper);
         List<String> ids = page.getRecords().stream().map(TmProject::getId).collect(Collectors.toList());
+        Set<String> deptDbIds = page.getRecords().stream().map(TmProject::getDeptId).collect(Collectors.toSet());
+        HashMap<String, TmDepartment> mapByDeptIds = tmDepartmentService.getMapByDeptIds(deptDbIds);
         HashMap<String ,CaseEntity> map = this.getCaseMap(ids);
         for (TmProject record : page.getRecords()) {
             CaseEntity caseEntity = map.get(record.getId());
             if(caseEntity != null){
                 record.setCaseId(caseEntity.getCaseId());
             }
+            TmDepartment tmDepartment = mapByDeptIds.get(record.getDeptId());
+            if(tmDepartment != null){
+                record.setOrganizerDeptName(tmDepartment.getName());
+            }
         }
         return PageInfo.PageInfo(page);
     }