FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!153
This commit is contained in:
super_liu
2021-09-06 15:04:21 +08:00
parent 465af62026 307e6ddd85
commit 5400f5c35d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+5 -5
View File
@@ -226,12 +226,12 @@ public class ScheduledJob {
if (!DTBJHStr.equals("")){ if (!DTBJHStr.equals("")){
String[] DTBJHArray = DTBJHStr.split(","); String[] DTBJHArray = DTBJHStr.split(",");
for (String DTBJH : DTBJHArray) { for (String DTBJH : DTBJHArray) {
String[] sortOrNumberAndYear = DTBJH.split("\\s+"); String[] sortAndNumberAndYear = DTBJH.split("\\s+");
String sort = sortOrNumberAndYear[0]; String sort = sortAndNumberAndYear[0];
String[] numberOrYear = sortOrNumberAndYear[1].split("\\-"); String[] numberAndYear = sortAndNumberAndYear[1].split("\\-");
String number=numberOrYear[0]; String number=numberAndYear[0];
String year=numberOrYear[1]; String year=numberAndYear[1];
QueryWrapper<SarStandardsInfo> infoWrapper = new QueryWrapper<>(); QueryWrapper<SarStandardsInfo> infoWrapper = new QueryWrapper<>();
infoWrapper.select("ID") infoWrapper.select("ID")
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml
-1
View File
@@ -308,7 +308,6 @@
<if test="fileType != null"> <if test="fileType != null">
and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType} and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
</if> </if>
GROUP BY STAND_ID
order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select> </select>