From c8676cdf4abe0a25a9bed24468433903a7bab989 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 7 Jan 2022 14:19:47 +0800 Subject: [PATCH 1/8] commit comment --- .../service/impl/QualityEvaluationServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index e721dc00..f909068e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -135,6 +135,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl page = new Page<>(1, 1000); + /** + * 查询得到 每个流程节点的质量评分 和 动态评分值 (已经计算了打分权重,之后汇总计算流程节点权重) + */ List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); // return list.stream() // .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, @@ -152,7 +155,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl Date: Fri, 7 Jan 2022 15:13:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E7=94=A8=E6=88=B7=20?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AF=84=E5=88=86=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9C=80=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityEvaluationMapper.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index e0ca3281..991027a6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -55,7 +55,13 @@ LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID LEFT JOIN evaluation_index AS `index` ON `index`.id = quality_evaluation.evaluation_index ${ew.customSqlSegment} - + AND create_time IN ( + SELECT + MAX(create_time) + FROM + quality_evaluation + ${ew.customSqlSegment} + ) ORDER BY `index`.index_sort From 9791fd13e95839fe3d7910691e50cb301548ee00 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 7 Jan 2022 17:10:21 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 28 +++++++++++++++++++ .../SarStandardsInfoController.java | 6 ++-- .../da/utils/util/SarAdvanceSearchUtil.java | 3 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..8cd3b549 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -281,5 +281,33 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index b94c7bbf..c670d718 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -99,7 +99,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -137,7 +137,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -216,7 +216,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 72b2f6bc..9a090ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -85,9 +85,8 @@ public class SarAdvanceSearchUtil { * @param searchVOList * @return */ - public static String createStandSql(List searchVOList) { + public static String createStandSql(List searchVOList,String tableName) { String sqlInfo = ""; - String tableName="SAR_STAND_ATTR_INFO."; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { From 557a9f756c4fcaab43dee09d6fa302fdd50f29db Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 10 Jan 2022 12:49:56 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=98=E5=85=A5?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=9C=A8=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90=E5=86=85?= =?UTF-8?q?,=E6=9F=A5=E8=AF=A2=E9=A2=84=E8=AD=A6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E5=B7=B2=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 2 +- .../mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 9424c392..d5e3f78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -130,7 +130,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; + String pattern = term.getTermStr(); Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index e8abcc3b..df21aa40 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -205,6 +205,7 @@ POWER = '1' AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') @@ -249,6 +250,7 @@ POWER = '1' AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%') From 7594824a7616f87d791b16dfcdbeb16db74c1866 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 10 Jan 2022 17:54:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 2 +- .../entity/SarBussionessStandEOPage.java | 40 +++++++++++++++++++ .../da/utils/util/SarAdvanceSearchUtil.java | 3 +- .../SarBussionessStandMapper.xml | 20 +++++++++- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 8cd3b549..89d52e3c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -232,7 +232,7 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 0fc3aec2..ba950ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -22,6 +22,13 @@ public class SarBussionessStandEOPage extends BasePage { this.textStatusBuss = textStatusBuss; } + private String startIssueTime; + private String endIssueTime; + private String startPutTime; + private String endPutTime; + + + private String modifyTime; private String modifyTime1; private String modifyTime2; @@ -1130,4 +1137,37 @@ public class SarBussionessStandEOPage extends BasePage { public void setSql(String sql) { this.sql = sql; } + + public String getStartIssueTime() { + return startIssueTime; + } + + public void setStartIssueTime(String startIssueTime) { + this.startIssueTime = startIssueTime; + } + + public String getEndIssueTime() { + return endIssueTime; + } + + public void setEndIssueTime(String endIssueTime) { + this.endIssueTime = endIssueTime; + } + + + public String getStartPutTime() { + return startPutTime; + } + + public void setStartPutTime(String startPutTime) { + this.startPutTime = startPutTime; + } + + public String getEndPutTime() { + return endPutTime; + } + + public void setEndPutTime(String endPutTime) { + this.endPutTime = endPutTime; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 9a090ca9..1b872090 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -81,11 +81,12 @@ public class SarAdvanceSearchUtil { /** - * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * 国内外标准高级查询 对tableName表自定义字段生成条件语句 * @param searchVOList * @return */ public static String createStandSql(List searchVOList,String tableName) { + tableName=tableName+"."; String sqlInfo = ""; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 982af830..32e525f5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -465,9 +465,27 @@ and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} - -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + + and DATE_FORMAT(put_time,'%Y-%m-%d') >= #{startPutTime} + + + and DATE_FORMAT(put_time,'%Y-%m-%d') <= #{endPutTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') >= #{startIssueTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') <= #{endIssueTime} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in From 1b2c595f50b9186e1f4e6dec817eed8789b820b8 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 10 Jan 2022 20:48:41 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandWarning/EarlyWraningEOMapper.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index df21aa40..494904e7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -112,10 +112,11 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID - LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX + LEFT JOIN ts_dictype as dicType on (attr.CLLX = dicType.DIC_TYPE_CODE AND attr.CLLX !=null AND attr.CLLX != '') POWER = '1' AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND warning.ID @@ -148,12 +149,13 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID - LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID + LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID - LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC + LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '') POWER = '1' AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' AND warning.ID @@ -169,10 +171,11 @@ WARNING_RESULT LEFT JOIN ( - SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date - GROUP BY warning_date.law_id + SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date + GROUP BY warning_date.law_id,item_id ) warning_date ON warning_date.law_id = WARNING_RESULT.STAND_ID + AND warning_date.item_id = WARNING_RESULT.ITEMS_ID ORDER BY warning_date.SSRQ_MIN From bf0d4c2106ff2d4ace42a0ff9d28cb974235aea3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 10:14:35 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index a55a303a..3fe43621 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -39,11 +39,8 @@ left join ts_user on ts_user.USID=sar_public_idea_all.user_id left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID WHERE sar_public_idea_all.idea_id = #{cid} - - and sar_public_idea_all.wk_flag is null - - and sar_public_idea_all.wk_flag ='1' + and sar_public_idea_all.wk_flag ='1' and sar_public_idea_all.state in ('1','2') ORDER BY part_code ASC From 914d2c3d067daa52728e8dd963f1dc54868e07bd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 11:08:14 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=9A=E5=90=8E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E4=B8=80=E5=B0=8F=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Timer/ProcessTimer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index f37f251e..b050bba0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -186,7 +186,8 @@ public class ProcessTimer { } } - @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 +// @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 + @Scheduled(cron = "0 0 * * * ？ ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>();