通知公告排序修改

project_data/sql/0.1.0_zhulu/soc.sql

@@ -67,3 +67,7 @@ UPDATE sys_dict_data SET dict_label = '防盗'  WHERE dict_type = 'app_sensor_de
 
 UPDATE iot_alarm_data SET source_type_des = REPLACE ( source_type_des, '盗情', '防盗' ),content = REPLACE ( content, '盗情', '防盗' ) WHERE source_type = '41881';
 update iot_sensor_log set infos = REPLACE ( infos, '被盗', '防盗' ) WHERE device_type = '41881';
+-- 处理已失效的介绍信无法登记离开
+update core_out_in_record set status=1 where arrival_time is not null  and departure_time is null  and status=3;
+-- 处理通知公告排序
+update core_announcement_notification set update_time=create_time,update_by=create_by where update_time is null;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/impl/CoreAnnouncementNotificationServiceImpl.java

@@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.message.domain.*;
+import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotification;
+import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToOrg;
+import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToOrgtype;
+import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToUser;
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationAppPageDto;
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto;
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
-import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
 import com.xunmei.common.core.domain.message.vo.FileObject;
 import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
@@ -30,14 +30,16 @@ import com.xunmei.core.message.service.ICoreAnnouncementNotificationService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -273,7 +275,9 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         BeanHelper.copyProperties(notification,request);
         notification.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
         notification.setCreateTime(DateUtils.getNowDate());
+        notification.setUpdateTime(DateUtils.getNowDate());
         notification.setCreateBy(SecurityUtils.getUsername());
+        notification.setUpdateBy(SecurityUtils.getUsername());
         notification.setId(request.getId()==null?IdWorker.getId():request.getId());
         notification.setOrgPath(sysOrg.getPath());
         notification.setOrgName(sysOrg.getShortName());

soc-modules/soc-modules-core/src/main/resources/mapper/message/CoreAnnouncementNotificationMapper.xml

@@ -65,7 +65,7 @@
         <if test="request.messagStatus != null  and request.messagStatus != ''">
             and messag_status = #{request.messagStatus}
         </if>
-         order by messag_status asc ,publish_time desc
+         order by messag_status asc ,update_time desc
     </select>
     <select id="selectOrgIds"
             resultType="com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToOrg">