#2679: [Bug] [API-9558]fix homepage task instance count method to use submit time to recount (#9559)

* fix homepage task instance count method to use submit time to recount * fix homepage task instance count method to use submit time to recount * fix homepage task instance count method to use submit time to recount * fix homepage task instance count method JUNIT * fix homepage task instance count method JUNIT * fix homepage task instance count method JUNIT
3 years ago · 370468a126
2 changed files with 129 additions and 90 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit efe04863a09c2b951fedd05f4268d988c6bbfe43
+Subproject commit c5b7e5adff40988f3dfd4f75dddb0b597509fff4
--- a/commit.yml
+++ b/commit.yml
@ -2,94 +2,133 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-ui-next:
+  /dolphinscheduler-api:
-    newFile: !uuid '17ea17f9f9db2e3aa845e4c77bb7113e6b86a16e'
+    newFile: !uuid '326ac517be092152fc66086997888cc75d8b411d'
-    oldFile: !uuid '324c4f69911a19ac1e5050ac889310c552cb13ab'
+    oldFile: !uuid '19f06d93c6b416eabebec480ae716c23774ec0f8'
-  /dolphinscheduler-ui-next/package.json:
+  /dolphinscheduler-api/src:
-    newFile: !uuid 'c004ad58a21c89d8910b525efb49c4fe465c53ba'
+    newFile: !uuid 'ae137d0cea24e807077431dc7fa5b502233798fc'
-    oldFile: !uuid '04bcb2c52715afff81279a9e38670e41a83a0cf2'
+    oldFile: !uuid 'fe838c82151ad97c8ba0e3f8736d9558e33c4f62'
-  /dolphinscheduler-ui-next/pnpm-lock.yaml:
+  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'c5eabb63e868051ed8267abdd6a9d1fa64a2a4dd'
+    newFile: !uuid '349baf9e833a04b3f4702384d6345d85d5be7717'
-    oldFile: !uuid '1906d516a5baeb3bbeaf1737113d20001b03917d'
+    oldFile: !uuid '3a0238d69f9d44fa943080f2dfb223079f237afb'
-  /dolphinscheduler-ui-next/src:
+  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '183ff652f8dd2fca3d0e46ddf4e4df8d7593ff5d'
+    newFile: !uuid '7e32c49ee1f5457f104a297bd8c9e33bd7850eb3'
-    oldFile: !uuid '4e5fce0026db494f2817835f8961670e9f087722'
+    oldFile: !uuid '25f8c5e469f6b9ff071ed6c752612cb26dbdcfc7'
-  /dolphinscheduler-ui-next/src/components:
+  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid 'c924c72ba812ff77d15fe3dc36697e7dcbc6e6e1'
+    newFile: !uuid '25b1faa983fef720fcc714ce1bb4c03daecd36a6'
-    oldFile: !uuid 'c71ef542f7499eb51fcb40d2e97de2dbd318833f'
+    oldFile: !uuid '12321062f76291a967b0eaf1db59ff19aa034502'
-  /dolphinscheduler-ui-next/src/components/log-modal:
+  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '4f6048fdc63790f49b2ba4439c793fd89c563669'
+    newFile: !uuid 'db0748bfa1543b8881f51d9044c25f50f8a14232'
-    oldFile: null
+    oldFile: !uuid '1ba21449491cbf182b9a3096c7b770ee6eaac389'
-  /dolphinscheduler-ui-next/src/components/log-modal/index.tsx:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '003ef6ce7f05a22ae464df1131d08683751f5f6c'
+    newFile: !uuid 'dd56988d588988fc0792b9fede74eaddd1bda9c7'
-    oldFile: null
+    oldFile: !uuid '3d7b6ee03cfca86c8162354c3fd28dfdfbf57f77'
-  /dolphinscheduler-ui-next/src/locales:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'e224bbd341c5ee5389a7fb9e69473510eefa5031'
+    newFile: !uuid '84c70986c5243e073bef538b5622bf056e0339f5'
-    oldFile: !uuid '554840a43a0c1f306f6132cb1e03f52c626b9b25'
+    oldFile: !uuid '9f151f4331a3801662e1e9bef129045d48756187'
-  /dolphinscheduler-ui-next/src/locales/modules:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '584124f02a98abc09c768e461c2fed4132534cdd'
+    newFile: !uuid 'ef0bd70ced235761eb767de53fdad0402c1d6638'
-    oldFile: !uuid '64f3ed6c3a04e1a10600f946c8c69cef445c2649'
+    oldFile: !uuid 'b40c3ff937d2a26db13b0318b0b3cdff8eb5721d'
-  /dolphinscheduler-ui-next/src/locales/modules/en_US.ts:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java:
-    newFile: !uuid '4d2dd871ce92bed875c2ee406f00aae1d067c57b'
+    newFile: !uuid 'cb4639acfc8915a1aff1b937acd7530303c4bb63'
-    oldFile: !uuid 'bea83ba51ca5c17104d48e2af8aaa32a109d2a3d'
+    oldFile: !uuid '80810ed40e1a87c9e1c19c8b65d4972b561f796e'
-  /dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'a03aba3bc90e4ef3e99c437c0b6cea909dab49c1'
+    newFile: !uuid '2c20b058908fbea055db7ff83f875cbe5e21b66a'
-    oldFile: !uuid '4d96a4d10fef2faa73a2cf4a2f4bb8ee78839236'
+    oldFile: !uuid 'deee44fe59b3775d36348e62ff2418ce03ffedce'
-  /dolphinscheduler-ui-next/src/views:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java:
-    newFile: !uuid '767afe28b3bb71128e58b2f1ff3c3e5991ab5b54'
+    newFile: !uuid '88449a49f081d76369a51971abbb036db456294c'
-    oldFile: !uuid 'c65a28c761a86727795b3e8b1a9ca016dc45454f'
+    oldFile: !uuid '6617207a99a4c19e0c0a6426be81fe6b3e0e9c2e'
-  /dolphinscheduler-ui-next/src/views/projects:
+  /dolphinscheduler-dao:
-    newFile: !uuid 'c4d63c682294b716d73c794529bf47baf4195dfe'
+    newFile: !uuid '2352d584441f2c9a109280eefa613adc0cad7d81'
-    oldFile: !uuid 'e2310adb2bbb25be752938961a666ea55ca6f1f8'
+    oldFile: !uuid 'c589cfd8c2766f59ef853346e0f64608179f30a8'
-  /dolphinscheduler-ui-next/src/views/projects/task:
+  /dolphinscheduler-dao/src:
-    newFile: !uuid 'd4e27e819b832abfdad213c9f60837167d68ed01'
+    newFile: !uuid '97653af5b14863a7a00531de77f6a871e5ec0d55'
-    oldFile: !uuid 'f7f61aa618b8664d008b545cf2a27568042f8709'
+    oldFile: !uuid 'eb43a46e6bd54a8dcdbb86341a87622f932abf4b'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance:
+  /dolphinscheduler-dao/src/main:
-    newFile: !uuid '4128e91d05232291515b21c193f87730db03726f'
+    newFile: !uuid '12300b5734619147789d375817394ee5c1f84ec1'
-    oldFile: !uuid '37c1fd6b0cd750e99ac8e8b1ac69a37b79c08039'
+    oldFile: !uuid '7106f3baa56a51f91db66a6db8caebdb5fc5546a'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance/components:
+  /dolphinscheduler-dao/src/main/java:
-    newFile: null
+    newFile: !uuid '9ebfcb6b55fd584a59c17db667e1b3fc9bb64b66'
-    oldFile: !uuid 'f19ec151293407b5cf03b60999e1e10d1182aab2'
+    oldFile: !uuid '25456690a4f06bd652b23254e64983e34cdc406e'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance/components/log-modal.tsx:
+  /dolphinscheduler-dao/src/main/java/org:
-    newFile: null
+    newFile: !uuid '7100f7a8fa395d051ede38a8558c5434a36b3b5a'
-    oldFile: !uuid '4c261d43123d82bc97671e0e4628377497e81a02'
+    oldFile: !uuid '9dcced97394c39f76f33557fc2920c222263cb3c'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance/components/use-modal.ts:
+  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: null
+    newFile: !uuid 'ed4cd4307c5b75af6d0f2182ea8ad50fa61b4367'
-    oldFile: !uuid 'd3fd8909b3ff3bfb8ab159d21f4978850dc23b3f'
+    oldFile: !uuid '495a01b186f9826c0d9b3c0883a25aa7e2cbfe9c'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance/index.tsx:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '43ca17afbde2d5b5b6ce7d4e4d3ea894832aab9a'
+    newFile: !uuid 'd62db337304540ebe0d8dad182e9fbfe7324977d'
-    oldFile: !uuid '680bb7f031fe1a6b6441314f00f4287a4f6d50f8'
+    oldFile: !uuid '44df2428a7d4e6ec4abf262e22428267511d8310'
-  /dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '4a93978435d0059beebed14e7f032175ad59c07d'
+    newFile: !uuid '14d423789f5885456e4cb7ba1fc1ecc93e00ca02'
-    oldFile: !uuid '9e4ac335696e8aa2b43d22d1ac8ced6c0dc57de5'
+    oldFile: !uuid 'fcf1bc7f0a03b1727af1137272c9f67adaa426cb'
-  /dolphinscheduler-ui-next/src/views/projects/workflow:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'a647f43437f2694eed66092c07b50be58a70ff63'
+    newFile: !uuid '3cc2f57ec40fb621b7e410c9a793ebd94e9b37bb'
-    oldFile: !uuid '898ee9f9c286ca0038f9322fc10ad4fee27bb262'
+    oldFile: !uuid '4168a8c9497c6093b0072e283bb36ed01e63382c'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/components:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java:
-    newFile: !uuid '739943345ad18212b4be492d06b05f785702ad96'
+    newFile: !uuid 'f98996952d88af4269638fadc3ac05d99281548d'
-    oldFile: !uuid 'c290287fec3e7756e7c432ea5f29713e714ed889'
+    oldFile: !uuid 'a79a07ca27ccf5a5e784e2fcbb4f94fc559938c4'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag:
+  /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid '242d538e7e13daac15ff0c31d98c0255a6a5e0bf'
+    newFile: !uuid '37e5f03c4b7c0456aada92f91d81ab07fa585692'
-    oldFile: !uuid 'a5b25345204bf538ddcec93dda4720ffd8a1f552'
+    oldFile: !uuid 'a2490238e2fcb707174f6639aac7289d03a0f4cb'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/index.tsx:
+  /dolphinscheduler-dao/src/main/resources/org:
-    newFile: !uuid 'daa8d170df72aa1257a60c453dfe06a025eaedc1'
+    newFile: !uuid '72d9b8d90e6628339cde9c4664f5557a40fc2179'
-    oldFile: !uuid '77742986a9ee2e981dcfb6f75246d7572059ff8f'
+    oldFile: !uuid '9f4cdaeaee31ba87c0c2e347422ab968a7a2bae4'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-node-menu.ts:
+  /dolphinscheduler-dao/src/main/resources/org/apache:
-    newFile: !uuid '26d2d0c7a7226dd00c3f196f6a9f3fa26f6c4367'
+    newFile: !uuid '523bf2d3ff8e78957e7e266a9d5ed5eabbb8e614'
-    oldFile: !uuid '4848d8a052d592bd7cb2898fa97dcdc69693c4de'
+    oldFile: !uuid '9ea23074f1221f888270e80452779d8bdadf03c4'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/instance:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
-    newFile: !uuid 'b4d3c2dab2e3c869b58816c7e4501a5904754aa2'
+    newFile: !uuid 'ae4a0a076808c946a5ddbf64ff5af679b3cf9d60'
-    oldFile: !uuid '7145738ba3301df7125a9df3b80cd692d27564b1'
+    oldFile: !uuid 'e5ded487647b511d605c72f044c8ef4d93a16756'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/instance/components:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '3e6d9efe2946508389ce13303b58b5abb7621b16'
+    newFile: !uuid 'd1f43035afd262b28f076efaf35b224a2c8eb1b4'
-    oldFile: !uuid '46f9763df3ec206ce3d6b2902b40235426c86286'
+    oldFile: !uuid 'f9739ea500e820d565f26373f2eacc722f2252ce'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log-modal.tsx:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
-    newFile: null
+    newFile: !uuid 'b67bc722222737cbf748547f2e715577ea59b2e3'
-    oldFile: !uuid '3e352214ea557e86dfab35e1a24fbf0f0acb2ff9'
+    oldFile: !uuid 'bcaf232880208950b840e62afbfa8a6edbb0e022'
-  /dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/log.module.scss:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml:
-    newFile: null
+    newFile: !uuid 'adc470c1976d2f2ae500825691aa85796a95f9f8'
-    oldFile: !uuid '9ed171abd08ae137a3348b5f0f0ab791f6e9beca'
+    oldFile: !uuid '8ea8459cd43f9a88fd229e588ca041c11eebf612'
-gitCommitId: !uuid 'efe04863a09c2b951fedd05f4268d988c6bbfe43'
+  /dolphinscheduler-task-plugin:
    newFile: !uuid 'c95e179f8b4d71ff267622d38dfb2c06f5a9ab1c'
    oldFile: !uuid '9faa03daa9e996a80d58d6ee0b7a1e5b0bb18012'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api:
    newFile: !uuid '14fc9fc5bceb68a24b8c27b39777e21203513f07'
    oldFile: !uuid '9736b536380f429d5636c683e23c4f724df1b0b3'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src:
    newFile: !uuid 'b3499934a78d4fadafb4ea0bc9f0780fd8328d98'
    oldFile: !uuid '72285a65a03096117bd57a1f7ee788b07b5430d9'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main:
    newFile: !uuid '72a911035ed4a1ed90756e53d83329745aa6ee74'
    oldFile: !uuid '8ffe82423d7416048472cabd16fb9c1e71622f63'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java:
    newFile: !uuid '20a1434d330ff58ebef848454d153f18b14b25c7'
    oldFile: !uuid 'e915b5fa98b6a2714c456b7e04a695579a7bd1e2'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org:
    newFile: !uuid '5cb5df909b2936e407fc772959b3b69fd7e9d026'
    oldFile: !uuid '08868e0863c3df24766cc78f27a85cf7435c8033'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache:
    newFile: !uuid '01d60c530111f0285de1574bb91ce30fb8794b01'
    oldFile: !uuid 'c7bab64f50eeab2d40e592ecde355ac6dc8e4834'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler:
    newFile: !uuid 'e00c01107605d8c844b8669e48d579bda6537ed7'
    oldFile: !uuid 'e1257eb537c43a10f6368dbb7bf75090e1677ecb'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin:
    newFile: !uuid '6f28b32e0e581fcceb915a18ed730b6f882ede62'
    oldFile: !uuid 'a30e990e8aae7433f44e7732a0f7caf247f54cce'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task:
    newFile: !uuid '037d77dc7c374d2d2a4de2dd9e7a1fc0bb8de951'
    oldFile: !uuid '211bfbcf29de58169e9994c0d1352c337fc057af'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api:
    newFile: !uuid 'ff17d748b3631de0f1e6ac21e1a589a1f0b1f754'
    oldFile: !uuid '59137852767dcc1d4bf51ab3c908817d2fd522a1'
  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums:
    newFile: !uuid '73afc81c46672435ca396d1cdffed9cff8c74485'
    oldFile: !uuid '69a197ca1294039035bcbbe0313f38618c0aeb37'
  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java
  : newFile: !uuid '82c8db12d43ee8c99b21927722400e8a774bd419'
    oldFile: !uuid '8d2774c531d93aab0921262c0d9a6c50fec4e1f6'
 gitCommitId: !uuid 'c5b7e5adff40988f3dfd4f75dddb0b597509fff4'
 renames: {
  }
-revisionId: 2678
+revisionId: 2679
		`@ -1 +1 @@`
			`Subproject commit efe04863a09c2b951fedd05f4268d988c6bbfe43`				`Subproject commit c5b7e5adff40988f3dfd4f75dddb0b597509fff4`