diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 86668a3..957b114 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,12 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; + @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; + @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 86668a3..957b114 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,12 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; + @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; + @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java index 8e50441..951fc97 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java @@ -32,9 +32,13 @@ /** * 分包方公司规模 */ + @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE) @ApiModelProperty(value = "分包方公司规模", dataType = "String") private String outsourcerSize; + @ApiModelProperty(value = "分包方公司规模", dataType = "String") + private String outsourcerSizeName; + /** * 业务规模-字典 */ @@ -58,10 +62,10 @@ /** * 整体评价-字典 */ + @DictCodeField(message = "整体评价不合法", cacheName = MeterDictCode.EVALUATION) @ApiModelProperty(value = "整体评价-字典code", dataType = "String") private String evaluation; - @DictCodeField(message = "整体评价不合法", cacheName = MeterDictCode.EVALUATION) @ApiModelProperty(value = "整体评价-字典value", dataType = "String") private String evaluationName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 86668a3..957b114 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,12 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; + @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; + @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java index 8e50441..951fc97 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java @@ -32,9 +32,13 @@ /** * 分包方公司规模 */ + @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE) @ApiModelProperty(value = "分包方公司规模", dataType = "String") private String outsourcerSize; + @ApiModelProperty(value = "分包方公司规模", dataType = "String") + private String outsourcerSizeName; + /** * 业务规模-字典 */ @@ -58,10 +62,10 @@ /** * 整体评价-字典 */ + @DictCodeField(message = "整体评价不合法", cacheName = MeterDictCode.EVALUATION) @ApiModelProperty(value = "整体评价-字典code", dataType = "String") private String evaluation; - @DictCodeField(message = "整体评价不合法", cacheName = MeterDictCode.EVALUATION) @ApiModelProperty(value = "整体评价-字典value", dataType = "String") private String evaluationName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 75f38a5..a6b77d5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOutsourceProjectMapper; -import com.casic.missiles.mapper.business.BusinessOutsourceProjectSampleRelationMapper; import com.casic.missiles.model.business.BusinessOutsourceProject; import com.casic.missiles.model.business.BusinessOutsourceProjectSampleRelation; import com.casic.missiles.model.response.ResponseData; @@ -58,8 +57,6 @@ @Autowired private BusinessOutsourceProjectMapper projectMapper; @Autowired - private BusinessOutsourceProjectSampleRelationMapper projectSampleRelationMapper; - @Autowired private IBusinessOutsourceProjectSampleRelationService projectSampleRelationService; @Resource private AbstractDictService dictService;