Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java

@@ -43,6 +43,10 @@ public class MeetingDetailBasicVO {
     @JSONField(format = "yyyy-MM-dd HH:mm")
     private LocalDateTime startTime;
 
+    @ApiModelProperty("结束时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm")
+    private LocalDateTime endTime;
+
     @ApiModelProperty("评委到场时间")
     @JSONField(format = "yyyy-MM-dd HH:mm")
     private LocalDateTime judgesAttendanceTime;

pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml

@@ -95,8 +95,8 @@
     </sql>
 
     <select id="pageReviewProjectList" resultType="com.ningdatech.pmapi.meeting.entity.dto.ReviewProjectDTO">
-        select mip.project_id, np.project_name, np.project_type, np.project_year, np.build_org_name,
-        np.biz_domain, np.declare_amount declare_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,
+        select mip.project_id, np.project_name, np.project_type, np.project_year, np.build_org_name, m.type review_type
+        np.biz_domain, np.declare_amount declared_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,
         m.connecter, m.contact, me.is_headman, (select count(1) from nd_expert_review  ner where ner.project_id = np.id
         and ner.create_by = me.expert_id) reviewed
         from nd_project np inner join meeting_inner_project mip on mip.project_id = np.id

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java

@@ -5,10 +5,12 @@ package com.ningdatech.pmapi.todocenter.constant;
  * @since 2023/02/01 14:56
  */
 public interface WorkNotice {
-    public final String PASS_MSG_TEMPLATE = "标题：审核任务 内容：【%s】的【%s】需要您审核。";
+    public final String PASS_MSG_TEMPLATE = "【%s】的【%s】需要您审核。";
     public final String PASS_MSG_TEMPLATE2 = "【%s】已通过【%s】，请及时开始下一步操作。";
     public final String BACK_MSG_TEMPLATE = "【%s】的【%s】被退回，请及时处理。";
     public final String REJECT_MSG_TEMPLATE = "【%s】的【%s】被驳回，请及时处理。";
 
+    public final String AUDIT_WORK_TITLE = "审核任务";
+
 
 }

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

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage;
 import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO;
+import com.ningdatech.pmapi.todocenter.constant.WorkNotice;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import com.wflow.workflow.enums.ProcessStatusEnum;
 import org.apache.commons.io.FileUtils;
@@ -446,6 +447,8 @@ public class TodoCenterManage {
                             ProjectDraftSaveDTO draftSaveDto = new ProjectDraftSaveDTO();
                             BeanUtils.copyProperties(declaredProject,draftSaveDto);
                             declaredProjectManage.saveToDraft(draftSaveDto);
+                            // 并删除项目库中该项目信息
+                            projectService.removeById(declaredProject);
                             break;
                         // 当前项目状态是预审中
                         case PRE_APPLYING:
@@ -607,7 +610,7 @@ public class TodoCenterManage {
      */
     private void assemblyAuditNotify(Long userId, Project project, String msg) {
         Notify notify = new Notify();
-        notify.setTitle(msg);
+        notify.setTitle(AUDIT_WORK_TITLE);
         notify.setUserId(userId);
         notify.setType(MsgTypeEnum.PROJECT_REVIEW.name());
         notify.setInstanceId(project.getInstCode());