From f65755b470bcb7f708d176f77144261b04de1c51 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 5 Sep 2021 10:30:54 +0800 Subject: [PATCH 1/2] commit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 56419203..73534336 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 @@ -226,12 +226,12 @@ public class ScheduledJob { if (!DTBJHStr.equals("")){ String[] DTBJHArray = DTBJHStr.split(","); for (String DTBJH : DTBJHArray) { - String[] sortOrNumberAndYear = DTBJH.split("\\s+"); - String sort = sortOrNumberAndYear[0]; + String[] sortAndNumberAndYear = DTBJH.split("\\s+"); + String sort = sortAndNumberAndYear[0]; - String[] numberOrYear = sortOrNumberAndYear[1].split("\\-"); - String number=numberOrYear[0]; - String year=numberOrYear[1]; + String[] numberAndYear = sortAndNumberAndYear[1].split("\\-"); + String number=numberAndYear[0]; + String year=numberAndYear[1]; QueryWrapper infoWrapper = new QueryWrapper<>(); infoWrapper.select("ID") From 307e6ddd85fecefcf5f676654017d1a01998572a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 6 Sep 2021 14:29:04 +0800 Subject: [PATCH 2/2] commit --- .../mybatis/mapper/standardSplit/SarStandFileEOMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 3d7f4b6b..c36b52f1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -308,7 +308,6 @@ and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType} - GROUP BY STAND_ID order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a