外部单位-意见反馈通知调整

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitCapitalDemandService.java

@@ -143,6 +143,12 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
         long s6=System.currentTimeMillis();
         List<User> users = new ArrayList<>();
         List<User> wjbc = new ArrayList<>();
+        if (StringUtils.isNotBlank(capitalDemand.getId())){
+            //通知添加流程实例ID
+            WorkProjectNotify notify = new WorkProjectNotify();
+            notify.setNotifyId(capitalDemand.getId());
+            workProjectNotifyService.readByNotifyId(notify);
+        }
         //文件补充审核
         User user1 = UserUtils.get(capitalDemand.getExaminer());
         wjbc.add(user1);
@@ -221,10 +227,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
         // 更新流程实例ID
         capitalDemand.setProcessInstanceId(processInstance.getId());
         capitalDemandDao.updateProcessInstanceId(capitalDemand);
-        //通知添加流程实例ID
-        WorkProjectNotify notify = new WorkProjectNotify();
-        notify.setNotifyId(capitalDemand.getId());
-        workProjectNotifyService.readByNotifyId(notify);
+
         workProjectNotify.setProcessInstanceId(processInstance.getId());
         workProjectNotify.setWapBeginDate(new Date());
         workProjectNotifyService.save(workProjectNotify);

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitFeedbackService.java

@@ -226,6 +226,12 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
             User user = UserUtils.get(s);
             jyfk.add(user);
         }
+        //列表页面重新申请时需要先消除掉通知
+        if (StringUtils.isNotBlank(feedback.getId())){
+            WorkProjectNotify notify = new WorkProjectNotify();
+            notify.setNotifyId(feedback.getId());
+            workProjectNotifyService.readByNotifyId(notify);
+        }
 
         long s7=System.currentTimeMillis();
         if (StringUtils.isNotBlank(workActivityMenu.getId())) {
@@ -303,10 +309,6 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
         feedback.setProcessInstanceId(processInstance.getId());
         feedbackDao.updateProcessInstanceId(feedback);
         //通知添加流程实例ID
-        //列表页面重新申请时需要先消除掉通知
-        WorkProjectNotify notify = new WorkProjectNotify();
-        notify.setNotifyId(feedback.getId());
-        workProjectNotifyService.readByNotifyId(notify);
         workProjectNotify.setProcessInstanceId(processInstance.getId());
         workProjectNotify.setWapBeginDate(new Date());
         workProjectNotifyService.save(workProjectNotify);