学校添加片区

common/src/main/java/com/jpsoft/campus/modules/base/dto/ApplicationPrimaryDTO.java

@@ -169,5 +169,8 @@ public class ApplicationPrimaryDTO implements Serializable {
     @ApiModelProperty(value = "转校插班申报的年级")
     private SchoolNumber schoolNumber;
 
+    @ApiModelProperty(value = "户籍地址")
+    private String residenceAddress;
+
     private String oldClass;
 }

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationPrimaryController.java

@@ -769,6 +769,7 @@ public class ApplicationPrimaryController {
                 map.put("statusName",dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
 //                map.put("statusName","");正式居住房类型
                 map.put("address",studentInfo.getAddress());
+                map.put("residenceAddress",studentInfo.getResidenceAddress());
                 SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getSchoolId());
                 map.put("schoolName",schoolInfo.getName());
 //                map.put("statusName","");正式居住房所有人与学生关系

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/PrimarySchoolApiController.java

@@ -464,6 +464,7 @@ public class PrimarySchoolApiController {
                 studentInfo.setDocumentUrl(applicationPrimaryDTO.getDocumentUrl());
                 studentInfo.setType(applicationPrimaryDTO.getStudentType());
                 studentInfo.setOldClass(applicationPrimaryDTO.getOldClass());
+                studentInfo.setResidenceAddress(applicationPrimaryDTO.getResidenceAddress());
 
                 studentInfo.setCreateTime(new Date());
                 studentInfo.setCreateBy(subject);
@@ -483,6 +484,7 @@ public class PrimarySchoolApiController {
                 studentInfo.setDocumentUrl(applicationPrimaryDTO.getDocumentUrl());
                 studentInfo.setType(applicationPrimaryDTO.getStudentType());
                 studentInfo.setOldClass(applicationPrimaryDTO.getOldClass());
+                studentInfo.setResidenceAddress(applicationPrimaryDTO.getResidenceAddress());
 
                 studentInfo.setUpdateTime(new Date());
                 studentInfo.setUpdateBy(subject);