Skip to content

A
amos-boot-zx-biz
Commit 788514ae authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

27467 人大金仓数据库适配

parent 8a8f57e4
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 72 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/OverviewQuestionDto.java
View file @ 788514ae
......@@ -13,7 +13,7 @@ public class OverviewQuestionDto {
private String createDate;
@ApiModelProperty(value = "问题内容")
private String content;
private String warningContent;
@ApiModelProperty(value = "问题完成情况描述")
private String completionStatusDesc;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml
View file @ 788514ae
......@@ -9,7 +9,7 @@
mcb_warning_warning_info log
LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
<where>
date(log.CREATE_DATE) = CURRENT_DATE
log.CREATE_DATE = CURRENT_DATE
and WARNING_SOURCE_TYPE_CODE in (SELECT code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
AND SOURCE_ATTRIBUTION IN
......@@ -24,77 +24,77 @@
</select>
<select id="queryWeekCount" resultType="java.util.Map">
<!-- SELECT-->
<!-- DATE_FORMAT(b.alarmDate, '%m/%d') AS axisData,-->
<!-- b.code AS code,-->
<!-- b.province AS province,-->
<!-- IFNULL(count(log.SEQUENCE_NBR), 0) AS seriesData-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- source.CODE AS code,-->
<!-- a.DATE AS alarmDate,-->
<!-- source.PROVINCE AS province-->
<!-- FROM-->
<!-- amos_mcb.mcb_warning_base_source_attribution source,-->
<!-- (-->
<!-- SELECT CURDATE() AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 1 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 2 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 3 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 4 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 5 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 6 DAY ) AS date-->
<!-- ) a-->
<!-- ) b-->
<!-- LEFT JOIN amos_mcb.mcb_warning_warning_info log ON date(log.CREATE_DATE) = b.alarmDate AND log.SOURCE_ATTRIBUTION = b.CODE-->
<!-- <where>-->
<!-- <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">-->
<!-- AND b.CODE IN-->
<!-- <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!--&#45;&#45; b.code,-->
<!-- b.alarmDate-->
<!-- ORDER BY-->
<!-- b.alarmDate ASC-->
<!-- SELECT-->
<!-- DATE_FORMAT(b.alarmDate, '%m/%d') AS axisData,-->
<!-- b.code AS code,-->
<!-- b.province AS province,-->
<!-- IFNULL(count(log.SEQUENCE_NBR), 0) AS seriesData-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- source.CODE AS code,-->
<!-- a.DATE AS alarmDate,-->
<!-- source.PROVINCE AS province-->
<!-- FROM-->
<!-- amos_mcb.mcb_warning_base_source_attribution source,-->
<!-- (-->
<!-- SELECT CURDATE() AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 1 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 2 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 3 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 4 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 5 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 6 DAY ) AS date-->
<!-- ) a-->
<!-- ) b-->
<!-- LEFT JOIN amos_mcb.mcb_warning_warning_info log ON date(log.CREATE_DATE) = b.alarmDate AND log.SOURCE_ATTRIBUTION = b.CODE-->
<!-- <where>-->
<!-- <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">-->
<!-- AND b.CODE IN-->
<!-- <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!--&#45;&#45; b.code,-->
<!-- b.alarmDate-->
<!-- ORDER BY-->
<!-- b.alarmDate ASC-->
SELECT
DATE_FORMAT(a.date,'%m/%d') as axisData ,
IFNULL(b.seriesData,0) as seriesData
FROM
(
SELECT
DATE_SUB( CURDATE( ), INTERVAL 6 DAY ) AS date UNION ALL
get_time_sub(6,'DAY') AS date UNION ALL
SELECT
DATE_SUB( CURDATE( ), INTERVAL 5 DAY ) AS date UNION ALL
get_time_sub(5,'DAY') AS date UNION ALL
SELECT
DATE_SUB( CURDATE( ), INTERVAL 4 DAY ) AS date UNION ALL
get_time_sub(4,'DAY') AS date UNION ALL
SELECT
DATE_SUB( CURDATE( ), INTERVAL 3 DAY ) AS date UNION ALL
get_time_sub(3,'DAY') AS date UNION ALL
SELECT
DATE_SUB( CURDATE( ), INTERVAL 2 DAY ) AS date UNION ALL
get_time_sub(2,'DAY') AS date UNION ALL
SELECT
DATE_SUB( CURDATE( ), INTERVAL 1 DAY ) AS date UNION ALL
get_time_sub(1,'DAY') AS date UNION ALL
SELECT
CURDATE( ) AS date
) a
LEFT JOIN (SELECT
IFNULL( count( log.SEQUENCE_NBR ), 0 ) AS seriesData,
date( log.CREATE_DATE ) AS axisData
log.CREATE_DATE AS axisData
FROM
mcb_warning_warning_info log
WHERE
log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
AND date( log.CREATE_DATE ) >= CURDATE( ) - INTERVAL 7 DAY
AND log.CREATE_DATE >= get_time_sub(7,'DAY')
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
AND log.SOURCE_ATTRIBUTION IN
<foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
......@@ -102,7 +102,7 @@
</foreach>
</if>
GROUP BY
date( log.CREATE_DATE )) b ON a.date = b.axisData ORDER BY axisData
log.CREATE_DATE ) b ON a.date = b.axisData ORDER BY axisData
</select>
<select id="queryWarningList" resultType="java.util.Map">
......@@ -114,7 +114,7 @@
log.EVENT_LEVEL,
log.SOURCE_ATTRIBUTION_DESC,
log.SOURCE_ATTRIBUTION,
log.CONTENT,
log.CONTENT_,
warnLevel.COLOR,
source1.PROVINCE,
log.WARNING_SOURCE_TYPE,
......@@ -123,7 +123,8 @@
log.PROCESSING_STATUS_DESC
FROM
mcb_warning_warning_info log
LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and
warnLevel.SEQUENCE_NBR in (1, 2, 3)
LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
<where>
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
......@@ -168,7 +169,8 @@
COUNT(1)
FROM
mcb_warning_warning_info log
LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and warnLevel.SEQUENCE_NBR in (1, 2, 3)
LEFT JOIN mcb_warning_base_warning_level warnLevel ON log.EVENT_LEVEL = warnLevel.CODE and
warnLevel.SEQUENCE_NBR in (1, 2, 3)
LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = log.SOURCE_ATTRIBUTION
<where>
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
......@@ -209,7 +211,7 @@
SELECT
warning.SEQUENCE_NBR warningId,
question.CREATE_DATE createDate,
warning.CONTENT content,
warning.CONTENT_ content_,
question.COMPLETION_STATUS_DESC completionStatusDesc,
question.SOURCE_ATTRIBUTION_DESC sourceAttributionDesc
FROM
......@@ -219,7 +221,8 @@
question.NUM IS NOT NULL
AND question.NUM = warning.QUESTION_NUM
AND question.COMPLETION_STATUS != '1'
AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE mcb_data_dictionary.remark = 'OVERVIEW' )
AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE
mcb_data_dictionary.remark = 'OVERVIEW' )
<if test="startTime != null and startTime != ''">
AND question.CREATE_DATE >= #{startTime}
</if>
......@@ -245,7 +248,8 @@
question.NUM IS NOT NULL
AND question.NUM = warning.QUESTION_NUM
AND question.COMPLETION_STATUS != '1'
AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE mcb_data_dictionary.remark = 'OVERVIEW' )
AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE
mcb_data_dictionary.remark = 'OVERVIEW' )
<if test="startTime != null and startTime != ''">
AND question.CREATE_DATE >= #{startTime}
</if>
......@@ -268,7 +272,7 @@
question.COMPLETION_STATUS,
question.SOURCE_ATTRIBUTION_DESC,
question.SOURCE_ATTRIBUTION,
question.CONTENT,
question.CONTENT_,
question.LEVEL_DESC,
source1.PROVINCE
FROM
......@@ -279,7 +283,8 @@
WHERE
mcb_warning_warning_info.PROCESSING_STATUS = 2
AND QUESTION_NUM IS NOT NULL
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark =
'OVERVIEW' )
) warnNum LEFT join mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
LEFT JOIN mcb_warning_base_source_attribution source1 ON source1.CODE = question.SOURCE_ATTRIBUTION
<where>
......@@ -316,7 +321,8 @@
WHERE
mcb_warning_warning_info.PROCESSING_STATUS = 2
AND QUESTION_NUM IS NOT NULL
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark =
'OVERVIEW' )
) warnNum inner join mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
<if test="completionStatus != null and completionStatus == 0">
AND question.COMPLETION_STATUS in (0,2)
......@@ -353,7 +359,8 @@
FROM
mcb_warning_warning_info
WHERE
date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
CREATE_DATE = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM
mcb_data_dictionary WHERE remark = 'OVERVIEW')
GROUP BY
SOURCE_ATTRIBUTION
)
......@@ -374,7 +381,7 @@
LEFT JOIN
SubQuery sq ON a.CODE = sq.SOURCE_ATTRIBUTION
LEFT JOIN
mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND b.CREATE_DATE = CURRENT_DATE
<where>
<if test="sourceAttribution != null and sourceAttribution != ''">
a.CODE LIKE CONCAT(#{sourceAttribution}, '%')
......@@ -393,14 +400,15 @@
mcb_warning_warning_info
Left join mcb_warning_base_source_attribution mwbsa on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
WHERE
YEAR(CREATE_DATE) = YEAR(CURDATE())
date_format(CREATE_DATE,'%Y') = date_format(CURDATE(),'%Y')
<if test="province != null and province != '' ">
and mwbsa.PROVINCE LIKE CONCAT (#{province},'%')
</if>
<if test="sourceAttribution != null and sourceAttribution != '' ">
and mwbsa.CODE LIKE CONCAT (#{sourceAttribution},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark =
'OVERVIEW')
</select>
<select id="getMonthTotal" resultType="integer">
......@@ -417,12 +425,12 @@
<if test="sourceAttribution != null and sourceAttribution != '' ">
and mwbsa.CODE LIKE CONCAT (#{sourceAttribution},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark =
'OVERVIEW')
</select>
<select id="getDayTotal" resultType="integer">
SELECT
count( 1 ) AS dayNUM ,
mwbsa.PROVINCE
count( 1 ) AS dayNUM
FROM
mcb_warning_warning_info
Left join mcb_warning_base_source_attribution mwbsa on mwbsa.CODE = mcb_warning_warning_info.SOURCE_ATTRIBUTION
......@@ -434,6 +442,7 @@
<if test="sourceAttribution != null and sourceAttribution != '' ">
and mwbsa.CODE LIKE CONCAT (#{sourceAttribution},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark = 'OVERVIEW')
</select>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM mcb_data_dictionary WHERE remark =
'OVERVIEW')
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment