From bd16f044ed97f19f2cc97ee3d1151f4ed2a95a0f Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 13:16:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/constant/ErrorMessageConstant.java | 20 ++++++++ .../CoscoAnnualreviewTemplateController.java | 4 +- .../impl/CoscoCategoryLibraryServiceImpl.java | 3 +- .../CoscoEvaluateLevelController.java | 49 ++++++++++--------- 4 files changed, 49 insertions(+), 27 deletions(-) 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)); } From 810cbdba882bab20010b4527b272c07325c45f6a Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 13:18:34 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/constant/LevelResponse.java | 23 +++++++++++++++++++ .../CoscoEvaluateLevelController.java | 22 ++++-------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java new file mode 100644 index 0000000..d5be33b --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java @@ -0,0 +1,23 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel; + +public class LevelResponse { + + public static BaseResponse getStringByTaskLevel(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; + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java index 85c2e33..0642791 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.controller; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.LevelResponse; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLevelService; import org.springframework.beans.factory.annotation.Autowired; @@ -41,38 +42,23 @@ public class CoscoEvaluateLevelController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoEvaluateLevel coscoEvaluateLevel) { - BaseResponse levelNameCannotBeEmpty = getStringBaseResponse(coscoEvaluateLevel); + BaseResponse levelNameCannotBeEmpty = LevelResponse.getStringByTaskLevel(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){ + if (coscoEvaluateLevel.getId() == null) { return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL); } - BaseResponse idNotNull = getStringBaseResponse(coscoEvaluateLevel); + BaseResponse idNotNull = LevelResponse.getStringByTaskLevel(coscoEvaluateLevel); if (idNotNull != null) { return idNotNull; } From b2f4dc80f9b85bfba95f469bd688130d47bef387 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 13:25:32 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zyhy/ebtp/supplier/base/constant/MessageConstant.java | 8 -------- .../zyhy/ebtp/supplier/common/MessageType.java | 5 +++++ .../controller/CoscoEvaluateLevelController.java | 2 +- .../response}/LevelResponse.java | 3 ++- .../service/impl/ScheduledTasksServiceImpl.java | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/{base/constant => coscoEvaluate/response}/LevelResponse.java (86%) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java deleted file mode 100644 index 7b14ef7..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.base.constant; - -public class MessageConstant { - /** - * 黑名单到期提醒 - */ - public static final String BLACKLIST_EXPIRE = "blacklist_expires"; -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java index 818ba5b..6059fe2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java @@ -40,4 +40,9 @@ public class MessageType { //评审人员消息 public static final String MESSAGETYPE_PSRY = "MESSAGETYPE_PSRY"; + /** + * 黑名单到期提醒 + */ + public static final String BLACKLIST_EXPIRE = "blacklist_expires"; + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java index 0642791..c9b36de 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java @@ -3,7 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.controller; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; -import com.chinaunicom.zyhy.ebtp.supplier.base.constant.LevelResponse; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.response.LevelResponse; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLevelService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java similarity index 86% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java index d5be33b..2be45ee 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/LevelResponse.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java @@ -1,6 +1,7 @@ -package com.chinaunicom.zyhy.ebtp.supplier.base.constant; +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.response; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel; public class LevelResponse { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 3bd6c06..164a508 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -258,7 +258,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { coscoMessage.setId(PropertyUtils.getSnowflakeId()); coscoMessage.setReceiverId(becomeDueVo.getCreater()); coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期，请及时提交解除申请："); - coscoMessage.setType(MessageConstant.BLACKLIST_EXPIRE); + coscoMessage.setType(MessageType.BLACKLIST_EXPIRE); coscoMessage.setCreateTime(new Date()); coscoMessage.setUpdateTime(new Date()); coscoMessages.add(coscoMessage); From 1d485c08a3eab7e406feba49fb0277838f6d15c3 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 14:16:19 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 164a508..a2b041a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; -import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; From 55dc0024a48f71b2c14d64e2d00bedea2fe8921a Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 14:18:17 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...coEvaluateTaskSupplierUserServiceImpl.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java index 916999a..efe5d74 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java @@ -1,22 +1,27 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateScoringMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierUserMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTemplateIndicatorStMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateScoring; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplierUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierUserService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; -import org.checkerframework.checker.units.qual.C; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierUserService; - /** * 【供应商评价_评价任务供应商对应评审人表】Service业务层处理 * @@ -34,8 +39,6 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT @Autowired private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper; @Autowired - private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper; - @Autowired private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper; /** From fdfe49030d2251d7af3dd75d7701d558d905d1e6 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 15:23:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/constant/AnnualreviewTaskConstant.java | 2 +- .../ebtp/supplier/base/constant/CoscoCategoryConstant.java | 2 +- .../ebtp/supplier/base/constant/ErrorMessageConstant.java | 2 +- .../ebtp/supplier/base/constant/EvaluateTaskConstant.java | 2 +- .../supplier/base/constant/EvaluateTemplateConstant.java | 2 +- .../ebtp/supplier/base/constant/ReviewTemplateConstant.java | 2 +- .../ebtp/supplier/base/constant/SupplierUserConstant.java | 5 +---- .../coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml | 2 ++ 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java index 59a2305..fd35b22 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java @@ -1,6 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface AnnualreviewTaskConstant { +public final class AnnualreviewTaskConstant { /** * 待审批 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java index 1994d52..b551b8c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java @@ -1,6 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface CoscoCategoryConstant { +public final class CoscoCategoryConstant { /** * 删除标识 */ 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 6bb8841..a5fd2bf 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 @@ -3,7 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; /** * 错误信息常量 */ -public interface ErrorMessageConstant { +public final class ErrorMessageConstant { /** * "id不能为空" */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java index 05bf6c0..551d70a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java @@ -1,6 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface EvaluateTaskConstant { +public final class EvaluateTaskConstant { /** * 评价结束状态 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java index 814b628..dd5fe17 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java @@ -1,6 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface EvaluateTemplateConstant { +public final class EvaluateTemplateConstant { /** * 启用 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java index eddb3a5..0e73935 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java @@ -1,7 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface ReviewTemplateConstant { +public final class ReviewTemplateConstant { /** * 启用状态 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java index e51f6d9..ceedec6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java @@ -1,9 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -import lombok.Data; - - -public interface SupplierUserConstant { +public final class SupplierUserConstant { /** * 打分状态 已打分 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index c17a8a5..8104b92 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml @@ -203,6 +203,7 @@ + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index 6731ae3..4123075 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -65,6 +65,7 @@ and cats.last_update_time between #{vo.startTime} and #{vo.endTime} + order by cat.create_time desc diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml index 08d4c7a..ee8c96b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml @@ -75,6 +75,7 @@ and cet.category_id = #{vo.categoryId} + order by cet.create_time desc