Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
wr
2024-02-23 13:23:43 +08:00
parent 7c278892a3
commit 6ab679caf2
9 changed files with 183 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgClassifiedMapper.xml
View File

@@ -43,7 +43,9 @@
<include refid="query_field"></include>
FROM
r_stat_org_y AS rso
LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_y AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_where"></include>
</select>
@@ -54,7 +56,9 @@
<include refid="query_field"></include>
FROM
r_stat_org_q AS rso
LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_q AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_where"></include>
</select>
@@ -65,7 +69,9 @@
<include refid="query_field"></include>
FROM
r_stat_org_m AS rso
LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_m AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_where"></include>
</select>

12
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventOrgMapper.xml
View File

@@ -47,7 +47,9 @@
<include refid="query_rStatEventOrg_field"></include>
FROM
r_stat_org_y AS rso
LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_y AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_rStatEventOrg_where"></include>
</select>
@@ -59,7 +61,9 @@
<include refid="query_rStatEventOrg_field"></include>
FROM
r_stat_org_q AS rso
LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_q AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_rStatEventOrg_where"></include>
</select>
@@ -71,7 +75,9 @@
<include refid="query_rStatEventOrg_field"></include>
FROM
r_stat_org_m AS rso
LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
LEFT JOIN r_stat_event_m AS rseo ON rso.org_no = rseo.org_no
and rso.data_date = rseo.data_date
and rso.measurement_type_class = rseo.measurement_type_class
WHERE
<include refid="query_rStatEventOrg_where"></include>
</select>