公告接口

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -36,6 +36,7 @@ import com.xjrsoft.module.oa.service.INewsService;
 import com.xjrsoft.module.oa.vo.*;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.*;
+import com.xjrsoft.module.organization.mapper.DepartmentMapper;
 import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
 import com.xjrsoft.module.organization.mapper.UserMapper;
 import com.xjrsoft.module.organization.service.IWeChatService;
@@ -84,6 +85,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
     private final UserMapper userMapper;
 
+    private final DepartmentMapper departmentMapper;
+
     private final BaseClassMapper baseClassMapper;
 
     private final XjrUserMapper xjrUserMapper;
@@ -156,27 +159,36 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         if (addProclamationDto.getSendRange() == 3 && addProclamationDto.getRelationList() != null) {
             for (AddNewsRelationDto relationDto : addProclamationDto.getRelationList()) {
                 if (relationDto.getRelationType() == 1) {
+                    Department department = departmentMapper.selectById(relationDto.getRelationId());
                     newsRelationConfigMapper.insert(new NewsRelationConfig(){{
                         setNewsId(news.getId());
                         setRelationId(relationDto.getRelationId());
                         setRelationType(relationDto.getRelationType());
-                        setRelationName("部门");
+                        if(department != null){
+                            setRelationName(department.getName());
+                        }
                     }});
                 }
                 if (relationDto.getRelationType() == 2)  {
+                    XjrUser xjrUser = xjrUserMapper.selectById(relationDto.getRelationId());
                     newsRelationConfigMapper.insert(new NewsRelationConfig(){{
                         setNewsId(news.getId());
                         setRelationId(relationDto.getRelationId());
                         setRelationType(relationDto.getRelationType());
-                        setRelationName("人员");
+                        if(xjrUser != null){
+                            setRelationName(xjrUser.getName());
+                        }
                     }});
                 }
                 if (relationDto.getRelationType() == 3)  {
+                    BaseClass baseClass = baseClassMapper.selectById(relationDto.getRelationId());
                     newsRelationConfigMapper.insert(new NewsRelationConfig(){{
                         setNewsId(news.getId());
                         setRelationId(relationDto.getRelationId());
                         setRelationType(relationDto.getRelationType());
-                        setRelationName("班级");
+                        if(baseClass != null){
+                            setRelationName(baseClass.getName());
+                        }
                     }});
                 }
             }
@@ -264,7 +276,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 .eq(News::getTypeId, 2)
                 .like(dto.getFullHead() != null, News::getFullHead, dto.getFullHead())
                 .like(dto.getKeyword() != null, News::getNewsContent, dto.getKeyword())
-                .orderByDesc(News::getReleaseTime);
+                .orderByDesc(News::getReleaseTime)
+                .disableSubLogicDel();
         IPage<ProclamationPageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), ProclamationPageVo.class, queryNews);
         return page;
     }
@@ -284,7 +297,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                 .or()
                 .eq(News::getSendRange, 2)
-                .orderByDesc(News::getReleaseTime);
+                .orderByDesc(News::getReleaseTime)
+                .disableSubLogicDel();;
         IPage<ProclamationPageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), ProclamationPageVo.class, queryNews);
         return page;
     }

src/main/java/com/xjrsoft/module/teacher/service/impl/WfTeacherleaveServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.teacher.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.LeaveReasonEnum;
 import com.xjrsoft.module.teacher.entity.WfHeadTeacherLeave;
@@ -14,7 +15,9 @@ import org.springframework.stereotype.Service;
 
 import java.time.*;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @title: 教职工请假流程
@@ -50,10 +53,10 @@ public class WfTeacherleaveServiceImpl extends MPJBaseServiceImpl<WfTeacherleave
                 DayOfWeek dayOfWeek = startTime.getDayOfWeek();
                 int dayOfWeekValue = dayOfWeek.getValue();
 
-                LocalDateTime forenoonStartDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(6, 0, 0));
-                LocalDateTime forenoonEndDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(11, 0, 0));
-                LocalDateTime afternoonStartDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(14, 0, 0));
-                LocalDateTime afternoonEndDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(22, 0, 0));
+                //LocalDateTime forenoonStartDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(9, 50, 0));
+                LocalDateTime forenoonEndDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(10, 30, 0));
+                //LocalDateTime afternoonStartDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(14, 0, 0));
+                LocalDateTime afternoonEndDateTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.of(15, 30, 0));
                 /*
                  *当天是在星期一到星期四，
                  * 且开始时间早于当天上午区间的结束时间，
@@ -80,6 +83,12 @@ public class WfTeacherleaveServiceImpl extends MPJBaseServiceImpl<WfTeacherleave
                         if(wfTeacherleave.getLeaveDays() > 1){
                             setSubstituteUserId(wfTeacherleave.getReliefTeacherId());
                         }
+                        setCreateDate(new Date());
+                        //setCreateUserId(StpUtil.getLoginIdAsLong());
+                        QueryWrapper<WfHeadTeacherLeave> queryWrapperSortcode = new QueryWrapper<>();
+                        queryWrapperSortcode.select("IFNULL(MAX(sort_code),1) as sortCode");
+                        WfHeadTeacherLeave w = wfHeadTeacherLeaveService.getOne(queryWrapperSortcode);
+                        setSortCode(w.getSortCode());
                     }});
                 }
                 /*
@@ -102,7 +111,12 @@ public class WfTeacherleaveServiceImpl extends MPJBaseServiceImpl<WfTeacherleave
                     wfHeadTeacherLeave.setTimePeriod(2);
                     wfHeadTeacherLeave.setRemark(wfTeacherleave.getReasonForLeave());
                     wfHeadTeacherLeave.setStatus(1);
-
+                    wfHeadTeacherLeave.setCreateDate(new Date());
+                    //wfHeadTeacherLeave.setCreateUserId(StpUtil.getLoginIdAsLong());
+                    QueryWrapper<WfHeadTeacherLeave> queryWrapperSortcode = new QueryWrapper<>();
+                    queryWrapperSortcode.select("IFNULL(MAX(sort_code),0) as sortCode");
+                    WfHeadTeacherLeave w = wfHeadTeacherLeaveService.getOne(queryWrapperSortcode);
+                    wfHeadTeacherLeave.setSortCode(w.getSortCode());
                     wfHeadTeacherLeaveList.add(wfHeadTeacherLeave);
                 }
             }