diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 938a7f7..d1f64d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -89,11 +89,6 @@ MeterCertificate meterCertificate = meterCertificateMapper.selectById(idDto.getId()); // 通过证书信息中的staffId获取对应的人员信息 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterCertificate.getStaffId()); - // 将人员信息中的字典值替换 - meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation())); - meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob())); - meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob())); - meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName()); meterCertificate.setMeterStaff(meterStaff); return ReturnUtil.success(meterCertificate); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java index 938a7f7..d1f64d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java @@ -89,11 +89,6 @@ MeterCertificate meterCertificate = meterCertificateMapper.selectById(idDto.getId()); // 通过证书信息中的staffId获取对应的人员信息 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterCertificate.getStaffId()); - // 将人员信息中的字典值替换 - meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation())); - meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob())); - meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob())); - meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName()); meterCertificate.setMeterStaff(meterStaff); return ReturnUtil.success(meterCertificate); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 5418c32..4fd8940 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -84,13 +84,7 @@ @Override public MeterPrice selectStaffInfo(IdDTO idDto) { - MeterPrice meterPrice = meterPriceMapper.selectById(String.valueOf(idDto.getId())); - meterPrice.setPriceType(dictService.getDictNameByCode(MeterDictEnum.PRICE_TYPE,meterPrice.getPriceType())); - meterPrice.setPriceItem(dictService.getDictNameByCode(MeterDictEnum.PRICE_ITEM,meterPrice.getPriceItem())); - meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); - meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); - meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); - return meterPrice; + return meterPriceMapper.selectById(String.valueOf(idDto.getId())); } @Override