|
|
@@ -69,11 +69,11 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
|
|
|
AidingStudentPersonManageInfoRespVO result = new AidingStudentPersonManageInfoRespVO();
|
|
|
Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
|
|
|
- result.setClassName((String) map.get("SZBJMC"));
|
|
|
- result.setStudentId(user.getStudentId());
|
|
|
- result.setEnrollmentYear((String) map.get("RXNY"));
|
|
|
- result.setIdCard((String) map.get("SFZJH"));
|
|
|
- result.setRegisteredResidence((String) map.get("JG"));
|
|
|
+ result.setClassName((String) map.get("SZBJMC"))
|
|
|
+ .setStudentId(user.getStudentId())
|
|
|
+ .setEnrollmentYear((String) map.get("RXNY"))
|
|
|
+ .setIdCard((String) map.get("SFZJH"))
|
|
|
+ .setRegisteredResidence((String) map.get("JG"));
|
|
|
return result;
|
|
|
} catch (Exception exception) {
|
|
|
exception.printStackTrace();
|
|
|
@@ -95,26 +95,23 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
.eq(AidingStudentsPersonManageDO::getManageId, uploadVO.getManageId())
|
|
|
.eq(AidingStudentsPersonManageDO::getCollegeManageId, uploadVO.getCollegeManageId())
|
|
|
.eq(AidingStudentsPersonManageDO::getStudentId, uploadVO.getStudentId()));
|
|
|
- if(user1 != null){
|
|
|
+ if (user1 != null) {
|
|
|
throw exception(STUDENT_INFO_EXISTS);
|
|
|
}
|
|
|
// 1.获取当前登录的用户表
|
|
|
AidingStudentsPersonManageDO aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
|
|
|
- AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
|
|
|
+ AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
|
|
|
Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
|
|
|
// 2.补充字段
|
|
|
// 项目ID跟学院项目ID前端传
|
|
|
- Long collegeId = deptApi.getCollegeId(user.getDeptId());
|
|
|
- aDo.setCollegeId(collegeId);
|
|
|
Map resultmap = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
|
|
|
- aDo.setMajor((String) resultmap.get("ZYMC"));
|
|
|
- aDo.setCollegeName((String) resultmap.get("DWMC"));
|
|
|
- aDo.setGrade((String) map.get("SZNJ"));
|
|
|
- aDo.setNickname(user.getNickname());
|
|
|
- aDo.setStatus(0);
|
|
|
-
|
|
|
+ aDo.setCollegeId(deptApi.getCollegeId(user.getDeptId()))
|
|
|
+ .setMajor((String) resultmap.get("ZYMC"))
|
|
|
+ .setCollegeName((String) resultmap.get("DWMC"))
|
|
|
+ .setGrade((String) map.get("SZNJ"))
|
|
|
+ .setNickname(user.getNickname())
|
|
|
+ .setStatus(0);
|
|
|
aidingStudentsPersonManageMapper.insert(aDo);
|
|
|
-
|
|
|
String processInstanceId = processInstanceApi.createProcessInstance(user.getId(),
|
|
|
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
|
|
|
.setBusinessKey(String.valueOf(aDo.getId())));
|
|
|
@@ -176,10 +173,6 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- vo.setCollegeAll(allList.size());
|
|
|
- vo.setCollegeAudit(wait);
|
|
|
- vo.setCollegeEdit(edit);
|
|
|
- vo.setCollegePass(pass);
|
|
|
// 3.查看班级数量
|
|
|
List<Map<String, Object>> maps = aidingStudentsPersonManageMapper
|
|
|
.countByClassName(pageReqVO);
|
|
|
@@ -188,8 +181,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
.selectList(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
|
|
|
.eq(AidingStudentPersonManageEvaluationResultDO::getCollegeManageId, pageReqVO.getCollegeManageId())
|
|
|
.eq(AidingStudentPersonManageEvaluationResultDO::getManageId, pageReqVO.getManageId()));
|
|
|
- vo.setDoneEvaluationNumber(reviewList.size());
|
|
|
- vo.setWaitingForEvaluationNumber(maps.size() - reviewList.size() );
|
|
|
+ vo.setCollegeAll(allList.size())
|
|
|
+ .setCollegeAudit(wait)
|
|
|
+ .setCollegeEdit(edit)
|
|
|
+ .setCollegePass(pass)
|
|
|
+ .setDoneEvaluationNumber(reviewList.size())
|
|
|
+ .setWaitingForEvaluationNumber(maps.size() - reviewList.size());
|
|
|
// 3.2 统计各个班级完成的情况
|
|
|
for (Map<String, Object> map : maps) {
|
|
|
AidingStudentPersonManageClassVO classVo = new AidingStudentPersonManageClassVO();
|
|
|
@@ -212,11 +209,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
} else {
|
|
|
}
|
|
|
}
|
|
|
- classVo.setClassName((String) map.get("class_name"));
|
|
|
- classVo.setClassAll(classList.size());
|
|
|
- classVo.setClassAudit(wait);
|
|
|
- classVo.setClassEdit(edit);
|
|
|
- classVo.setClassPass(pass);
|
|
|
+ classVo
|
|
|
+ .setClassName((String) map.get("class_name"))
|
|
|
+ .setClassAll(classList.size())
|
|
|
+ .setClassAudit(wait)
|
|
|
+ .setClassEdit(edit)
|
|
|
+ .setClassPass(pass);
|
|
|
list.add(classVo);
|
|
|
}
|
|
|
|
|
|
@@ -352,13 +350,16 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
|
|
|
*/
|
|
|
@Override
|
|
|
public AidingStudentPersonManageInfoRespVO schoolauditAidingStudentsPersonManageData(Long id) {
|
|
|
+ // 1.获取申请表信息（）
|
|
|
AidingStudentsPersonManageDO aDo = aidingStudentsPersonManageMapper.selectById(id);
|
|
|
- AidingStudentPersonManageEvaluationResultDO aidingStudentPersonManageEvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
|
|
|
- .selectOne(null,new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
|
|
|
- .eq(AidingStudentsPersonManageDO::getClassName, aDo.getClassName()));
|
|
|
+ // 2.获取评议结果信息
|
|
|
+ AidingStudentPersonManageEvaluationResultDO EvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
|
|
|
+ .selectOne(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
|
|
|
+ .eq(AidingStudentPersonManageEvaluationResultDO::getClassName, aDo.getClassName()));
|
|
|
+ // 3.整合
|
|
|
AidingStudentPersonManageInfoRespVO vo = new AidingStudentPersonManageInfoRespVO();
|
|
|
- vo = BeanUtils.toBean(aDo, AidingStudentPersonManageInfoRespVO.class);
|
|
|
- vo = BeanUtils.toBean(aidingStudentPersonManageEvaluationResultDO, AidingStudentPersonManageInfoRespVO.class);
|
|
|
+ org.springframework.beans.BeanUtils.copyProperties(EvaluationResultDO, vo);
|
|
|
+ org.springframework.beans.BeanUtils.copyProperties(aDo, vo);
|
|
|
return vo;
|
|
|
}
|
|
|
|
平常心