Merge remote-tracking branch 'origin/main'

This commit is contained in:
MDSMO
2025-08-18 09:36:41 +08:00
20 changed files with 765 additions and 422 deletions

View File

@@ -8,6 +8,8 @@ import com.srs.common.core.domain.entity.SysUser;
import com.srs.common.enums.QgzxApplyStatus;
import com.srs.comprehensive.domain.CphTeacher;
import com.srs.comprehensive.mapper.CphTeacherMapper;
import com.srs.system.domain.QgzxTeacher;
import com.srs.system.mapper.QgzxTeacherMapper;
import com.srs.system.mapper.SysDeptMapper;
import com.srs.system.mapper.SysUserMapper;
import com.srs.workstudy.domain.QgzxMoney;
@@ -61,6 +63,8 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
@Autowired
private CphTeacherMapper _teacherMapper;
@Autowired
private QgzxTeacherMapper _qgzxteacherMapper;
@Autowired
private SysUserMapper _userMapper;
@@ -383,10 +387,14 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
}
}
QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
// QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// fzrQuery.eq("employee_id", param.fzrNo)
// .last("limit 1");
// CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QueryWrapper<QgzxTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
QgzxTeacher fzr = _qgzxteacherMapper.selectOne(fzrQuery);
if (fzr == null) {
throw new Exception("负责人工号不存在");
} else {
@@ -437,10 +445,14 @@ public class QgzxPostServiceImpl extends ServiceImpl<QgzxPostMapper,QgzxPost> im
}
}
QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// QueryWrapper<CphTeacher> fzrQuery = new QueryWrapper<>();
// fzrQuery.eq("employee_id", param.fzrNo)
// .last("limit 1");
// CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QueryWrapper<QgzxTeacher> fzrQuery = new QueryWrapper<>();
fzrQuery.eq("employee_id", param.fzrNo)
.last("limit 1");
CphTeacher fzr = _teacherMapper.selectOne(fzrQuery);
QgzxTeacher fzr = _qgzxteacherMapper.selectOne(fzrQuery);
if (fzr == null) {
throw new Exception("负责人工号不存在");
} else {