Merge remote-tracking branch 'origin/master'

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/controller/TodoCenterController.java

@@ -4,22 +4,22 @@ package com.ningdatech.pmapi.todocenter.controller;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO;
-import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO;
-import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
-import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq;
-import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedExportReq;
-import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage;
+import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO;
+import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO;
+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.wflow.workflow.bean.dto.ReqProcessHandlerDTO;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 
 /**

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

@@ -1,9 +1,29 @@
 package com.ningdatech.pmapi.todocenter.manage;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
+import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.*;
+import static com.wflow.workflow.task.TriggerServiceTask.runtimeService;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+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.history.HistoricProcessInstance;
+import org.flowable.engine.runtime.ActivityInstance;
+import org.springframework.beans.BeanUtils;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -23,7 +43,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 +59,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 +70,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;
@@ -86,36 +104,12 @@ import com.wflow.workflow.bean.vo.ProcessTaskVo;
 import com.wflow.workflow.enums.ProcessHandlerEnum;
 import com.wflow.workflow.service.ProcessInstanceService;
 import com.wflow.workflow.service.ProcessTaskService;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-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;
 
 /**
  * @author ZPF

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/AdjustHandleDTO.java

@@ -7,8 +7,6 @@ import javax.validation.constraints.NotNull;
 
 import com.google.common.collect.Maps;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
-import com.wflow.workflow.bean.process.ProcessComment;
-import com.wflow.workflow.enums.ProcessHandlerEnum;
 
 import cn.hutool.core.collection.CollUtil;
 import io.swagger.annotations.ApiModelProperty;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/po/TodoCenterStatisticsPO.java

@@ -1,11 +1,8 @@
 package com.ningdatech.pmapi.todocenter.model.po;
 
-import com.ningdatech.pmapi.todocenter.model.vo.TodoVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @Classname TodoCenterStatisticsPO
  * @Description

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/ProcessProgressDetailVo.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.todocenter.model.vo;
 
 
-import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import com.wflow.workflow.bean.vo.ProcessProgressVo;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/utils/PdfUtils.java

@@ -1,21 +1,6 @@
 package com.ningdatech.pmapi.todocenter.utils;
 
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.StrUtil;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.Rectangle;
-import com.itextpdf.text.pdf.*;
-import com.ningdatech.basic.exception.BizException;
-import com.ningdatech.pmapi.common.util.StrUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.xhtmlrenderer.pdf.ITextFontResolver;
-import org.xhtmlrenderer.pdf.ITextRenderer;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -23,6 +8,16 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.UUID;
 
+import org.springframework.stereotype.Component;
+import org.xhtmlrenderer.pdf.ITextFontResolver;
+import org.xhtmlrenderer.pdf.ITextRenderer;
+
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.BaseFont;
+import com.ningdatech.basic.exception.BizException;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * pdf生成工具类
  *