From 11918241bbaa32fcd2106cf45d6090ea4a54509e Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Sun, 23 Feb 2025 19:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=87=E6=9C=9F=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/controller/SysOaHolidayController.java | 6 + .../com/ruoyi/oa/domain/vo/SysHolidayVo.java | 19 ++ .../ruoyi/oa/mapper/SysOaHolidayMapper.java | 5 + .../oa/service/ISysOaHolidayService.java | 2 + .../service/impl/SysOaHolidayServiceImpl.java | 31 ++- .../mapper/oa/SysOaHolidayMapper.xml | 20 ++ .../service/impl/WfProcessServiceImpl.java | 3 - ruoyi-ui/src/api/oa/oaHoliday.js | 9 + ruoyi-ui/src/components/QuickAccess/index.vue | 45 +++- ruoyi-ui/src/router/index.js | 22 -- ruoyi-ui/src/views/oa/holidaycal/index.vue | 203 ++++++++---------- 11 files changed, 222 insertions(+), 143 deletions(-) create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysHolidayVo.java diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java index 06b02ec..1c7cae9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java @@ -8,6 +8,7 @@ import java.util.concurrent.TimeUnit; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; @@ -141,4 +142,9 @@ public class SysOaHolidayController extends BaseController { public R updateHolidayStatusByDate(Integer type, @NotNull(message = "起始日期不能为空") Date startDate, @NotNull(message = "结束日期不能为空")Date endDate){ return toAjax(iSysOaHolidayService.updateHolidayStatusByDate(type, startDate, endDate)); } + + @GetMapping("/queryList") + public R> queryList(SysOaHolidayBo bo){ + return R.ok(iSysOaHolidayService.queryVoList(bo)); + } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysHolidayVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysHolidayVo.java new file mode 100644 index 0000000..8cd9e30 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysHolidayVo.java @@ -0,0 +1,19 @@ +package com.ruoyi.oa.domain.vo; + + +import com.ruoyi.oa.domain.SysOaHoliday; +import lombok.Data; + +import java.util.List; + +@Data +public class SysHolidayVo { + + private String holidayName; + + private String holidayType; + + private List holidayVoList; + + private String holidayTimeString; +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java index 37debd8..eb09dcc 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java @@ -1,9 +1,13 @@ package com.ruoyi.oa.mapper; import com.ruoyi.oa.domain.SysOaHoliday; +import com.ruoyi.oa.domain.bo.SysOaHolidayBo; +import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 休假管理Mapper接口 * @@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; */ public interface SysOaHolidayMapper extends BaseMapperPlus { + List queryVoList(SysOaHolidayBo bo); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java index 62e5671..327251f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java @@ -1,5 +1,6 @@ package com.ruoyi.oa.service; +import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; import com.ruoyi.oa.domain.vo.SysOaHolidayVo; import com.ruoyi.oa.domain.bo.SysOaHolidayBo; @@ -71,4 +72,5 @@ public interface ISysOaHolidayService { Boolean updateHolidayStatusByDate(Integer type, Date startDate, Date endDate); + List queryVoList(SysOaHolidayBo bo); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java index c4a49da..4e112a9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -17,6 +18,7 @@ import com.ruoyi.oa.domain.SysOaHoliday; import com.ruoyi.oa.mapper.SysOaHolidayMapper; import com.ruoyi.oa.service.ISysOaHolidayService; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.YearMonth; import java.time.ZoneId; @@ -157,7 +159,7 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { Date endDate = DateUtils.addDays(result.getHolidayTime(), days - 1); VoList.add(new SysOaHolidayListVo(result.getHolidayId(), result.getName(), result.getHolidayTime(), endDate, days, result.getType())); } - + System.out.println(VoList); return VoList; } @@ -197,6 +199,33 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { } + /** + * 按照节假日分类方式查找列表 + * @param bo + * @return list列表 + */ + @Override + public List queryVoList(SysOaHolidayBo bo) { + List list = baseMapper.queryVoList(bo); + for (SysHolidayVo sysHolidayVo : list) { + List holidayVoList = sysHolidayVo.getHolidayVoList(); + SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd"); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < holidayVoList.size(); i++) { + // 格式化日期 + System.out.println(holidayVoList.get(i).getHolidayTime()); + String formattedDate = SDF.format(holidayVoList.get(i).getHolidayTime()); + sb.append(formattedDate); + // 在每个日期后面加逗号（最后一个日期后面可选） + if (i < holidayVoList.size() - 1) { + sb.append(","); + } + } + + sysHolidayVo.setHolidayTimeString( sb.toString()); + } + return list; + } } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml index 349ea06..058a5be 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml @@ -17,5 +17,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index e6dad7e..e6ed3ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -719,8 +719,6 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce detailVo.setTaskFormData(currTaskFormData(historicProcIns.getDeploymentId(), taskIns)); } // 获取Bpmn模型信息 - System.out.println("--------------------------"); - System.out.println(historicProcIns); InputStream inputStream = repositoryService.getProcessModel(historicProcIns.getProcessDefinitionId()); String bpmnXmlStr = StrUtil.utf8Str(IoUtil.readBytes(inputStream, false)); BpmnModel bpmnModel = ModelUtils.getBpmnModel(bpmnXmlStr); @@ -977,7 +975,6 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce } else if (identityLink.getGroupId().startsWith(TaskConstants.DEPT_GROUP_PREFIX)) { Long deptId = Long.parseLong(StringUtils.stripStart(identityLink.getGroupId(), TaskConstants.DEPT_GROUP_PREFIX)); SysDept dept = deptService.selectDeptById(deptId); - System.out.println(dept); stringBuilder.append(dept.getDeptName()).append(","); } } diff --git a/ruoyi-ui/src/api/oa/oaHoliday.js b/ruoyi-ui/src/api/oa/oaHoliday.js index 98a4aa1..4e82ac0 100644 --- a/ruoyi-ui/src/api/oa/oaHoliday.js +++ b/ruoyi-ui/src/api/oa/oaHoliday.js @@ -9,6 +9,15 @@ export function listOaHoliday(query) { }) } +// 查询休假管理列表 +export function queryListHoliday(query) { + return request({ + url: '/oa/oaHoliday/queryList', + method: 'get', + params: query + }) +} + // 查询休假管理详细 export function getOaHoliday(holidayId) { return request({ diff --git a/ruoyi-ui/src/components/QuickAccess/index.vue b/ruoyi-ui/src/components/QuickAccess/index.vue index 8a3104d..8d9ef68 100644 --- a/ruoyi-ui/src/components/QuickAccess/index.vue +++ b/ruoyi-ui/src/components/QuickAccess/index.vue @@ -2,12 +2,24 @@

快捷入口

- {{ item.name }} + + + + {{ item.name }} + + + + + {{ item.name }} + +
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 85db4d8..b4f5a0a 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -150,28 +150,6 @@ export const constantRoutes = [ }, ] }, - - // { - // path: '/people/updateOffboarding/:offboardingId(\\d+)', - // component: () => import('@/views/oa/offboarding/update'), - // hidden: true, - // name: 'offboarding', - // meta: { title: '跟进离职流程', activeMenu: '/people/offboarding' } - // }, -/* { - path: '/finance', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'costing', - component: () => import('@/views/oa/costing/list'), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - } - ] - }*/ ] // 动态路由，基于用户权限动态去加载 diff --git a/ruoyi-ui/src/views/oa/holidaycal/index.vue b/ruoyi-ui/src/views/oa/holidaycal/index.vue index 7a47422..33b9875 100644 --- a/ruoyi-ui/src/views/oa/holidaycal/index.vue +++ b/ruoyi-ui/src/views/oa/holidaycal/index.vue @@ -3,62 +3,68 @@ -