From 445908a5e8d5d1f7c567efc4d0dd88c2870bf0e0 Mon Sep 17 00:00:00 2001 From: lijun Date: Tue, 22 Oct 2024 23:22:56 +0800 Subject: [PATCH] update code --- .../com/yanzhu}/api/domain/SysDictData.java | 0 .../com/yanzhu}/security/utils/DictUtils.java | 0 .../com/yanzhu/system/domain/SysArea.java | 0 .../com/yanzhu/system/domain/SysConfig.java | 0 .../com/yanzhu/system/domain/SysMenu.java | 0 .../com/yanzhu/system/domain/SysNotice.java | 0 .../com/yanzhu/system/domain/SysPost.java | 0 .../com/yanzhu/system/domain/SysRoleMenu.java | 0 .../yanzhu/system/domain/SysUserOnline.java | 0 .../com/yanzhu/system/domain/SysUserPost.java | 0 .../com/yanzhu/system/domain/SysUserRole.java | 0 .../com/yanzhu/system/domain/vo/MetaVo.java | 0 .../com/yanzhu/system/domain/vo/RouterVo.java | 0 .../yanzhu/system/domain/vo/TreeSelect.java | 0 .../yanzhu/system/mapper/SysAreaMapper.java | 0 .../yanzhu/system/mapper/SysConfigMapper.java | 0 .../yanzhu/system/mapper/SysDeptMapper.java | 0 .../system/mapper/SysDictDataMapper.java | 0 .../system/mapper/SysDictTypeMapper.java | 0 .../system/mapper/SysLogininforMapper.java | 0 .../yanzhu/system/mapper/SysMenuMapper.java | 0 .../yanzhu/system/mapper/SysNoticeMapper.java | 0 .../system/mapper/SysOperLogMapper.java | 0 .../yanzhu/system/mapper/SysPostMapper.java | 0 .../system/mapper/SysRoleDeptMapper.java | 0 .../yanzhu/system/mapper/SysRoleMapper.java | 0 .../system/mapper/SysRoleMenuMapper.java | 0 .../yanzhu/system/mapper/SysUserMapper.java | 0 .../system/mapper/SysUserPostMapper.java | 0 .../system/mapper/SysUserRoleMapper.java | 0 .../system/mapper/SysUserUniopenMapper.java | 0 .../resources/mapper/system/SysAreaMapper.xml | 0 .../mapper/system/SysConfigMapper.xml | 0 .../resources/mapper/system/SysDeptMapper.xml | 0 .../mapper/system/SysDictDataMapper.xml | 0 .../mapper/system/SysDictTypeMapper.xml | 0 .../mapper/system/SysLogininforMapper.xml | 0 .../resources/mapper/system/SysMenuMapper.xml | 0 .../mapper/system/SysNoticeMapper.xml | 0 .../mapper/system/SysOperLogMapper.xml | 0 .../resources/mapper/system/SysPostMapper.xml | 0 .../mapper/system/SysRoleDeptMapper.xml | 0 .../resources/mapper/system/SysRoleMapper.xml | 0 .../mapper/system/SysRoleMenuMapper.xml | 0 .../resources/mapper/system/SysUserMapper.xml | 0 .../mapper/system/SysUserPostMapper.xml | 0 .../mapper/system/SysUserRoleMapper.xml | 0 .../mapper/system/SysUserUniopenMapper.xml | 0 .../AttendanceUbiDataController.java | 6 ++-- .../controller/BusExamInfoController.java | 1 + .../service/IAttendanceUbiDataService.java | 2 +- .../impl/AttendanceUbiDataServiceImpl.java | 29 ++++++++++++++++++- yanzhu-modules/yanzhu-system/pom.xml | 6 ++++ .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 2 +- .../manage/attendanceUbiData/statistics.vue | 11 ++++++- 56 files changed, 51 insertions(+), 8 deletions(-) rename {yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system => yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu}/api/domain/SysDictData.java (100%) rename yanzhu-common/{yanzhu-common-security/src/main/java/com/yanzhu/common => yanzhu-common-mapper/src/main/java/com/yanzhu}/security/utils/DictUtils.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysArea.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysConfig.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysMenu.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysNotice.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysPost.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysUserOnline.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysUserPost.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/SysUserRole.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysAreaMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysConfigMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysDeptMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysDictDataMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysLogininforMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysMenuMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysNoticeMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysOperLogMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysPostMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysRoleMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysUserMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysUserPostMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%) rename {yanzhu-modules/yanzhu-system => yanzhu-common/yanzhu-common-mapper}/src/main/resources/mapper/system/SysUserUniopenMapper.xml (100%) diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDictData.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java similarity index 100% rename from yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDictData.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java diff --git a/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/utils/DictUtils.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java similarity index 100% rename from yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/utils/DictUtils.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysArea.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysArea.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysArea.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysArea.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysConfig.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysConfig.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysConfig.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysMenu.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysMenu.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysMenu.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysMenu.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysNotice.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysNotice.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysNotice.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysNotice.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysPost.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysPost.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysPost.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysPost.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserOnline.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserOnline.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserOnline.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserOnline.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserPost.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserPost.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserPost.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserPost.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserRole.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserRole.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysAreaMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysAreaMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysAreaMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysAreaMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysPostMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysPostMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserUniopenMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserUniopenMapper.xml similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserUniopenMapper.xml rename to yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserUniopenMapper.xml diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDataController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDataController.java index ca06c31f..1ad4ac3d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDataController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDataController.java @@ -61,7 +61,7 @@ public class AttendanceUbiDataController extends BaseController attendanceUbiData.setUserIds(userIds); List userDatas=attendanceUbiDataService.queryStatisticsByUserIds(attendanceUbiData); //处理汇总数据 - List retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), datas,userDatas); + List retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), datas,userDatas,false); data.setRows(retUsers); } return data; @@ -83,7 +83,7 @@ public class AttendanceUbiDataController extends BaseController Calendar calendar = new GregorianCalendar(inTime.getYear(), inTime.getMonth(), 1); int daysInMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); //处理汇总数据 - List retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), list,userDatas); + List retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), list,userDatas,true); ExcelUtil util = new ExcelUtil(AttendanceUbiData.class){ @Override public void writeSheet() { @@ -130,7 +130,7 @@ public class AttendanceUbiDataController extends BaseController response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); - util.init(list, "考勤管理数据", "", Excel.Type.EXPORT); + util.init(retUsers, "考勤管理数据", "", Excel.Type.EXPORT); util.exportExcel(response); } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamInfoController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamInfoController.java index 042ea17c..ae2404fd 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamInfoController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamInfoController.java @@ -7,6 +7,7 @@ import com.yanzhu.common.core.web.page.TableDataInfo; import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; + import com.yanzhu.manage.domain.BusExamInfo; import com.yanzhu.manage.service.IBusExamInfoService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDataService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDataService.java index f0cca3e8..82d76015 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDataService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDataService.java @@ -75,5 +75,5 @@ public interface IAttendanceUbiDataService */ List queryStatisticsByUserIds(AttendanceUbiData attendanceUbiData); - List procStatistics(Date inTime, List datas, List userDatas); + List procStatistics(Date inTime, List datas, List userDatas,boolean updateCraft); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java index 0bcb0336..c7fd1e20 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java @@ -2,12 +2,15 @@ package com.yanzhu.manage.service.impl; import java.util.*; +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.yanzhu.common.core.context.SecurityContextHolder; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.manage.domain.AttendanceUbiData; import com.yanzhu.manage.mapper.AttendanceUbiDataMapper; import com.yanzhu.manage.service.IAttendanceUbiDataService; +import com.yanzhu.system.api.domain.SysDictData; +import com.yanzhu.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,6 +27,8 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService private AttendanceUbiDataMapper attendanceUbiDataMapper; + @Autowired + private SysDictDataMapper dictDataMapper; /** * 查询考勤管理 * @@ -116,8 +121,17 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService } @Override - public List procStatistics(Date inTime, List datas, List userDatas) { + public List procStatistics(Date inTime, List datas, List userDatas,boolean updateCraft) { List users=new ArrayList<>(); + List craftTypes=null; + List craftPosts=null; + if(updateCraft) { + SysDictData where=new SysDictData(); + where.setDictType("pro_craft_type"); + craftTypes = dictDataMapper.selectDictDataList(where); + where.setDictType("pro_craft_post"); + craftPosts = dictDataMapper.selectDictDataList(where); + } if(datas.size()==0){ return users; } @@ -131,6 +145,10 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService if(j==0){ fd.setDays(days); users.add(fd); + if(updateCraft){ + fd.setCraftType(getUserCraft(fd.getCraftType(),craftTypes)); + fd.setCraftPost(getUserCraft(fd.getCraftPost(),craftPosts)); + } } j++; Date dt=fd.getInTime(); @@ -151,6 +169,15 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService return users; } + private String getUserCraft(String val, List dicts) { + for(SysDictData dic:dicts){ + if(val.equals(dic.getDictValue())){ + return dic.getDictLabel(); + } + } + return val; + } + private List findUserDatas(AttendanceUbiData ad, List userDatas) { List list=new ArrayList<>(); for(AttendanceUbiData it :userDatas){ diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml index 981b9900..6e843396 100644 --- a/yanzhu-modules/yanzhu-system/pom.xml +++ b/yanzhu-modules/yanzhu-system/pom.xml @@ -84,6 +84,12 @@ com.yanzhu yanzhu-common-datascope + + com.yanzhu + yanzhu-common-mapper + 3.6.2 + compile + diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java index e3fb90bf..c0387af4 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java @@ -2,10 +2,10 @@ package com.yanzhu.system.service.impl; import java.util.List; +import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.system.api.domain.SysDictData; import com.yanzhu.system.service.ISysDictDataService; diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java index 11f677c5..72910b7c 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.PostConstruct; +import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional; import com.yanzhu.common.core.constant.UserConstants; import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.utils.StringUtils; -import com.yanzhu.common.security.utils.DictUtils; import com.yanzhu.system.api.domain.SysDictData; import com.yanzhu.system.api.domain.SysDictType; import com.yanzhu.system.mapper.SysDictTypeMapper; diff --git a/yanzhu-ui-vue3/src/views/manage/attendanceUbiData/statistics.vue b/yanzhu-ui-vue3/src/views/manage/attendanceUbiData/statistics.vue index 61183d04..1475592c 100644 --- a/yanzhu-ui-vue3/src/views/manage/attendanceUbiData/statistics.vue +++ b/yanzhu-ui-vue3/src/views/manage/attendanceUbiData/statistics.vue @@ -116,8 +116,17 @@ function getProjectList() { } function handleExport(){ + let queryData={ + projectId:queryParams.value.projectId, + subDeptId:queryParams.value.subDeptId + } + let dt1=proxy.$dt(queryParams.value.inTime); + let dt2=dt1.month(dt1.month()+1); + queryData.inTime=dt1.format("YYYY-MM-01"); + queryData.outTime=dt2.format("YYYY-MM-01"); + proxy.download('manage/attendanceUbiData/statisticsExport', { - ...queryParams.value + ...queryData }, `attendanceUbiData_${new Date().getTime()}.xlsx`) }