diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java index 4b648f9..6bb8841 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java @@ -20,4 +20,24 @@ public interface ErrorMessageConstant { * "请选择正确的父级分类" */ public static final String PLEASE_SELECT_THE_CORRECT_PARENT_CATEGORY = "请选择正确的父级分类"; + /** + * "未找到对应的审批单" + */ + public static final String NO_APPROVAL_ORDER_FOUND = "未找到对应的审批单"; + /** + * "等级名称不能为空" + */ + public static final String LEVEL_NAME_CANNOT_BE_EMPTY = "等级名称不能为空"; + /** + * "开始值不能为空" + */ + public static final String START_VALUE_CANNOT_BE_EMPTY = "开始值不能为空"; + /** + * "结束值不能为空" + */ + public static final String END_VALUE_CANNOT_BE_EMPTY = "结束值不能为空"; + /** + * "开始值不能大于结束值" + */ + public static final String START_VALUE_CANNOT_BE_GREATER_THAN_END_VALUE = "开始值不能大于结束值"; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java index 59d298f..8657d54 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java @@ -96,7 +96,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { @PostMapping("/up") public BaseResponse up(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { if (coscoAnnualreviewTemplate.getId() == null) { - return BaseResponse.fail("id不能为空"); + return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL); } coscoAnnualreviewTemplateService.up(coscoAnnualreviewTemplate.getId()); return BaseResponse.success(); @@ -107,7 +107,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { @PostMapping("/down") public BaseResponse down(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { if (coscoAnnualreviewTemplate.getId() == null) { - return BaseResponse.fail("id不能为空"); + return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL); } coscoAnnualreviewTemplateService.down(coscoAnnualreviewTemplate.getId()); return BaseResponse.success(); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index afd2914..9e15be8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper; @@ -247,7 +248,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImplcoscoEvaluateLevel.getEndValue()){ - return BaseResponse.fail("开始值不能大于结束值"); + BaseResponse levelNameCannotBeEmpty = getStringBaseResponse(coscoEvaluateLevel); + if (levelNameCannotBeEmpty != null) { + return levelNameCannotBeEmpty; } return BaseResponse.success(coscoEvaluateLevelService.insertCoscoEvaluateLevel(coscoEvaluateLevel)); } + private static BaseResponse getStringBaseResponse(CoscoEvaluateLevel coscoEvaluateLevel) { + if (coscoEvaluateLevel.getLevelName() == null) { + return BaseResponse.fail(ErrorMessageConstant.LEVEL_NAME_CANNOT_BE_EMPTY); + } + if (coscoEvaluateLevel.getBeginValue()==null) { + return BaseResponse.fail(ErrorMessageConstant.START_VALUE_CANNOT_BE_EMPTY); + } + if (coscoEvaluateLevel.getEndValue() == null) { + return BaseResponse.fail(ErrorMessageConstant.END_VALUE_CANNOT_BE_EMPTY); + } + if (coscoEvaluateLevel.getBeginValue()>coscoEvaluateLevel.getEndValue()) { + return BaseResponse.fail(ErrorMessageConstant.START_VALUE_CANNOT_BE_GREATER_THAN_END_VALUE); + } + return null; + } + /** * 修改【供应商评价_评价结果等级规则表】 */ @PutMapping public BaseResponse edit(@RequestBody CoscoEvaluateLevel coscoEvaluateLevel) { if(coscoEvaluateLevel.getId()==null){ - return BaseResponse.fail("id不能为空"); + return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL); } - if(coscoEvaluateLevel.getLevelName()==null){ - return BaseResponse.fail("等级名称不能为空"); - } - if(coscoEvaluateLevel.getBeginValue()==null){ - return BaseResponse.fail("开始值不能为空"); - } - if(coscoEvaluateLevel.getEndValue()==null){ - return BaseResponse.fail("结束值不能为空"); - } - if(coscoEvaluateLevel.getBeginValue()>coscoEvaluateLevel.getEndValue()){ - return BaseResponse.fail("开始值不能大于结束值"); + BaseResponse idNotNull = getStringBaseResponse(coscoEvaluateLevel); + if (idNotNull != null) { + return idNotNull; } return BaseResponse.success(coscoEvaluateLevelService.updateCoscoEvaluateLevel(coscoEvaluateLevel)); } @@ -81,7 +82,7 @@ public class CoscoEvaluateLevelController extends BaseController { /** * 删除【供应商评价_评价结果等级规则表】 */ - @DeleteMapping("/{id}") + @DeleteMapping("/{id}") public BaseResponse remove(@PathVariable String id) { return BaseResponse.success(coscoEvaluateLevelService.deleteCoscoEvaluateLevelById(id)); }