责任部门导出和日历修改 bug修复

This commit is contained in:
yuezhihang
2021-12-22 11:09:20 +08:00
parent 5e1df05c6b
commit 8c72debb05
8 changed files with 75 additions and 13 deletions
@@ -312,6 +312,56 @@
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="getStandFileListByPageCount" parameterType="com.adc.da.base.page.BasePage"
resultType="java.lang.Integer">
select count(*) from
(select tmp_tb.* from
(
SELECT
SAR_STAND_FILE.id AS resId,
SAR_STAND_FILE.stand_id,
SAR_STAND_FILE.STAND_FILE_CLASSIFY,
SAR_STAND_FILE.file_name,
(
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) ) AS standNumber,
SAR_STANDARDS_INFO.stand_name as standName,
SAR_STAND_FILE.att_id AS attId1,
SAR_STANDARDS_INFO.STAND_TYPE as sarType
FROM
SAR_STAND_FILE
RIGHT JOIN SAR_STANDARDS_INFO ON ( SAR_STAND_FILE.STAND_ID = SAR_STANDARDS_INFO.ID AND SAR_STANDARDS_INFO.VALID_FLAG = 0 )
where SAR_STANDARDS_INFO.VALID_FLAG =0 and SAR_STAND_FILE.VALID_FLAG =0
<if test="fileSuffixList != null">
and SAR_STAND_FILE.file_suffix in
<foreach collection="fileSuffixList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="standNumber != null">
and
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) like concat(concat('%',#{standNumber}),'%')
</if>
<if test="standName != null">
and SAR_STANDARDS_INFO.stand_name like concat(concat ('%',#{standName}),'%')
</if>
<if test="standFileClassify != null">
and SAR_STAND_FILE.STAND_FILE_CLASSIFY = #{standFileClassify}
</if>
<if test="fileType != null">
and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
</if>
order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id
) tmp_tb ) a
</select>
<select id="queryStandFileListByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
select count(1) from (
SELECT