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 db1e9e7..52dd4bd 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 @@ -49,4 +49,8 @@ public interface CoscoCategoryConstant { * 锁定类型(0.未锁定、1.锁定) */ public static final Long LOCK_TYPE_YES = 1L; + /** + * 最高级 0 + */ + public static final String LEVEL_TOP = "0"; } 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 b9ca15b..4b648f9 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 @@ -16,4 +16,8 @@ public interface ErrorMessageConstant { * "请选择上级品类" */ public static final String PLEASE_SELECT_SUPERIOR_CATEGORY = "请选择上级品类"; + /** + * "请选择正确的父级分类" + */ + public static final String PLEASE_SELECT_THE_CORRECT_PARENT_CATEGORY = "请选择正确的父级分类"; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java index bdbc868..b00def9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java @@ -70,9 +70,9 @@ public class CoscoCategoryController extends BaseController { * 新增品类库_品类 */ @PostMapping - public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { + public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { if(coscoCategory.getParentId()==null){ - BaseResponse.fail(ErrorMessageConstant.PLEASE_SELECT_SUPERIOR_CATEGORY); + return BaseResponse.fail(ErrorMessageConstant.PLEASE_SELECT_SUPERIOR_CATEGORY); } return BaseResponse.success(coscoCategoryService.insertCoscoCategory(coscoCategory)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml index 477d7df..a4c1617 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml @@ -68,9 +68,6 @@ and cc.order_by = #{orderBy} - - and cc.ancestors = #{ancestors} - and cc.last_update_time = #{lastUpdateTime} @@ -103,6 +100,19 @@ where id = #{id} + + insert into cosco_category diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java index f2a593c..7fbf7cc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java @@ -46,7 +46,7 @@ public class CoscoCategory extends CoscoBaseEntity { /** * 祖级节点数组(包含本级) */ - private String ancestors; + private String ancestors="0"; /** * 删除标识(normal.正常、deleted.已删除) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java index 6320092..e7d9f1c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java @@ -83,4 +83,11 @@ public interface ICoscoCategoryService extends IBaseService { * @return */ List selectCategoryTreeNoSuperior(CoscoCategory coscoCategory); + + /** + * 获取所有级别名称 + * @param id + * @return + */ + String getCategoryNameById(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java index c1e79a1..92e85d6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java @@ -7,6 +7,8 @@ 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.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; @@ -63,17 +65,15 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl buildTree(List categories) { // 获取所有顶级节点 (parentId = "0") List rootNodes = categories.stream() diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index 4f21e57..ee4c787 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -351,6 +351,12 @@ cet.end_time as endTime, cet.status, cet.dept_id as deptId, + cet.approve_status as approveStatus, + case + when cet.approve_status = 0 then '审批中' + when cet.approve_status = 1 then '通过' + when cet.approve_status = 2 then '驳回' + else '未审批' end as approveName, case when cet.status = 0 then '待评价' when cet.status = 1 then '评价中' diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java index f0f8c81..86d1818 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java @@ -47,6 +47,13 @@ public class TaskPageVo implements Serializable { */ private String userId; + private String approveStatus; + + /** + * 审核名称 + */ + private String approveName; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest;