Merge remote-tracking branch 'origin/master'

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

@@ -263,7 +263,7 @@ public class HandlerManage {
         // 审批流程不是申请延期和申请借阅,需调用状态机
         if (!InstTypeEnum.APPLY_DELAY.getCode().equals(instType) && !InstTypeEnum.APPLY_BORROW.getCode().equals(instType)) {
             // 更新项目状态和流程状态
-            updateRejectProjectStatus(userId, declaredProject);
+            updateRejectProjectStatus(userId, declaredProject, instType);
         }
         //发送消息
         noticeManage.sendNotice(instance.getStartUserId(),userId,declaredProject,instance.getProcessDefinitionName(),
@@ -373,14 +373,20 @@ public class HandlerManage {
      *
      * @param userId
      * @param declaredProject
+     * @param instType
      * @return void
      * @author CMM
      * @since 2023/02/08
      */
-    private void updateRejectProjectStatus(Long userId, Project declaredProject) {
+    private void updateRejectProjectStatus(Long userId, Project declaredProject, Integer instType) {
         stateMachineUtils.reject(declaredProject);
         declaredProject.setUpdateOn(LocalDateTime.now());
         declaredProject.setUpdateBy(userId);
+        // 如果是预审审批驳回,需要重新盖章，原来盖过章的文件要清空
+        if (InstTypeEnum.PRELIMINARY_PREVIEW.getCode().equals(instType)){
+            declaredProject.setPretrialFileId(null);
+            declaredProject.setPretrialFileName(null);
+        }
         projectService.updateById(declaredProject);
     }