From 150b5e36b8ce2f2bdc5084cd03ffa5eb7076c526 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 18 Oct 2022 15:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 5 +++ .../ProjectLibraryBaseController.java | 15 +++++++ .../project/entity/ProjectLibraryBase.java | 6 +++ .../jero/modules/project/enums/TopEnum.java | 44 +++++++++++++++++++ .../mapper/xml/ProjectLibraryBaseMapper.xml | 2 +- .../service/IProjectLibraryBaseService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 27 ++++++++++++ 7 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TopEnum.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b87ea1338..117861bdb 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -8,4 +8,9 @@ ADD COLUMN `project_version` varchar(255) NULL COMMENT '项目版本' AFTER `par ADD COLUMN `explanation` varchar(2000) NULL COMMENT '说明' AFTER `project_version`, ADD COLUMN `software_version` varchar(255) NULL COMMENT '软件版本' AFTER `explanation`; +-- 项目库添加字段(排序)---------2022-10-18 未同步生产环境 +ALTER TABLE `laws_weilai`.`project_library_base` +ADD COLUMN `sort` varchar(255) NULL COMMENT '排序(用于置顶功能)' AFTER `software_version`, +ADD COLUMN `flag` varchar(255) NULL COMMENT '置顶(flag为空的时候为置顶, flag为1的时候取消置顶)' AFTER `sort`; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 1f301b4da..e3e377a93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -228,4 +228,19 @@ public class ProjectLibraryBaseController extends JeroController top(String id,String flag) { + projectLibraryBaseService.top(id,flag); + return Result.OK("编辑成功!"); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index d5ccb360b..d831a5896 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -126,6 +126,12 @@ public class ProjectLibraryBase implements Comparable { //说明 private String explanation; + //排序(用于项目置顶) + private String sort; + + //置顶标识(flag为空的时候为置顶, flag为1的时候取消置顶) + private String flag; + @TableField(exist = false) private List children; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TopEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TopEnum.java new file mode 100644 index 000000000..f54bbb021 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TopEnum.java @@ -0,0 +1,44 @@ +package com.jero.modules.project.enums; + +/** + * 任务状态枚举类 + */ +public enum TopEnum { + TOP_CANCEL("取消置顶","1"), + ; + + + String name; + String value; + + private TopEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + TopEnum[] values = values(); + for (TopEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + return taskStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index fd1013dba..ab571bf8d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -115,7 +115,7 @@ and plb.digital_platform like concat('%',#{params.digitalPlatform},'%') - order by plb.create_time desc + order by plb.sort desc, plb.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index 76cf8f7ec..8cc1a0e92 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -102,4 +102,6 @@ public interface IProjectLibraryBaseService extends IService void disposeData(List records,String cut,boolean disposeTargetMarketFlag); Page getPages(Integer currentPage, Integer pageSize, List list); + + void top(String id,String flag); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0f687c9d3..232ebfb7a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.modules.project.enums.InventoryAffirmStatusEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.enums.TopEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -570,6 +571,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort); + List list = this.list(wrapper); + if(list.size() != 0){ + String sort = list.get(list.size() - 1).getSort(); + int sortTemp = Integer.valueOf(sort) + 1; + projectLibraryBase.setSort(String.valueOf(sortTemp)); + }else{ + projectLibraryBase.setSort("1"); + } + projectLibraryBase.setFlag(TopEnum.TOP_CANCEL.getValue()); + } + this.updateById(projectLibraryBase); + } }