diff --git a/pnkx-life/src/main/resources/mapper/PxCommemorationDayMapper.xml b/pnkx-life/src/main/resources/mapper/PxCommemorationDayMapper.xml index 3aafd53..70fd21b 100644 --- a/pnkx-life/src/main/resources/mapper/PxCommemorationDayMapper.xml +++ b/pnkx-life/src/main/resources/mapper/PxCommemorationDayMapper.xml @@ -31,7 +31,15 @@ and name like concat('%', #{name}, '%') - and date = #{date} + + and ( `repeat` = 1 and date_format(date,'%m') in ( date_format(#{date},'%m'), + date_format(DATE_SUB(#{date}, INTERVAL 1 MONTH),'%m'), + date_format(DATE_SUB(#{date}, INTERVAL -1 MONTH),'%m') + ))or (`repeat` = 0 and date_format(date,'%Y-%m') in ( date_format(#{date},'%Y-%m'), + date_format(DATE_SUB(#{date}, INTERVAL 1 MONTH),'%Y-%m'), + date_format(DATE_SUB(#{date}, INTERVAL -1 MONTH),'%Y-%m') + )) + and order_num = #{orderNum} and version = #{version} and del_flag = '0'