diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index 6d460f5..fde5de9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -28,4 +28,6 @@ String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission"; //负责人折扣权限 String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; + //标准装置-申请类型 + String STANDARD_APPLY_TYPE = "standardApplyType"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index 6d460f5..fde5de9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -28,4 +28,6 @@ String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission"; //负责人折扣权限 String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; + //标准装置-申请类型 + String STANDARD_APPLY_TYPE = "standardApplyType"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index ca5da26..8b45093 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -112,11 +112,11 @@ @TableField(value = "main_examiner") @ApiModelProperty(value = "是否主考人", dataType = "String") - private Integer mainExaminer; + private String mainExaminer; @TableField(value = "special_operator") @ApiModelProperty(value = "是否特操人", dataType = "String") - private Integer specialOperator; + private String specialOperator; @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java index 6d460f5..fde5de9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java @@ -28,4 +28,6 @@ String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission"; //负责人折扣权限 String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission"; + //标准装置-申请类型 + String STANDARD_APPLY_TYPE = "standardApplyType"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java index ca5da26..8b45093 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java @@ -112,11 +112,11 @@ @TableField(value = "main_examiner") @ApiModelProperty(value = "是否主考人", dataType = "String") - private Integer mainExaminer; + private String mainExaminer; @TableField(value = "special_operator") @ApiModelProperty(value = "是否特操人", dataType = "String") - private Integer specialOperator; + private String specialOperator; @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index ccca09b..e29271d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -93,11 +93,6 @@ public MeterStaff selectStaffInfo(IdDTO idDto) { // 通过id获取对应的人员信息 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId())); - // 将人员信息中的字典值替换 - 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()); // 通过人员信息的id获取人员对应的证书列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("staff_id",idDto.getId());