From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001 From: dy <dingyang@lnfxkj.tech> Date: 星期六, 19 四月 2025 11:14:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java index 857c706..ca35630 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java @@ -1,9 +1,16 @@ package com.aps.job.task; import com.aps.common.core.utils.StringUtils; +import com.aps.job.param.ApsWorkOrderJobParam; +import com.aps.job.service.IApsWorkOrderJobService; import com.aps.job.service.IApsWorkOrderProcessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; /** * 瀹氭椂浠诲姟璋冨害娴嬭瘯 @@ -16,6 +23,10 @@ @Autowired private IApsWorkOrderProcessService iApsWorkOrderProcessService; + + @Autowired + private IApsWorkOrderJobService iApsWorkOrderJobService; + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); @@ -38,4 +49,46 @@ { iApsWorkOrderProcessService.syncWorkOrderProcessData(); } + + /** + * 姣忔棩鍚屾闆朵欢宸ュ崟鏁版嵁 + * */ + public void syncPartOrderData () + { + + iApsWorkOrderJobService.syncPartOrderData(); + } + + /** + * 姣忔棩鍚屾鎵�鏈夊伐鍗曟暟鎹� + * */ + public void syncWorkOrderData() + { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime today = LocalDateTime.now(); + LocalDate yesterday = LocalDate.now().minusDays(1); + LocalDateTime yesterdayMidnight = yesterday.atStartOfDay(); + boolean continueFlag = true; + Integer currentPage = 1; + ApsWorkOrderJobParam param=new ApsWorkOrderJobParam(); + param.setPageIndex(currentPage); + param.setDocState(Arrays.asList(0,1,2,4)); + param.setBeginDate(yesterdayMidnight.format(formatter)); + param.setEndDate(today.format(formatter)); + param.setPageSize(1000); + while (continueFlag){ + param.setPageIndex(currentPage); + continueFlag= iApsWorkOrderJobService.batchSaveByPager(param); + currentPage++; + } + } + + /** + * 灏嗗伐鍗曞伐搴忔暟鎹悓姝ュ埌涓氬姟琛ㄤ腑 + */ + public void insertIntoApsProcessRoute() + { + iApsWorkOrderProcessService.deleteApsProcessRoute(); + iApsWorkOrderProcessService.insertIntoApsProcessRoute(); + } } -- Gitblit v1.9.3