Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
Overview
Overview
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
wangweidong
patzn-cloud-service-hmhj
Commits
f4ff5eb0
Commit
f4ff5eb0
authored
Oct 20, 2022
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
统计查询修改;
parent
7237c35e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
EntrustSampleItemMapper.xml
src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
+5
-5
EntrustSampleMapper.xml
src/main/resources/mapper/hmhj/EntrustSampleMapper.xml
+1
-0
No files found.
src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
View file @
f4ff5eb0
...
@@ -645,14 +645,14 @@
...
@@ -645,14 +645,14 @@
<select
id=
"selectSampleItemStats"
resultType=
"com.patzn.cloud.service.hmhj.vo.SampleItemStatsVO"
>
<select
id=
"selectSampleItemStats"
resultType=
"com.patzn.cloud.service.hmhj.vo.SampleItemStatsVO"
>
SELECT
SELECT
s.code "sample_code",
s.code "sample_code",
'[' || string_agg('{"key":"'||replace(ii.name,'-result','')||'","value":
'||COALESCE(ii.test_value,'0')||'
}',',')
'[' || string_agg('{"key":"'||replace(ii.name,'-result','')||'","value":
"'|| TRIM(COALESCE(ii.test_value,'0'))||'"
}',',')
|| ']' "itemJson"
|| ']' "itemJson"
FROM
FROM
entrust_sample_item_index ii
entrust_sample_item_index ii
JOIN entrust_sample_item i ON i.ID = ii.entrust_sample_item_id
JOIN entrust_sample_item i ON i.ID = ii.entrust_sample_item_id
AND i.deleted = 0
JOIN entrust_sample s ON s.ID = i.entrust_sample_id
JOIN entrust_sample s ON s.ID = i.entrust_sample_id
AND s.deleted = 0
JOIN entrust e on e.id = s.entrust_id
JOIN entrust e on e.id = s.entrust_id
and e.deleted = 0
where ii.deleted = 0 and
i.deleted = 0 and s.deleted = 0 and e.deleted = 0 AND
s.type = 0
where ii.deleted = 0 and s.type = 0
<if
test=
"null != vo.client"
>
<if
test=
"null != vo.client"
>
and e.client LIKE CONCAT('%',#{vo.client},'%')
and e.client LIKE CONCAT('%',#{vo.client},'%')
</if>
</if>
...
...
src/main/resources/mapper/hmhj/EntrustSampleMapper.xml
View file @
f4ff5eb0
...
@@ -387,6 +387,7 @@
...
@@ -387,6 +387,7 @@
AND s.name like '%磷生铁%'
AND s.name like '%磷生铁%'
AND i.period is not null
AND i.period is not null
AND ii.test_value is not null
AND ii.test_value is not null
AND TRIM(ii.test_value) ~ '^([0-9]+[.]?[0-9]+)$'
<if
test=
"null != vo.timeS and null != vo.timeE"
>
<if
test=
"null != vo.timeS and null != vo.timeE"
>
and i.test_time
>
= #{vo.timeS} AND i.test_time
<
= #{vo.timeE}
and i.test_time
>
= #{vo.timeS} AND i.test_time
<
= #{vo.timeE}
</if>
</if>
...
...
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