Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/mapper/CoreResumptionConfigurationMapper.java

@@ -30,7 +30,6 @@ public interface CoreResumptionConfigurationMapper extends BaseMapper<CoreResump
      * @return 履职任务定时提醒集合
      */
     List<CoreResumptionConfiguration> selectCoreResumptionConfigurationList(CoreResumptionConfiguration coreResumptionConfiguration);
-
     /**
      * 新增履职任务定时提醒
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -54,6 +54,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
     private ICoreMessageCenterService coreMessageCenterService;
     @Autowired
     private RemoteJobService remoteJobService;
+    private static final String TIME = ":00";
 
     /**
      * 查询履职任务定时提醒
@@ -64,7 +65,15 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
     @Override
     public CoreResumptionConfigurationVO selectCoreResumptionConfigurationById() {
         CoreResumptionConfigurationVO coreResumptionConfigurationVO = new CoreResumptionConfigurationVO();
-        List<CoreResumptionConfiguration> coreResumptionConfigurations = coreResumptionConfigurationMapper.selectList(new QueryWrapper<CoreResumptionConfiguration>());
+        List<CoreResumptionConfiguration> coreResumptionConfigurations = coreResumptionConfigurationMapper.selectCoreResumptionConfigurationList(new CoreResumptionConfiguration());
+        for (CoreResumptionConfiguration c : coreResumptionConfigurations) {
+            if (StringUtils.isNotEmpty(c.getAfter())) {
+                c.setAllDay(c.getAllDay() + TIME);
+                c.setFront(c.getFront() + TIME);
+                c.setAfter(c.getAfter() + TIME);
+                c.setCentre(c.getCentre() + TIME);
+            }
+        }
         coreResumptionConfigurationVO.setCoreResumptionConfiguration(coreResumptionConfigurations);
         return coreResumptionConfigurationVO;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/mapper/CoreAnnouncementNotificationMapper.java

@@ -80,7 +80,8 @@ public interface CoreAnnouncementNotificationMapper extends BaseMapper<CoreAnnou
 
     List<CoreAnnouncementNotificationToRole> selectRoleIds(@Param("records") List<CoreAnnouncementNotificationPageVo> records);
 
-    void deleteRoleAndOrg(@Param("notificationId") Long notificationId);
+    void deleteRole(@Param("notificationId") Long notificationId);
+    void deleteOrg(@Param("notificationId") Long id);
 
     void deleteNotificationToUsers(@Param("notificationId")  Long notificationId);
 
@@ -91,4 +92,6 @@ public interface CoreAnnouncementNotificationMapper extends BaseMapper<CoreAnnou
     CoreAnnouncementNotificationToUser checkIsRead(@Param("request") CoreAnnouncementNotificationAppPageDto request);
 
     void insertNotificationUser(@Param("notificationUser") CoreAnnouncementNotificationToUser notificationUser);
+
+
 }

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

@@ -269,7 +269,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         List<Long> orgIds = request.getTagOrgIds();
         List<Long> roleIds = request.getTagRoleIds();
         //删除公告通知与角色和机构的关系
-        coreAnnouncementNotificationMapper.deleteRoleAndOrg(request.getId());
+        coreAnnouncementNotificationMapper.deleteRole(request.getId());
+        coreAnnouncementNotificationMapper.deleteOrg(request.getId());
         CoreAnnouncementNotification notification = this.buildSaveObject(request);
         if(CollectionUtil.isNotEmpty(orgIds)){
             List<CoreAnnouncementNotificationToOrg> list = new ArrayList<>();
@@ -306,7 +307,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         //删除公告通知与角色和机构的关系
         //刪除已读记录
         for(Long id:ids){
-            coreAnnouncementNotificationMapper.deleteRoleAndOrg(id);
+            coreAnnouncementNotificationMapper.deleteRole(id);
+            coreAnnouncementNotificationMapper.deleteOrg(id);
             coreAnnouncementNotificationMapper.deleteNotificationToUsers(id);
         }
 

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

@@ -233,15 +233,14 @@
             #{id}
         </foreach>
     </delete>
-    <delete id="deleteRoleAndOrg">
-        delete a,b
-        from core_announcement_notification_to_org a join
-        core_announcement_notification_to_role b
-        on a.announcement_notification_id = b.announcement_notification_id
-        where a.announcement_notification_id =#{notificationId}
+    <delete id="deleteRole">
+        delete from core_announcement_notification_to_role where announcement_notification_id = #{notificationId}
     </delete>
     <delete id="deleteNotificationToUsers">
         delete from core_announcement_notification_to_user
         where announcement_notification_id =#{notificationId}
     </delete>
+    <delete id="deleteOrg">
+        delete from core_announcement_notification_to_org  where announcement_notification_id = #{notificationId}
+    </delete>
 </mapper>