解决包名冲突问题

This commit is contained in:
cuibaocheng 2021-06-10 10:55:37 +08:00
parent 94d7387ab1
commit 42e54bbe81
2 changed files with 15 additions and 3 deletions

View File

@ -96,6 +96,12 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
return saveReturnId(null, dDistributionSaveVO); return saveReturnId(null, dDistributionSaveVO);
} }
/**
* 保存发布信息
* @param token
* @param dDistributionSaveVO
* @return
*/
@Override @Override
public String saveReturnId(String token, DistributionSaveVO dDistributionSaveVO) { public String saveReturnId(String token, DistributionSaveVO dDistributionSaveVO) {
/** /**
@ -199,6 +205,12 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
update(null, distributionId, distributionVO); update(null, distributionId, distributionVO);
} }
/**
* 分配考场/时间/生成准考证
* @param token
* @param distributionId
* @param distributionVO
*/
@Override @Override
public void update(String token, String distributionId, DistributionVO distributionVO) { public void update(String token, String distributionId, DistributionVO distributionVO) {
/** /**

View File

@ -119,8 +119,8 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I
userVO.setField(fieldDTO.getFieldName()); userVO.setField(fieldDTO.getFieldName());
userVO.setStation(institutionDTO.getInstitutionName()); userVO.setStation(institutionDTO.getInstitutionName());
userVO.setNumber(j+""); userVO.setNumber(j+"");
DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(j-1).getApplySex()); // DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(j-1).getApplySex());
userVO.setSex(dataDTO.getDataName()); userVO.setSex(userList.get(j-1).getApplySex());
userVO.setName(userList.get(j-1).getApplyName()); userVO.setName(userList.get(j-1).getApplyName());
userVO.setIcon(userList.get(j-1).getApplyUserCardPhoto()); userVO.setIcon(userList.get(j-1).getApplyUserCardPhoto());
userVO.setIdentity(userList.get(j-1).getApplyCardNumber()); userVO.setIdentity(userList.get(j-1).getApplyCardNumber());
@ -144,7 +144,7 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I
distributionCardVO.setClassPlanId(classPlanId); distributionCardVO.setClassPlanId(classPlanId);
distributionCardVO.setDistributionId(distributionDTO.getDistributionId()); distributionCardVO.setDistributionId(distributionDTO.getDistributionId());
distributionCardVO.setDistributionCardPictures(base64); distributionCardVO.setDistributionCardPictures(base64);
distributionCardVO.setDistributionCardUserSex(dataDTO.getDataName()); distributionCardVO.setDistributionCardUserSex(userList.get(j-1).getApplySex());
distributionCardVO.setDistributionCardUserIdentity(userList.get(j-1).getApplyCardNumber()); distributionCardVO.setDistributionCardUserIdentity(userList.get(j-1).getApplyCardNumber());
distributionCardVO.setDistributionCardUserResult(""); distributionCardVO.setDistributionCardUserResult("");
distributionCardVO.setDistributionCardUserStatus("0"); distributionCardVO.setDistributionCardUserStatus("0");