diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java index 049fd5b..32865f5 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java @@ -96,6 +96,12 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist return saveReturnId(null, dDistributionSaveVO); } + /** + * 保存发布信息 + * @param token + * @param dDistributionSaveVO + * @return + */ @Override public String saveReturnId(String token, DistributionSaveVO dDistributionSaveVO) { /** @@ -199,6 +205,12 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist update(null, distributionId, distributionVO); } + /** + * 分配考场/时间/生成准考证 + * @param token + * @param distributionId + * @param distributionVO + */ @Override public void update(String token, String distributionId, DistributionVO distributionVO) { /** diff --git a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java index 433061c..232499c 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java @@ -119,8 +119,8 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I userVO.setField(fieldDTO.getFieldName()); userVO.setStation(institutionDTO.getInstitutionName()); userVO.setNumber(j+""); - DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(j-1).getApplySex()); - userVO.setSex(dataDTO.getDataName()); + // DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(j-1).getApplySex()); + userVO.setSex(userList.get(j-1).getApplySex()); userVO.setName(userList.get(j-1).getApplyName()); userVO.setIcon(userList.get(j-1).getApplyUserCardPhoto()); userVO.setIdentity(userList.get(j-1).getApplyCardNumber()); @@ -144,7 +144,7 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I distributionCardVO.setClassPlanId(classPlanId); distributionCardVO.setDistributionId(distributionDTO.getDistributionId()); distributionCardVO.setDistributionCardPictures(base64); - distributionCardVO.setDistributionCardUserSex(dataDTO.getDataName()); + distributionCardVO.setDistributionCardUserSex(userList.get(j-1).getApplySex()); distributionCardVO.setDistributionCardUserIdentity(userList.get(j-1).getApplyCardNumber()); distributionCardVO.setDistributionCardUserResult(""); distributionCardVO.setDistributionCardUserStatus("0");