Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Renpc-kilig 2021-05-13 11:17:44 +08:00
commit d0e0a9437b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardUserVO.java
View File

@ -34,6 +34,16 @@ public class DistributionCardUserVO {
private String unitName; private String unitName;
//@ApiModelProperty(name = "classPlanName", value = "班级名称") //@ApiModelProperty(name = "classPlanName", value = "班级名称")
private String classPlanName; private String classPlanName;
//@ApiModelProperty(name = "classPlanName", value = "考试地址")
private String address;
public String getAddress() {
return address == null ? "" : address;
}
public void setAddress(String address) {
this.address = address;
}
public String getClassPlanName() { public String getClassPlanName() {
return classPlanName == null ? "" : classPlanName; return classPlanName == null ? "" : classPlanName;

1
src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java
View File

@ -128,6 +128,7 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I
InstitutionDTO institutionDTO1 = iInstitutionService.get(userList.get(j-1).getApplyInstitutionId()); InstitutionDTO institutionDTO1 = iInstitutionService.get(userList.get(j-1).getApplyInstitutionId());
userVO.setUnitName(institutionDTO1.getInstitutionName()); userVO.setUnitName(institutionDTO1.getInstitutionName());
userVO.setClassPlanName(userList.get(j-1).getApplyClassName()); userVO.setClassPlanName(userList.get(j-1).getApplyClassName());
userVO.setAddress(institutionDTO.getInstitutionAddress());
String base64 = iPicturesTemplateBuildingService.buildingPictures("TS0001", userVO); String base64 = iPicturesTemplateBuildingService.buildingPictures("TS0001", userVO);
if(base64 == null) { if(base64 == null) {
throw new SaveException("生成准考证出错"); throw new SaveException("生成准考证出错");