dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
赵旭 2024-08-28 23:58:05 +08:00
parent a084d5987a
commit 7ff9488d4c
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolExamPassServiceImpl.java
View File

@ -90,9 +90,6 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi
Long userId = SecurityFrameworkUtils.getLoginUserId(); Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId); AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
if (deptId == 100){
deptId = 227L;
}
DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId);
driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId());
return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass, page); return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass, page);
@ -211,9 +208,6 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi
Long userId = SecurityFrameworkUtils.getLoginUserId(); Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId); AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
if (deptId == 100){
deptId = null;
}
DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId); DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId);
driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId()); driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId());
} }

12
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java
View File

@ -129,9 +129,6 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese
AdminUserRespDTO user = userApi.getUser(userId); AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
driveSchoolReservationCourse.setDeptId(deptId); driveSchoolReservationCourse.setDeptId(deptId);
if (deptId == 100){
driveSchoolReservationCourse.setDeptId(null);
}
IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page); IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page);
List<DriveSchoolReservationCourse> courseList = driveSchoolReservationCourseIPage.getRecords(); List<DriveSchoolReservationCourse> courseList = driveSchoolReservationCourseIPage.getRecords();
@ -145,10 +142,13 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese
// SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId()); // SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId());
// item.setSysUser(sysUserData); // item.setSysUser(sysUserData);
AdminUserRespDTO sysUserData = userApi.getUser(item.getUserId()); AdminUserRespDTO sysUserData = userApi.getUser(item.getUserId());
AdminUserDO adminUserDO = new AdminUserDO(); if (ObjectUtils.isNotEmpty(sysUserData)){
BeanUtils.copyProperties(sysUserData,adminUserDO); AdminUserDO adminUserDO = new AdminUserDO();
BeanUtils.copyProperties(sysUserData,adminUserDO);
item.setSysUser(adminUserDO);
}
// SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId()); // SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId());
item.setSysUser(adminUserDO);
DriveSchoolPay driveSchoolPay = driveSchoolPayMapper.selectByUserId(item.getUserId()); DriveSchoolPay driveSchoolPay = driveSchoolPayMapper.selectByUserId(item.getUserId());
if (ObjectUtils.isNotEmpty(driveSchoolPay)){ if (ObjectUtils.isNotEmpty(driveSchoolPay)){
item.setUserName(driveSchoolPay.getName()); item.setUserName(driveSchoolPay.getName());

2
dl-module-jx/src/main/resources/mapper/jx/DriveSchoolExamPassMapper.xml
View File

@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
deleted = 0 and deleted = 0 and
payState = 1 payState = 1
and status = 1 and status = 1
<if test="entity.payStartTimes != null and entity.payEndTimes != null"> and payd_time between #{entity.payStartTimes} and #{entity.payEndTimes}</if> <if test="entity.payStartTimes != null and entity.payEndTimes != null"> and payTime between #{entity.payStartTimes} and #{entity.payEndTimes}</if>
<if test="entity.jlName != null and entity.jlName != ''"> and jlName like concat('%', #{entity.jlName}, '%')</if> <if test="entity.jlName != null and entity.jlName != ''"> and jlName like concat('%', #{entity.jlName}, '%')</if>
<if test="entity.jlId != null "> and jlId = #{entity.jlId}</if> <if test="entity.jlId != null "> and jlId = #{entity.jlId}</if>
<if test="entity.jxId != null "> and jxId = #{entity.jxId}</if> <if test="entity.jxId != null "> and jxId = #{entity.jxId}</if>