Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZTGK
hzsomms
Commits
b877db1c
Commit
b877db1c
authored
Aug 17, 2023
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 1.车站bug提交
parent
e87d9c9d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
15 deletions
+2
-15
AnalysisAlgorithm.java
...es/dynamicStaticAnalysis/algorithm/AnalysisAlgorithm.java
+1
-2
AnalysisBatchUnitDeviceMapper.xml
...aticAnalysis/mapper/xml/AnalysisBatchUnitDeviceMapper.xml
+1
-6
pom.xml
pom.xml
+0
-7
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/algorithm/AnalysisAlgorithm.java
View file @
b877db1c
...
@@ -288,8 +288,7 @@ public class AnalysisAlgorithm {
...
@@ -288,8 +288,7 @@ public class AnalysisAlgorithm {
AnalysisBatchCheckDataMap
checkDataMap
,
AnalysisBatchCheckDataMap
checkDataMap
,
List
<
Map
<
String
,
Object
>>
unitDeviceList
)
{
List
<
Map
<
String
,
Object
>>
unitDeviceList
)
{
// 1.获取轨检车检查超限
// 1.获取轨检车检查超限
List
<
MovementOverReport
>
movementOverReports
=
movementOverReportService
List
<
MovementOverReport
>
movementOverReports
=
movementOverReportService
.
lambdaQuery
()
.
lambdaQuery
()
.
eq
(
MovementOverReport:
:
getMovementMasterId
,
checkDataMap
.
getEkId
())
.
eq
(
MovementOverReport:
:
getMovementMasterId
,
checkDataMap
.
getEkId
())
.
list
();
.
list
();
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchUnitDeviceMapper.xml
View file @
b877db1c
...
@@ -53,12 +53,7 @@
...
@@ -53,12 +53,7 @@
#{item}
#{item}
</foreach>
</foreach>
</if>
</if>
<if
test=
"dto.unitTypeList!=null and dto.unitTypeList.size()>0"
>
AND analysis.unit_type in
<foreach
collection=
"dto.unitTypeList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"dto.isTransfinite != null"
>
<if
test=
"dto.isTransfinite != null"
>
AND analysis.is_transfinite = 1
AND analysis.is_transfinite = 1
</if>
</if>
...
...
pom.xml
View file @
b877db1c
...
@@ -149,13 +149,6 @@
...
@@ -149,13 +149,6 @@
<scope>
import
</scope>
<scope>
import
</scope>
</dependency>
</dependency>
<!-- system 模块-->
<dependency>
<groupId>
org.jeecgframework.boot
</groupId>
<artifactId>
jeecg-system-biz
</artifactId>
<version>
${jeecgboot.version}
</version>
</dependency>
<!-- jeecg tools -->
<!-- jeecg tools -->
<dependency>
<dependency>
<groupId>
org.jeecgframework.boot
</groupId>
<groupId>
org.jeecgframework.boot
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment