创建会议选择项目bug修复

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

@@ -795,10 +795,11 @@ public class MeetingManage {
 
     private void buildOptionProjectQuery(LambdaQueryWrapper<Project> query, String meetingType, ProjectStatusEnum status) {
         String sql = String.format("select 1 from meeting m inner join meeting_inner_project mip on" +
-                " m.is_inner_project = true and m.id = mip.meeting_id and m.type = %s and m.status != 3", meetingType);
+                " m.is_inner_project = true and m.id = mip.meeting_id and nd_project.id = mip.project_id" +
+                " and m.type = %s and m.status != 3", meetingType);
         query.eq(Project::getStatus, status.getCode());
-        query.and(q1 -> q1.notExists(sql)).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " +
-                "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)"));
+        query.and(q1 -> q1.notExists(sql).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " +
+                "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)")));
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -23,7 +23,6 @@ import com.ningdatech.pmapi.common.helper.UserInfoHelper;
 import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter;
 import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
-import com.ningdatech.pmapi.common.util.StrUtils;
 import com.ningdatech.pmapi.irs.sign.IRSAPIRequest;
 import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
@@ -40,7 +39,6 @@ import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
-import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService;
 import com.ningdatech.pmapi.projectlib.service.IProjectInstService;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
@@ -52,17 +50,17 @@ import com.ningdatech.pmapi.staging.service.IProjectStagingService;
 import com.ningdatech.pmapi.sys.model.entity.Notify;
 import com.ningdatech.pmapi.sys.service.INotifyService;
 import com.ningdatech.pmapi.todocenter.bean.entity.WorkNoticeInfo;
+import com.ningdatech.pmapi.todocenter.enumeration.IsAppendProjectEnum;
 import com.ningdatech.pmapi.todocenter.enumeration.IsOrNotEnum;
 import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO;
 import com.ningdatech.pmapi.todocenter.model.dto.PdfGenerateDTO;
 import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO;
 import com.ningdatech.pmapi.todocenter.model.dto.SignReqDTO;
 import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO;
-import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
-import com.ningdatech.pmapi.todocenter.enumeration.IsAppendProjectEnum;
 import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq;
 import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedExportReq;
 import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedReq;
+import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
 import com.ningdatech.pmapi.todocenter.model.vo.ResToBeProcessedVO;
 import com.ningdatech.pmapi.todocenter.model.vo.TodoCenterStatisticsVO;
 import com.ningdatech.pmapi.todocenter.service.StatisticsService;
@@ -92,28 +90,22 @@ import org.apache.commons.io.FileUtils;
 import org.assertj.core.util.Lists;
 import org.flowable.bpmn.model.*;
 import org.flowable.engine.HistoryService;
-import org.flowable.engine.TaskService;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.runtime.ActivityInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.TaskQuery;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.*;
 import static com.wflow.workflow.task.TriggerServiceTask.runtimeService;