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