Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!227
This commit is contained in:
super_liu
2021-11-11 13:06:36 +08:00
4 changed files with 76 additions and 18 deletions
@@ -966,7 +966,25 @@
<select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
select
a.*,
DISTINCT a.id,
a.stand_type,
a.country,
a.stand_sort,
a.stand_number,
a.stand_year,
a.stand_name,
a.stand_en_name,
a.stand_state,
a.stand_nature,
a.issue_time,
a.put_time,
a.text_status,
a.creation_user,
a.valid_flag,
a.creation_time,
a.modify_time,
a.STAND_SYSTEM,
a.IS_RELATE_ACCESS,
SAR_STAND_ATTR_INFO.CHJL AS CHJL,
dicstandSort.DIC_TYPE_NAME AS standSortShow,
dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,