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

Compare commits

base: dianliang:a204ebf9c809b3cf649a825ddb31c8d06a781c9d
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:127623bd4cb85d8cc29bc94a3bc1f41d53e25e61
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "a204ebf9c809b3cf649a825ddb31c8d06a781c9d" and "127623bd4cb85d8cc29bc94a3bc1f41d53e25e61" have entirely different histories.
a204ebf9c8 ... 127623bd4c

3 changed files with 13 additions and 7 deletions
Show Stats 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,6 +90,9 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi
Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId();
if (deptId == 100){
deptId = 227L;
}
DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId);
driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId());
return driveSchoolExamPassMapper.selectDriveSchoolExamPassList(driveSchoolExamPass, page);
@ -208,6 +211,9 @@ public class DriveSchoolExamPassServiceImpl implements IDriveSchoolExamPassServi
Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId();
if (deptId == 100){
deptId = null;
}
DriveSchoolInfoVO schoolInfoByDeptId = driveSchoolInfoMapper.getSchoolInfoByDeptId(deptId);
driveSchoolExamPass.setJxId(schoolInfoByDeptId.getId());
}

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

@ -129,6 +129,9 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese
AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId();
driveSchoolReservationCourse.setDeptId(deptId);
if (deptId == 100){
driveSchoolReservationCourse.setDeptId(null);
}
IPage<DriveSchoolReservationCourse> driveSchoolReservationCourseIPage = driveSchoolReservationCourseMapper.selectDriveSchoolReservationCourseList(driveSchoolReservationCourse, page);
List<DriveSchoolReservationCourse> courseList = driveSchoolReservationCourseIPage.getRecords();
@ -142,13 +145,10 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese
// SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId());
// item.setSysUser(sysUserData);
AdminUserRespDTO sysUserData = userApi.getUser(item.getUserId());
if (ObjectUtils.isNotEmpty(sysUserData)){
AdminUserDO adminUserDO = new AdminUserDO();
BeanUtils.copyProperties(sysUserData,adminUserDO);
item.setSysUser(adminUserDO);
}
AdminUserDO adminUserDO = new AdminUserDO();
BeanUtils.copyProperties(sysUserData,adminUserDO);
// SysUser sysUserData = sysUserMapper.findSysUserById(item.getUserId());
item.setSysUser(adminUserDO);
DriveSchoolPay driveSchoolPay = driveSchoolPayMapper.selectByUserId(item.getUserId());
if (ObjectUtils.isNotEmpty(driveSchoolPay)){
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
payState = 1
and status = 1
<if test="entity.payStartTimes != null and entity.payEndTimes != null"> and payTime between #{entity.payStartTimes} and #{entity.payEndTimes}</if>
<if test="entity.payStartTimes != null and entity.payEndTimes != null"> and payd_time 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.jlId != null "> and jlId = #{entity.jlId}</if>
<if test="entity.jxId != null "> and jxId = #{entity.jxId}</if>