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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!445
This commit is contained in:
super_liu
2022-04-06 01:02:21 +08:00
parent 0d0358f64a 9540bb3192
commit 42ae20d88b
12 changed files with 511 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+82 -14
View File
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo" >
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo" >
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport" >
</resultMap>
<sql id="Base_Where_Clause">
@@ -178,7 +178,7 @@
<if test="collectMenuId != null and collectMenuId != ''">
and SAR_LAWS_STAND_INFO.id in (
select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
and (collect_type='FOREIGN_LAWS')
and TS_PERSON_COLLECT.user_id=#{userId}
)
</if>
@@ -280,9 +280,7 @@
GROUP BY SAR_LAWS_STAND_INFO.id) a
</select>
<select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
select
<sql id="Base_Column_List_show_Export" >
DISTINCT SAR_LAWS_STAND_INFO.ID,
laws_type_show.DIC_TYPE_NAME as LAWS_TYPE,
SAR_LAWS_STAND_INFO.LAWS_NUMBER,
@@ -297,21 +295,79 @@
laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX,
laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY,
SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS,
SAR_LAWS_STAND_INFO.LAWS_YEAR,
laws_year_show.DIC_TYPE_NAME as LAWS_YEAR,
SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM,
SAR_LAWS_STAND_INFO.LAWS_BULLETIN,
SAR_LAWS_STAND_INFO.LAWS_LABEL,
laws_label_show.DIC_TYPE_NAME as LAWS_LABEL,
SAR_LAWS_STAND_INFO.LAWS_REMARK,
SAR_LAWS_STAND_INFO.COUNTRY,
SAR_LAWS_STAND_INFO.MODIFY_TIME,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
from SAR_LAWS_STAND_INFO
<include refid="export_condition"/>
</sql>
<sql id="Base_Column_List_show_ExportResult" >
DISTINCT tmp_tb.ID,
tmp_tb.LAWS_TYPE,
tmp_tb.LAWS_NUMBER,
tmp_tb.LAWS_NAME,
tmp_tb.LAWS_EN_NAME,
tmp_tb.LAWS_NO,
tmp_tb.ISSUE_TIME,
tmp_tb.ISSUE_COMPANY,
tmp_tb.COMMENT_CYCLE_START,
tmp_tb.COMMENT_CYCLE_END,
tmp_tb.LAWS_TEXT_STATE,
tmp_tb.LAWS_SYCX,
tmp_tb.LAWS_SYQY,
tmp_tb.IS_RELATE_ACCESS,
tmp_tb.LAWS_YEAR,
tmp_tb.LAWS_NOTISYNC_NUM,
tmp_tb.LAWS_BULLETIN,
tmp_tb.LAWS_LABEL,
tmp_tb.LAWS_REMARK,
tmp_tb.COUNTRY,
tmp_tb.MODIFY_TIME,
tmp_tb.standStatusShow,
tmp_tb.SSRQLAWS,
tmp_tb.XCXSSRQLAWS,
tmp_tb.ZCXSSRQLAWS,
tmp_tb.ZCWBLAWS,
tmp_tb.GCWBLAWS,
tmp_tb.JDWJLAWS,
tmp_tb.CYSDLAWS,
tmp_tb.TGRLAWS,
tmp_tb.TGDWLAWS,
tmp_tb.NYLXLAWS,
tmp_tb.YYRZLAWS,
tmp_tb.ZRBMLAWS,
tmp_tb.ZRGCSLAWS,
tmp_tb.DTWJHLAWS,
tmp_tb.BDTWJHLAWS,
tmp_tb.YYBZZCLAWS,
tmp_tb.XGLC,
tmp_tb.CHJLLAWS,
tmp_tb.GLWJLAWS
</sql>
<select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
SELECT <include refid="Base_Column_List_show_ExportResult" />
<if test="exportAllResult != null">
, ${exportAllResult}
</if>
FROM (
select <include refid="Base_Column_List_show_Export" />
<if test="exportAllAttrInfo != null">
, ${exportAllAttrInfo}
</if>
from SAR_LAWS_STAND_INFO
<include refid="export_condition"/>
) tmp_tb
order by
<if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
${orderByA} ${order1},
</if>
SAR_LAWS_STAND_INFO.id
tmp_tb.issue_time is null,tmp_tb.issue_time desc,tmp_tb.id
</select>
@@ -322,21 +378,33 @@
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
<!--年份-->
LEFT JOIN TS_DICTYPE laws_year_show ON (
laws_year_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_YEAR
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
<!--标签-->
LEFT JOIN TS_DICTYPE laws_label_show ON (
laws_label_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_LABEL
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
<!--适用车型-->
LEFT JOIN TS_DICTYPE laws_sycx_show ON (
dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX
laws_sycx_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
<!--适用区域-->
LEFT JOIN TS_DICTYPE laws_syqy_show ON (
dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY
laws_syqy_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
<!--政策分类-->
LEFT JOIN TS_DICTYPE laws_type_show ON (
dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE
laws_type_show.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
@@ -433,7 +501,7 @@
<if test="collectMenuId != null and collectMenuId != ''">
and SAR_LAWS_STAND_INFO.id in (
select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
and (collect_type='FOREIGN_LAWS')
and TS_PERSON_COLLECT.user_id=#{userId}
)
</if>