Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java

@@ -73,6 +73,12 @@ public class OrganizationMessageResultDTO {
      */
     private Integer totalReceiver;
 
+    /**
+     * 发送完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date finishSendTime;
+
     private List<OrganizationMessagePublishRangeDTO> rangeList;
 }
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java

@@ -74,4 +74,9 @@ public class OrganizationMessageEntity extends BaseEpmetEntity {
 	 * 共发送出多少条消息
 	 */
 	private Integer totalReceiver;
+
+	/**
+	 * 发送完成时间
+	 */
+	private Date finishSendTime;
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java

@@ -209,6 +209,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl<Organization
             updateWrapper.eq(OrganizationMessageEntity::getId, messageId)
                     .set(OrganizationMessageEntity::getSendMsgRes, result)
                     .set(OrganizationMessageEntity::getTotalReceiver, totalMsg)
+                    .set(OrganizationMessageEntity::getFinishSendTime,new Date())
                     .set(OrganizationMessageEntity::getUpdatedTime,new Date());
             baseDao.update(null, updateWrapper);
         }

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml

@@ -35,6 +35,7 @@
             OM.PUBLISH_ORG_NAME as publishOrgName,
             om.SEND_MSG_RES as sendMsgRes,
             om.TOTAL_RECEIVER as totalReceiver,
+            om.FINISH_SEND_TIME as finishSendTime,
             GROUP_CONCAT(r.ORG_NAME) as publishRangeName
         from organization_message om
         left join organization_message_publish_range r