Selaa lähdekoodia

线程处理签章完成后前端无反应初步处理

user5 3 vuotta sitten
vanhempi
commit
2cec5e8175

+ 2 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -649,7 +649,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         List<User> userList = new ArrayList<>();
         if(!state) {
             users.add(projectApprovalSignature.getCreateBy());
-            projectApprovalSignature.setStatus(ProjectStatusEnum.SIGNED.getValue());
+            projectApprovalSignature.setStatus(ProjectStatusEnum.TSTORE.getValue());
             WorkProjectNotify notify = new WorkProjectNotify();
             notify.setNotifyId(projectApprovalSignature.getId());
             userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1382,6 +1382,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             WorkProjectNotify notify = new WorkProjectNotify();
             notify.setNotifyId(projectApprovalSignature.getId());
             userList = workProjectNotifyService.readByNotifyId(notify);
+            projectApprovalSignature.setStatus(ProjectStatusEnum.TSTORE.getValue());
             //审核完成提示框
            /* String title = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记完成";
             String content = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记完成,项目编号:"+ruralProjectRecords.getProjectId();

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -1844,7 +1844,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             WorkProjectNotify notify = new WorkProjectNotify();
             notify.setNotifyId(projectReportData.getId());
             userList = workProjectNotifyService.readByNotifyId(notify);
-            projectReportData.setStatus("5");
+            projectReportData.setStatus("1");
             /*if ("yes".equals(flag)) {
                 String titleStr = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";
                 String content = "项目【"+projectRecords.getProjectName()+"】报告质量复核审批通过";

+ 2 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/ApprovalThread.java

@@ -188,7 +188,8 @@ public class ApprovalThread extends Thread {
                 notification(bool,disposeResult,"","","");
             }
         }catch (Exception e){
-
+            bool = false;
+            notification(bool,disposeResult,"","","");
         }finally {
             if(StringUtils.isNotBlank(deleteFile)){
                 //根据路径创建文件对象

+ 2 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/JudgementThread.java

@@ -180,7 +180,8 @@ public class JudgementThread extends Thread {
                 notification(bool,disposeResult,"","","");
             }
         }catch (Exception e){
-
+            bool = false;
+            notification(bool,disposeResult,"","","");
         }finally {
             if(StringUtils.isNotBlank(deleteFile)){
                 //根据路径创建文件对象

+ 2 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/SignatureThread.java

@@ -181,7 +181,8 @@ public class SignatureThread extends Thread {
                 notification(bool,disposeResult,"","","");
             }
         }catch (Exception e){
-
+            bool = false;
+            notification(bool,disposeResult,"","","");
         }finally {
             if(StringUtils.isNotBlank(deleteFile)){
                 //根据路径创建文件对象

+ 6 - 2
src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -700,9 +700,13 @@
 
 	<update id="update">
 		UPDATE project_report_data SET
-			update_by = #{updateBy.id}
+			remarks = #{remarks}
+		<if test="updateBy != null and updateBy.id != null and updateBy.id != ''">
+			,update_by = #{updateBy.id}
+		</if>
+		<if test="updateBy != null and updateDate != ''">
 			,update_date = #{updateDate}
-			,remarks = #{remarks}
+		</if>
 			,company_id = #{companyId}
 			,office_id = #{officeId}
 			,project_id = #{project.id}