审定内无文件前场bug修复

src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/JudgementThread.java

@@ -201,9 +201,9 @@ public class JudgementThread extends Thread {
                 //签章完成则进行数据的保存
                 //notification(bool,disposeResult,documentId,contractId,srcFileName);
             }else{
-                disposeResult = "审定单文件未找到，无法进行签章操作";
+                disposeResult = "审定单文件未找到，无文件签章";
                 bool = false;
-                notification(bool,disposeResult,"","","");
+                notFileNotification();
             }
         }catch (Exception e){
             if(StringUtils.isBlank(documentId)){
@@ -329,5 +329,55 @@ public class JudgementThread extends Thread {
 
 
     }
+
+    private void notFileNotification(){
+
+            //users.add(projectReportSignature.getCreateBy());
+            //审核完成提示框
+            String title = "报告号【"+projectReportData.getNumber()+"】审定（内）无签章文件签章完成。";
+            String content = "报告号【"+projectReportData.getNumber()+"】审定（内）无签章文件签章完成。";
+            if ("yes".equals(projectReportData.getAct().getFlag())) {
+                WorkProjectNotify notify = new WorkProjectNotify();
+                notify.setNotifyId(projectReportData.getId());
+                //userList = workProjectNotifyService.readByNotifyId(notify);
+                //users.add(projectReportSignature.getCreateBy());
+                workProjectNotifyService
+                        .save(UtilNotify
+                                .saveNotify(projectReportData.getId(),
+                                        projectReportData.getCreateBy(),
+                                        projectReportData.getCompanyId(),
+                                        title,
+                                        content,
+                                        "105",
+                                        "0",
+                                        "待通知",
+                                        "审批通过"));
+                workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
+
+            } else {
+                WorkProjectNotify notify = new WorkProjectNotify();
+                notify.setNotifyId(projectReportData.getId());
+                //userList = workProjectNotifyService.readByNotifyId(notify);
+                //users.add(projectReportSignature.getCreateBy());
+                if (StringUtils.isNotBlank(projectReportData.getStatus()) && !projectReportData.getStatus().equals("3")){
+                    workProjectNotifyService
+                            .save(UtilNotify
+                                    .saveNotify(projectReportData.getId(),
+                                            projectReportData.getCreateBy(),
+                                            projectReportData.getCompanyId(),
+                                            title,
+                                            content,
+                                            "105",
+                                            "0",
+                                            "待通知",
+                                            "审批通过"));
+                }
+                workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
+            }
+
+            projectReportData.setStatus("5");
+            dao.update(projectReportData);
+
+    }
 }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureCallBackController.java

@@ -342,6 +342,13 @@ public class RuralProjectSignatureCallBackController extends BaseController {
         }
         //修改签章信息
 
+        //签章完成则进行数据的保存
+        records.setQualitySignatureFlag(1);
+        records.setQualitySignatureDocumentId(presignCallBack.getDocumentId());
+        records.setQualitySignatureContractId(presignCallBack.getContractId());
+        records.setQualitySignatureUploadDate(new Date());
+        //修改签章对应信息文件
+        projectReportDataService.updateJudgementSignatureInfo(records);
         //发送通知
         String title = "报告号【"+projectReportData.getNumber()+"】审定（内）签章审批登记完成";
         String content = "报告号【"+projectReportData.getNumber()+"】审定（内）签章审批登记完成，项目编号："+records.getProjectId();
@@ -365,17 +372,10 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
             workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
 
-            //签章完成则进行数据的保存
-            records.setQualitySignatureFlag(1);
-            records.setQualitySignatureDocumentId(presignCallBack.getDocumentId());
-            records.setQualitySignatureContractId(presignCallBack.getContractId());
-            records.setQualitySignatureUploadDate(new Date());
-            //修改签章对应信息文件
-            projectReportDataService.updateJudgementSignatureInfo(records);
 
-            projectReportData.setStatus("5");
-            projectReportDataDao.update(projectReportData);
         }
+        projectReportData.setStatus("5");
+        projectReportDataDao.update(projectReportData);