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!423
This commit is contained in:
super_liu
2022-03-24 22:56:51 +08:00
parent 1c73ac3e8a d153a3be0f
commit a9c0d8bb1c
10 changed files with 882 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+29 -4
View File
@@ -25,7 +25,7 @@
<result column="DTQBBHBUSS" property="DTQBBHBUSS"/>
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport" >
<result column="replaced_stand_num" property="replacedStandNum" />
<result column="replace_stand_num" property="replaceStandNum" />
<result column="put_time" property="putTime" />
@@ -55,6 +55,22 @@
stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number
</sql>
<sql id="Base_Column_List_show_Export" >
DISTINCT SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.modify_time,
SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
stand_name, stand_code,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number
</sql>
<sql id="Base_Column_List_show_ExportResult" >
DISTINCT tmp_tb.id,tmp_tb.modify_time,
tmp_tb.creation_time, tmp_tb.valid_flag,
tmp_tb.apply_country, tmp_tb.stand_nature,tmp_tb.stand_sort,tmp_tb.stand_year,
tmp_tb.stand_status, tmp_tb.replaced_stand_num,tmp_tb.replace_stand_num,tmp_tb.put_time,tmp_tb.issue_time,tmp_tb.stand_en_name,
tmp_tb.stand_name, tmp_tb.stand_code,tmp_tb.text_status_buss,tmp_tb.stand_number
</sql>
<sql id="Group_Column_List_show" >
stand_status, replaced_stand_num, replace_stand_num,put_time,
issue_time, stand_en_name, stand_name, stand_code,stand_status,
@@ -575,6 +591,9 @@
<if test="standSort != null" >
and SAR_BUSSIONESS_STAND.stand_sort = #{standSort}
</if>
<if test="standYear != null" >
and SAR_BUSSIONESS_STAND.stand_year = #{standYear}
</if>
<if test="replaceStandNum != null" >
and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
</if>
@@ -754,11 +773,17 @@
<!-- 条件查询后，用于导出标准信息数据-->
<select id="getSarBussionessStand" resultMap="BaseResultMapExcel" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
SELECT * FROM (
select <include refid="Base_Column_List_show" />
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_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
) tmp_tb
<include refid="standSort_in"/>
</select>