wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1634' into 'dev'

Browse Source 
+执行人过滤

See merge request universal/infrastructure/backend/msg-center-plat!80
This commit is contained in:
邬宇 2023-11-27 05:43:18 +00:00
commit 1e06536c15
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -169,7 +169,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
public List<PendingMessageResponse> getPendingMessageByAppWorker(PendingMessageFixedTemplatePageRequest request) {
List<PendingMessageResponse> result = new ArrayList<>();
PendingCalendarCodeDTO calendarCodeDTO = buildCalendarCodesDTO(calendarCodeConfig);
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.queryByTemplateCodes(calendarCodeDTO,request.getWorkspaceId(),request.getSelectDate());
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.queryByTemplateCodes(calendarCodeDTO,request.getWorkspaceId(),request.getSelectDate(),request.getPersonId());
List<MessageTemplateDTO> messageTemplates = messageTemplateNewService.listByTemplateCodes(calendarCodeConfig.getCalendarAllCodes());
result = pendingMessageRecords.stream()
.map(e -> convert(e, messageTemplates).toResponse(request.getTerminalType()))

3
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/PendingMessageRecordMapper.java
View File

@ -16,6 +16,7 @@ import java.util.List;
* @version 1.0
*/
public interface PendingMessageRecordMapper extends BaseMapper<PendingMessageRecord> {
List<PendingMessageRecord> queryByTemplateCodes(@Param("pendingCalendarCodeDTO") PendingCalendarCodeDTO pendingCalendarCodeDTO, @Param("workspaceId") Long workspaceId, @Param("selectDate") Date selectDate);
List<PendingMessageRecord> queryByTemplateCodes(@Param("pendingCalendarCodeDTO") PendingCalendarCodeDTO pendingCalendarCodeDTO, @Param("workspaceId") Long workspaceId,
@Param("selectDate") Date selectDate, @Param("personId") Long personId);
}

27
msg-center-dal/src/main/resources/mapper/PendingMessageRecordMapper.xml
View File

@ -9,30 +9,27 @@
</sql>
<select id="queryByTemplateCodes" resultType="cn.axzo.msg.center.domain.entity.PendingMessageRecord">
select * from (SELECT * FROM (SELECT * FROM pending_message_record WHERE org_id=326 AND DATE(create_at) <![CDATA[<]]> CURDATE() AND state IN('HAS_BEEN_SENT')
AND template_code IN('d1d4793c84e14d20ae1cbc399338efa3','367ba552bb374049a73e737ac3b8b08c') ORDER BY create_at ASC) old_pending_message
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE org_id=326 AND DATE(create_at) = CURDATE() AND state IN('HAS_BEEN_SENT','COMPLETED')
AND template_code IN('d1d4793c84e14d20ae1cbc399338efa3','367ba552bb374049a73e737ac3b8b08c') ORDER BY create_at DESC) new_pending_message
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE org_id=326 AND DATE(create_at) = CURDATE() AND state IN('HAS_BEEN_SENT','COMPLETED')
AND template_code IN('出厂打卡') ORDER BY create_at DESC) new_pending_message1
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE org_id=326 AND DATE(create_at) = CURDATE() AND state IN('HAS_BEEN_SENT','COMPLETED')
AND template_code IN('进场打卡') ORDER BY create_at DESC) new_pending_message2)aa
SELECT * FROM pending_message_record WHERE DATE(create_at) = DATE(#{selectDate})
AND template_code IN<foreach collection="pendingCalendarCodeDTO.constructionCodes" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND executor_id=#{personId}
ORDER BY create_at DESC
<!--select * from (
SELECT * FROM (SELECT * FROM pending_message_record WHERE DATE(create_at) <![CDATA[<]]> #{selectDate} AND state IN('HAS_BEEN_SENT')
SELECT * FROM (SELECT * FROM pending_message_record WHERE DATE(create_at) <![CDATA[<]]> DATE(#{selectDate}) AND state IN('HAS_BEEN_SENT')
AND template_code IN('d1d4793c84e14d20ae1cbc399338efa3','367ba552bb374049a73e737ac3b8b08c')
<if test="workspaceId != null"> AND org_id=#{workspaceId} </if>
ORDER BY create_at ASC) old_pending_message
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = #{selectDate}
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = DATE(#{selectDate})
AND template_code IN('d1d4793c84e14d20ae1cbc399338efa3','367ba552bb374049a73e737ac3b8b08c') <if test="workspaceId != null"> AND org_id=#{workspaceId} </if> ORDER BY create_at DESC) new_pending_message
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = #{selectDate} AND state IN('HAS_BEEN_SENT','COMPLETED')
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = DATE(#{selectDate}) AND state IN('HAS_BEEN_SENT','COMPLETED')
AND template_code IN('出厂打卡') <if test="workspaceId != null"> AND org_id=#{workspaceId} </if> ORDER BY create_at DESC) new_pending_message1
UNION ALL
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = #{selectDate} AND state IN('HAS_BEEN_SENT','COMPLETED')
SELECT * FROM(SELECT * FROM pending_message_record WHERE DATE(create_at) = DATE(#{selectDate}) AND state IN('HAS_BEEN_SENT','COMPLETED')
AND template_code IN('进场打卡') <if test="workspaceId != null"> AND org_id=#{workspaceId} </if> ORDER BY create_at DESC) new_pending_message2
)cc-->
</select>