LY 预约票到时间自动作废

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -50,7 +50,7 @@ public class ActivitiConfig {
         configuration.setDataSource(dataSource);
         configuration.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE);
         configuration.setDbIdentityUsed(false);
-        configuration.setAsyncExecutorActivate(false);
+        configuration.setAsyncExecutorActivate(true);
         configuration.setActivityFontName("宋体");
         configuration.setAnnotationFontName("宋体");
         configuration.setLabelFontName("宋体");

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -307,14 +307,14 @@ public class TReportHiYlrqController extends BaseController {
                 pdfName = FileUtils.isValidFilenameAndReplace(pdfName); //验证合规
                 // 生成PDF文件
                 PDFTemplateUtil.createPdf("yearYlrqFMaker.ftl", pdfName,
-                        RuoYiConfig.getProfile() + "/reportHiYlrq/" + now,
+                        RuoYiConfig.getProfile() + "/reportHiYlrq/",
                         "file:/" + RuoYiConfig.getProfile(), map, response);
                 tReportHiYlrq.setReportUrl(pdfName);
                 this.tReportHiYlrqService.updateTReportHiYlrq(tReportHiYlrq);
                 list.add(pdfName);
                 //PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
             }
-            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHiYlrq/", now + "", year + "年压力容器年度检查历史报告.zip", list, response);
+            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHiYlrq/",  "", year + "年压力容器年度检查历史报告.zip", list, response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

master/src/main/resources/application.yml

@@ -53,6 +53,8 @@ spring:
     db-identity-used: true
     history-level: full
     db-history-used: true
+    #启用异步执行器
+    job-executor-activate: true
   freemarker:
     checkTemplateLocation: false
     classic-compatible: true

master/src/main/resources/processes/reserveInvoice.bpmn

@@ -7,7 +7,7 @@
         <activiti:taskListener event="create" delegateExpression="${yhzgTaskCreateListener}"></activiti:taskListener>
       </extensionElements>
     </userTask>
-    <userTask id="zzzgtask" name="装置主管签字确认"  activiti:candidateUsers="#{zzzgusers}">
+    <userTask id="zzzgtask" name="装置主管签字确认" activiti:candidateUsers="#{zzzgusers}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${zzzgTaskCreateListener}"></activiti:taskListener>
       </extensionElements>
@@ -59,9 +59,6 @@
         <activiti:executionListener event="start" delegateExpression="${invoiceEndFailListener}"></activiti:executionListener>
       </extensionElements>
     </endEvent>
-    <sequenceFlow id="flow24" name="不通过" sourceRef="yhzgtask" targetRef="end1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
-    </sequenceFlow>
     <sequenceFlow id="flow25" name="不通过" sourceRef="zzzgtask" targetRef="end1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
@@ -71,6 +68,32 @@
     <sequenceFlow id="flow27" name="不通过" sourceRef="zzjltask" targetRef="end1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
+    <boundaryEvent id="boundarytimer3" name=" " attachedToRef="zzzgtask" cancelActivity="true">
+      <timerEventDefinition>
+        <timeDuration>PT2M</timeDuration>
+      </timerEventDefinition>
+    </boundaryEvent>
+    <sequenceFlow id="flow30" sourceRef="boundarytimer3" targetRef="end1"></sequenceFlow>
+    <boundaryEvent id="boundarytimer4" name=" " attachedToRef="zzgcstask" cancelActivity="true">
+      <timerEventDefinition>
+        <timeDuration>PT2M</timeDuration>
+      </timerEventDefinition>
+    </boundaryEvent>
+    <boundaryEvent id="boundarytimer5" name=" " attachedToRef="zzjltask" cancelActivity="true">
+      <timerEventDefinition>
+        <timeDuration>PT2M</timeDuration>
+      </timerEventDefinition>
+    </boundaryEvent>
+    <sequenceFlow id="flow32" sourceRef="boundarytimer5" targetRef="end1"></sequenceFlow>
+    <boundaryEvent id="boundarytimer6" name=" " attachedToRef="yhzgtask" cancelActivity="true">
+      <timerEventDefinition>
+        <timeDuration>PT2M</timeDuration>
+      </timerEventDefinition>
+    </boundaryEvent>
+    <sequenceFlow id="flow35" sourceRef="boundarytimer6" targetRef="end1"></sequenceFlow>
+    <sequenceFlow id="flow36" name="不通过" sourceRef="yhzgtask" targetRef="end1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_reserveInvoice">
     <bpmndi:BPMNPlane bpmnElement="reserveInvoice" id="BPMNPlane_reserveInvoice">
@@ -80,15 +103,27 @@
       <bpmndi:BPMNShape bpmnElement="yhzgtask" id="BPMNShape_yhzgtask">
         <omgdc:Bounds height="55.0" width="145.0" x="465.0" y="121.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="boundarytimer6" id="BPMNShape_boundarytimer6">
+        <omgdc:Bounds height="30.0" width="30.0" x="450.0" y="160.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzzgtask" id="BPMNShape_zzzgtask">
         <omgdc:Bounds height="55.0" width="145.0" x="465.0" y="211.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="boundarytimer3" id="BPMNShape_boundarytimer3">
+        <omgdc:Bounds height="30.0" width="30.0" x="450.0" y="250.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzgcstask" id="BPMNShape_zzgcstask">
         <omgdc:Bounds height="71.0" width="136.0" x="282.0" y="301.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="boundarytimer4" id="BPMNShape_boundarytimer4">
