|
@@ -161,29 +161,29 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
|
|
@PostMapping("batchSaveStudent")
|
|
@PostMapping("batchSaveStudent")
|
|
@Override
|
|
@Override
|
|
public OuterBatchSaveStudentResp batchSaveStudent(
|
|
public OuterBatchSaveStudentResp batchSaveStudent(
|
|
- @RequestBody @ApiParam(required = true) OuterBatchSaveStudentReq outerBatchSaveStudentReq) {
|
|
|
|
|
|
+ @RequestBody @ApiParam(required = true) OuterBatchSaveStudentReq req) {
|
|
|
|
|
|
- if (!getEnterpriseRootOrgId().equals(outerBatchSaveStudentReq.getRootOrgId())) {
|
|
|
|
|
|
+ if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
|
|
throw new StatusException("1000001", "rootOrgId is wrong");
|
|
throw new StatusException("1000001", "rootOrgId is wrong");
|
|
}
|
|
}
|
|
|
|
|
|
- List<Student4BatchBean> studentList = outerBatchSaveStudentReq.getStudentList();
|
|
|
|
|
|
+ List<Student4BatchBean> studentList = req.getStudentList();
|
|
|
|
|
|
List<StudentStatus4BatchBean> successList = Lists.newArrayList();
|
|
List<StudentStatus4BatchBean> successList = Lists.newArrayList();
|
|
List<StudentStatus4BatchBean> failureList = Lists.newArrayList();
|
|
List<StudentStatus4BatchBean> failureList = Lists.newArrayList();
|
|
|
|
|
|
- for (Student4BatchBean req : studentList) {
|
|
|
|
|
|
+ for (Student4BatchBean cur : studentList) {
|
|
SaveStudentReq request = new SaveStudentReq();
|
|
SaveStudentReq request = new SaveStudentReq();
|
|
- request.setIdentityNumber(req.getIdentityNumber());
|
|
|
|
- request.setName(req.getName());
|
|
|
|
- request.setOrgCode(req.getOrgCode());
|
|
|
|
- request.setOrgId(req.getOrgId());
|
|
|
|
- request.setOrgName(req.getOrgName());
|
|
|
|
- request.setPhoneNumber(req.getPhoneNumber());
|
|
|
|
- request.setRemark(req.getRemark());
|
|
|
|
- request.setRootOrgId(req.getRootOrgId());
|
|
|
|
|
|
+ request.setIdentityNumber(cur.getIdentityNumber());
|
|
|
|
+ request.setName(cur.getName());
|
|
|
|
+ request.setOrgCode(cur.getOrgCode());
|
|
|
|
+ request.setOrgId(cur.getOrgId());
|
|
|
|
+ request.setOrgName(cur.getOrgName());
|
|
|
|
+ request.setPhoneNumber(cur.getPhoneNumber());
|
|
|
|
+ request.setRemark(cur.getRemark());
|
|
|
|
+ request.setRootOrgId(cur.getRootOrgId());
|
|
List<String> studentCodeList = Lists.newArrayList();
|
|
List<String> studentCodeList = Lists.newArrayList();
|
|
- studentCodeList.add(req.getStudentCode());
|
|
|
|
|
|
+ studentCodeList.add(cur.getStudentCode());
|
|
request.setStudentCodeList(studentCodeList);
|
|
request.setStudentCodeList(studentCodeList);
|
|
|
|
|
|
try {
|
|
try {
|
|
@@ -191,20 +191,20 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
|
|
// 保存学生
|
|
// 保存学生
|
|
SaveStudentResp response = studentCloudService.saveStudent(request);
|
|
SaveStudentResp response = studentCloudService.saveStudent(request);
|
|
// 处理照片
|
|
// 处理照片
|
|
- processPhotoUrl(outerBatchSaveStudentReq.getRootOrgId(), req.getIdentityNumber(),
|
|
|
|
- req.getPhotoUrl(), req.getOperator());
|
|
|
|
|
|
+ processPhotoUrl(req.getRootOrgId(), cur.getIdentityNumber(), cur.getPhotoUrl(),
|
|
|
|
+ cur.getOperator());
|
|
|
|
|
|
StudentStatus4BatchBean studentStatus4BatchBeanSuccess = new StudentStatus4BatchBean();
|
|
StudentStatus4BatchBean studentStatus4BatchBeanSuccess = new StudentStatus4BatchBean();
|
|
studentStatus4BatchBeanSuccess.setStudentId(response.getStudentId());
|
|
studentStatus4BatchBeanSuccess.setStudentId(response.getStudentId());
|
|
- studentStatus4BatchBeanSuccess.setIdentityNumber(req.getIdentityNumber());
|
|
|
|
- studentStatus4BatchBeanSuccess.setName(req.getName());
|
|
|
|
- studentStatus4BatchBeanSuccess.setStudentCode(req.getStudentCode());
|
|
|
|
|
|
+ studentStatus4BatchBeanSuccess.setIdentityNumber(cur.getIdentityNumber());
|
|
|
|
+ studentStatus4BatchBeanSuccess.setName(cur.getName());
|
|
|
|
+ studentStatus4BatchBeanSuccess.setStudentCode(cur.getStudentCode());
|
|
successList.add(studentStatus4BatchBeanSuccess);
|
|
successList.add(studentStatus4BatchBeanSuccess);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
StudentStatus4BatchBean studentStatus4BatchBeanfailure = new StudentStatus4BatchBean();
|
|
StudentStatus4BatchBean studentStatus4BatchBeanfailure = new StudentStatus4BatchBean();
|
|
- studentStatus4BatchBeanfailure.setIdentityNumber(req.getIdentityNumber());
|
|
|
|
- studentStatus4BatchBeanfailure.setName(req.getName());
|
|
|
|
- studentStatus4BatchBeanfailure.setStudentCode(req.getStudentCode());
|
|
|
|
|
|
+ studentStatus4BatchBeanfailure.setIdentityNumber(cur.getIdentityNumber());
|
|
|
|
+ studentStatus4BatchBeanfailure.setName(cur.getName());
|
|
|
|
+ studentStatus4BatchBeanfailure.setStudentCode(cur.getStudentCode());
|
|
failureList.add(studentStatus4BatchBeanfailure);
|
|
failureList.add(studentStatus4BatchBeanfailure);
|
|
}
|
|
}
|
|
}
|
|
}
|