From f38b96fc92db83bdedef08ba868d49f59ff0bad7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 May 2022 13:45:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=20sort=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoMapper.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 3c390666..c57b8f47 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -635,7 +635,7 @@ left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -964,7 +964,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1130,7 +1130,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1160,7 +1160,7 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status AND dicstandTextStatus.dic_id IS NOT NULL @@ -1531,7 +1531,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') where SAR_STANDARDS_INFO.valid_flag = 0 @@ -1668,7 +1668,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status @@ -1725,7 +1725,7 @@ SAR_STAND_ATTR_INFO.XCXSSRQ as allPutTime from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME!=#{stateName} and SAR_STAND_ATTR_INFO.XCXSSRQ != '' @@ -1736,7 +1736,7 @@ ,dicstandState.DIC_TYPE_NAME as standStateShow,SAR_STAND_ATTR_INFO.DTBJH as replace_stand_num from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME != '' and SAR_STAND_ATTR_INFO.DTBJH != '' @@ -1749,7 +1749,7 @@ concat(SAR_STAND_ATTR_INFO.XCXSSRQ,',',SAR_STAND_ATTR_INFO.ZCCSSRQ) as allPutTime from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and - dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where SAR_STANDARDS_INFO.valid_flag=0 and SAR_STAND_ATTR_INFO.DTBJH != '' @@ -1794,7 +1794,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id='JKSADFH564S') left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id From e222598ce3342aa3674ad531985e6c4a3b07f0b5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 May 2022 15:30:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/activiti/ActSarItemsEO.xml | 8 ++++---- .../mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml | 4 ++-- .../sarBussionessStand/SarBussionessStandMapper.xml | 10 +++++----- .../SarLawsAttrDetailedListMapper.xml | 5 +++-- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- .../mapper/standardSplit/SarStandardsInfoEOMapper.xml | 8 ++++---- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml b/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml index 14af3b87..b59257d8 100644 --- a/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml +++ b/adc-da-activiti/src/main/resources/mybatis/mapper/activiti/ActSarItemsEO.xml @@ -79,7 +79,7 @@ 'BUSINESS_STAND' AS resFlag FROM SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandSort.valid_flag=0 and dicstandSort.dic_id is not null) + left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandSort.valid_flag=0 and dicstandSort.dic_id is not null AND dicstandSort.dic_id = 'NGETEMDJDI') WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 ) @@ -167,7 +167,7 @@ FROM SAR_BUSSIONESS_STAND left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and - dicstandSort.valid_flag = 0) + dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 @@ -232,7 +232,7 @@ FROM SAR_BUSSIONESS_STAND left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and - dicstandSort.valid_flag = 0) + dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI' ) WHERE SAR_BUSSIONESS_STAND.VALID_FLAG=0 ) @@ -379,7 +379,7 @@ LEFT JOIN SAR_BUSS_STAND_VAL valapp ON ( SAR_BUSSIONESS_STAND.id = valapp.stand_id AND valapp.PROPERTY_TYPE = 'APPLY_ARCTIC' ) LEFT JOIN SAR_BUSS_STAND_VAL valeng ON ( SAR_BUSSIONESS_STAND.id = valeng.stand_id AND valeng.PROPERTY_TYPE = 'ENERGY_KIND' ) left join TS_ORG on SAR_BUSSIONESS_STAND.RESPONSIBLE_UNIT = TS_ORG.ID - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') WHERE SAR_SAR_ACCESS_INFO.VALID_FLAG=0 and SAR_BUSSIONESS_STAND.VALID_FLAG=0 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml index 5074bece..f4ffcda1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/msgDynamicInfo/SarStandAndLawsEOMapper.xml @@ -142,7 +142,7 @@ SAR_BUSSIONESS_STAND LEFT JOIN SAR_BUSS_STAND_VAL ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_VAL.stand_id LEFT JOIN TS_DICTYPE dicstandState ON ( dicstandState.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandState.dic_id IS NOT NULL AND dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null) left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id + left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null and dicstandsort.dic_id = 'NGETEMDJDI' ) left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id WHERE SAR_BUSSIONESS_STAND.valid_flag = 0 ) @@ -354,7 +354,7 @@ SAR_BUSSIONESS_STAND LEFT JOIN SAR_BUSS_STAND_VAL ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_VAL.stand_id LEFT JOIN TS_DICTYPE dicstandState ON ( dicstandState.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandState.dic_id IS NOT NULL AND dicstandState.valid_flag = 0 ) - left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null) + left join TS_DICTYPE dicstandsort on (dicstandsort.dic_type_code= SAR_BUSSIONESS_STAND.STAND_SORT and dicstandsort.valid_flag=0 and dicstandsort.dic_id is not null and dicstandsort.dic_id = 'NGETEMDJDI') left join TS_ORG on SAR_BUSSIONESS_STAND.responsible_unit = TS_ORG.id left join SAR_BUSS_STAND_MENU on SAR_BUSS_STAND_MENU.BUSS_STAND_ID = SAR_BUSSIONESS_STAND.id WHERE diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index d5098d86..4470935c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -713,7 +713,7 @@ left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL AND dicstandSort.dic_id = 'NGETEMDJDI' and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id @@ -796,7 +796,7 @@ left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id @@ -920,7 +920,7 @@ from SAR_BUSSIONESS_STAND left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0) left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id @@ -966,7 +966,7 @@ SAR_BUSSIONESS_STAND.id, 'BUSINESS_STAND' as typeShow from SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0 AND dicstandSort.dic_id = 'NGETEMDJDI') where SAR_BUSSIONESS_STAND.valid_flag = '0' and ( 1=1 and STAND_SORT = #{standSort} @@ -1010,7 +1010,7 @@ SAR_BUSSIONESS_STAND.id, 'BUSINESS_STAND' as typeShow from SAR_BUSSIONESS_STAND - left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id = 'NGETEMDJDI' AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) where SAR_BUSSIONESS_STAND.valid_flag = '0' and ( or stand_name like concat(concat('%',#{standName}),'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index d489ec67..e64b06c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -9,7 +9,7 @@ FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null AND dicstandSort.dic_id = 'JKSADFH564S') (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') @@ -75,6 +75,7 @@ AND dicstandSort.dic_id IS NOT NULL AND dicstandSort.valid_flag = 0 AND dicstandSort.PARENT_ID IS NULL + AND dicstandSort.dic_id = 'NGETEMDJDI' ) a.ID IN @@ -132,7 +133,7 @@ a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null AND dicstandSort.dic_id = 'JKSADFH564S') a.ID IN diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index c57b8f47..638144cb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -459,7 +459,7 @@ left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml index cc1ca549..add74de3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml @@ -360,7 +360,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.dic_id ='JKSADFH564S' and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and @@ -604,7 +604,7 @@ from SAR_STANDARDS_INFO left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') where SAR_STANDARDS_INFO.valid_flag = 0 @@ -700,7 +700,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and @@ -818,7 +818,7 @@ left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is not null and dicountry.valid_flag = 0) left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and - dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null and dicstandSort.dic_id ='JKSADFH564S') left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and From 2b1178e2894bb445f9cd5b03e51be8ddc28714a2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 5 May 2022 17:00:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 8 ++++++-- .../src/main/java/com/adc/da/mq/SendLawsMQService.java | 8 ++++++-- .../src/main/java/com/adc/da/mq/SendStandMQService.java | 4 ++-- .../service/impl/SarStandardsInfoServiceImpl.java | 3 +++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 5ca1d5ef..7ebeed33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -186,8 +186,12 @@ public class SendBussMQService { String fieldFilter = field.toLowerCase(); if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); - if(!json.toString().equals("null")){ - fieldValue = infoMap.get(fieldFilter).toString(); + if(json instanceof org.json.JSONArray){ + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class)); + }else { + if(!("null").equals(json)){ + fieldValue = infoMap.get(fieldFilter).toString(); + } } } saveMap.put(field+"Name",fieldValue); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index c81169d4..f7190b42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -232,8 +232,12 @@ public class SendLawsMQService { String fieldFilter = field.toLowerCase(); if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); - if(!json.toString().equals("null")){ - fieldValue = infoMap.get(fieldFilter).toString(); + if(json instanceof org.json.JSONArray){ + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class)); + }else { + if(!("null").equals(json)){ + fieldValue = infoMap.get(fieldFilter).toString(); + } } } saveMap.put(field+"Name",fieldValue); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 9bcc232a..19f86cb3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -187,10 +187,10 @@ public class SendStandMQService { if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){ Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); if(json instanceof org.json.JSONArray){ - fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(standMap.get(field).toString(),String.class)); + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(field).toString(),String.class)); }else { if(!("null").equals(json)){ - fieldValue = standMap.get(field).toString(); + fieldValue = infoMap.get(field).toString(); } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index f28db1f3..f605e2b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Thu, 5 May 2022 17:33:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java | 3 +++ adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java | 3 +++ .../src/main/java/com/adc/da/mq/SendStandMQService.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 7ebeed33..f58df196 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -193,6 +193,9 @@ public class SendBussMQService { fieldValue = infoMap.get(fieldFilter).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index f7190b42..c531aacf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -239,6 +239,9 @@ public class SendLawsMQService { fieldValue = infoMap.get(fieldFilter).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 19f86cb3..68f57ed3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -193,6 +193,9 @@ public class SendStandMQService { fieldValue = infoMap.get(field).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); }catch (Exception e){