+        <omgdc:Bounds height="30.0" width="30.0" x="320.0" y="290.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="zzjltask" id="BPMNShape_zzjltask">
         <omgdc:Bounds height="71.0" width="136.0" x="102.0" y="421.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="boundarytimer5" id="BPMNShape_boundarytimer5">
+        <omgdc:Bounds height="30.0" width="30.0" x="180.0" y="410.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
         <omgdc:Bounds height="35.0" width="35.0" x="520.0" y="559.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
@@ -105,7 +140,7 @@
         <omgdi:waypoint x="537.0" y="176.0"></omgdi:waypoint>
         <omgdi:waypoint x="537.0" y="211.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="24.0" x="537.0" y="176.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="24.0" x="537.0" y="176.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
@@ -113,7 +148,7 @@
         <omgdi:waypoint x="169.0" y="576.0"></omgdi:waypoint>
         <omgdi:waypoint x="520.0" y="576.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="24.0" x="170.0" y="492.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="24.0" x="170.0" y="492.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13">
@@ -124,35 +159,35 @@
         <omgdi:waypoint x="537.0" y="266.0"></omgdi:waypoint>
         <omgdi:waypoint x="537.0" y="316.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="24.0" x="537.0" y="266.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="24.0" x="537.0" y="266.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow19" id="BPMNEdge_flow19">
         <omgdi:waypoint x="517.0" y="336.0"></omgdi:waypoint>
         <omgdi:waypoint x="418.0" y="336.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="493.0" y="336.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="16.0" x="493.0" y="336.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow20" id="BPMNEdge_flow20">
         <omgdi:waypoint x="537.0" y="356.0"></omgdi:waypoint>
         <omgdi:waypoint x="537.0" y="436.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="537.0" y="356.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="16.0" x="537.0" y="356.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow21" id="BPMNEdge_flow21">
         <omgdi:waypoint x="537.0" y="476.0"></omgdi:waypoint>
         <omgdi:waypoint x="537.0" y="559.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="537.0" y="476.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="16.0" x="537.0" y="476.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow22" id="BPMNEdge_flow22">
         <omgdi:waypoint x="517.0" y="456.0"></omgdi:waypoint>
         <omgdi:waypoint x="238.0" y="456.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="493.0" y="459.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="16.0" x="493.0" y="459.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow23" id="BPMNEdge_flow23">
@@ -160,22 +195,14 @@
         <omgdi:waypoint x="349.0" y="456.0"></omgdi:waypoint>
         <omgdi:waypoint x="517.0" y="456.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="24.0" x="350.0" y="372.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow24" id="BPMNEdge_flow24">
-        <omgdi:waypoint x="465.0" y="148.0"></omgdi:waypoint>
-        <omgdi:waypoint x="170.0" y="148.0"></omgdi:waypoint>
-        <omgdi:waypoint x="170.0" y="221.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="36.0" x="405.0" y="149.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="24.0" x="350.0" y="372.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow25" id="BPMNEdge_flow25">
         <omgdi:waypoint x="465.0" y="238.0"></omgdi:waypoint>
         <omgdi:waypoint x="188.0" y="238.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="36.0" x="405.0" y="242.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="36.0" x="405.0" y="242.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow26" id="BPMNEdge_flow26">
@@ -183,16 +210,40 @@
         <omgdi:waypoint x="350.0" y="238.0"></omgdi:waypoint>
         <omgdi:waypoint x="188.0" y="238.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="36.0" x="314.0" y="268.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="100.0" x="221.0" y="250.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow27" id="BPMNEdge_flow27">
         <omgdi:waypoint x="170.0" y="421.0"></omgdi:waypoint>
         <omgdi:waypoint x="170.0" y="256.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="36.0" x="170.0" y="400.0"></omgdc:Bounds>
+          <omgdc:Bounds height="48.0" width="36.0" x="180.0" y="345.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow30" id="BPMNEdge_flow30">
+        <omgdi:waypoint x="465.0" y="250.0"></omgdi:waypoint>
+        <omgdi:waypoint x="445.0" y="238.0"></omgdi:waypoint>
+        <omgdi:waypoint x="188.0" y="238.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow32" id="BPMNEdge_flow32">
+        <omgdi:waypoint x="180.0" y="425.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="405.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="256.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow35" id="BPMNEdge_flow35">
+        <omgdi:waypoint x="465.0" y="160.0"></omgdi:waypoint>
+        <omgdi:waypoint x="439.0" y="149.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="149.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="221.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow36" id="BPMNEdge_flow36">
+        <omgdi:waypoint x="465.0" y="148.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="148.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="221.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="100.0" x="273.0" y="130.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

ui/src/views/dashboard/productProportion.vue

@@ -88,8 +88,8 @@ export default {
   mounted() {
     this.getList()
     // 每隔30秒请求一次数据
-    window.setInterval(() => {undefined
-      setTimeout(() => {undefined
+    window.setInterval(() => {
+      setTimeout(() => {
         ///调取接口获取数据
         this.getList();
       }, 0)

ui/src/views/front/productProportion.vue

@@ -44,7 +44,10 @@ export default {
     window.setInterval(() => {
       setTimeout(() => {
         ///调取接口获取数据
-        this.initChart();
+        this.$nextTick(() => {
+          this.initChart();
+        })
+
       }, 0)
     }, 20000)
   },

ui/src/views/tool/gen/index.vue

@@ -76,6 +76,7 @@
           v-hasPermi="['tool:gen:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>