|
|
@@ -50,51 +50,53 @@
|
|
|
<select id="getListByCondition" parameterType="Map"
|
|
|
resultType="com.winsea.svc.notice.entity.NoticeTaskInfo">
|
|
|
SELECT
|
|
|
- id AS id,
|
|
|
- notice_task_status AS noticeTaskStatus,
|
|
|
- business_type AS businessType,
|
|
|
- comp_id AS compId,
|
|
|
- overdue_date AS overdueDate,
|
|
|
- overdue_date_flag AS overdueDateFlag,
|
|
|
- notice_task_push_status AS noticeTaskPushStatus,
|
|
|
- business_id AS businessId,
|
|
|
- business_code AS businessCode,
|
|
|
- message_title AS messageTitle,
|
|
|
- message_content AS messageContent,
|
|
|
- accept_id AS acceptId,
|
|
|
- accept_type AS acceptType,
|
|
|
- vessel_id AS vesselId,
|
|
|
- create_date AS createDate,
|
|
|
- create_user_id AS createUserId,
|
|
|
- update_date AS updateDate,
|
|
|
- update_user_id AS updateUserId,
|
|
|
- update_flag AS updateFlag,
|
|
|
- delete_flag AS deleteFlag
|
|
|
+ a.id AS id,
|
|
|
+ a.notice_task_status AS noticeTaskStatus,
|
|
|
+ a.business_type AS businessType,
|
|
|
+ a.comp_id AS compId,
|
|
|
+ a.overdue_date AS overdueDate,
|
|
|
+ a.overdue_date_flag AS overdueDateFlag,
|
|
|
+ a.notice_task_push_status AS noticeTaskPushStatus,
|
|
|
+ a.business_id AS businessId,
|
|
|
+ a.business_code AS businessCode,
|
|
|
+ b.business_type_desc AS messageTitle,
|
|
|
+ a.message_content AS messageContent,
|
|
|
+ a.accept_id AS acceptId,
|
|
|
+ a.accept_type AS acceptType,
|
|
|
+ a.vessel_id AS vesselId,
|
|
|
+ a.create_date AS createDate,
|
|
|
+ a.create_user_id AS createUserId,
|
|
|
+ a.update_date AS updateDate,
|
|
|
+ a.update_user_id AS updateUserId,
|
|
|
+ a.update_flag AS updateFlag,
|
|
|
+ a.delete_flag AS deleteFlag
|
|
|
FROM
|
|
|
- notice_task_info
|
|
|
+ notice_task_info a
|
|
|
+ left join notice_business_constant_info b
|
|
|
+ on b.business_code = a.business_code
|
|
|
WHERE
|
|
|
- delete_flag = '1'
|
|
|
- AND ( notice_task_status IN ( 'TO_BE_PROCESSED', 'RETURN' ) )
|
|
|
+ a.delete_flag = '1'
|
|
|
+ AND ( a.notice_task_status IN ( 'TO_BE_PROCESSED', 'RETURN' ) )
|
|
|
AND (
|
|
|
1 = 1
|
|
|
- AND ( notice_task_info.accept_type = "All" )
|
|
|
+ AND ( a.accept_type = "All" )
|
|
|
OR (
|
|
|
- notice_task_info.accept_id IN ( #{userId} )
|
|
|
- AND notice_task_info.accept_type = "STAFF"
|
|
|
+ a.accept_id IN ( #{userId} )
|
|
|
+ AND a.accept_type = "STAFF"
|
|
|
AND 1 = 1
|
|
|
)
|
|
|
OR (
|
|
|
- notice_task_info.accept_id IN ( #{roleId})
|
|
|
- AND notice_task_info.accept_type = "ROLE"
|
|
|
+ a.accept_id IN ( #{roleId})
|
|
|
+ AND a.accept_type = "ROLE"
|
|
|
AND 1 = 1
|
|
|
)
|
|
|
- AND delete_flag = '1'
|
|
|
+ AND a.delete_flag = '1'
|
|
|
)
|
|
|
GROUP BY
|
|
|
- business_id,
|
|
|
- business_code
|
|
|
+ a.business_id,
|
|
|
+ a.business_code
|
|
|
ORDER BY
|
|
|
- create_date DESC
|
|
|
+ a.create_date DESC
|
|
|
<if test="currentPage != null and currentPage != ''">
|
|
|
LIMIT ${startRecord}, ${pageSize}
|
|
|
</if>
|
