项目库--置顶功能
This commit is contained in:
@@ -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`;
|
||||
|
||||
|
||||
|
||||
+15
@@ -228,4 +228,19 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 项目置顶,取消置顶(只置顶主项目)
|
||||
* @param id
|
||||
* @param flag 0为置顶, 1为取消置顶
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "项目置顶,取消置顶(只置顶主项目)")
|
||||
@ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)")
|
||||
@GetMapping(value = "/top")
|
||||
public Result<?> top(String id,String flag) {
|
||||
projectLibraryBaseService.top(id,flag);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+6
@@ -126,6 +126,12 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
|
||||
//说明
|
||||
private String explanation;
|
||||
|
||||
//排序(用于项目置顶)
|
||||
private String sort;
|
||||
|
||||
//置顶标识(flag为空的时候为置顶, flag为1的时候取消置顶)
|
||||
private String flag;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<ProjectLibraryBase> children;
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -115,7 +115,7 @@
|
||||
and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')
|
||||
</if>
|
||||
</where>
|
||||
order by plb.create_time desc
|
||||
order by plb.sort desc, plb.create_time desc
|
||||
</select>
|
||||
<!-- <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">-->
|
||||
|
||||
|
||||
+2
@@ -102,4 +102,6 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
|
||||
void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag);
|
||||
|
||||
Page getPages(Integer currentPage, Integer pageSize, List<ProjectLibraryBase> list);
|
||||
|
||||
void top(String id,String flag);
|
||||
}
|
||||
|
||||
+27
@@ -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<ProjectLibraryBas
|
||||
page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
|
||||
return page;
|
||||
}
|
||||
|
||||
|
||||
// /**
|
||||
// * 分页列表查询
|
||||
// *
|
||||
@@ -974,6 +977,30 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void top(String id, String flag) {
|
||||
ProjectLibraryBase projectLibraryBase = this.getById(id);
|
||||
if(TopEnum.TOP_CANCEL.getValue().equals(flag)){
|
||||
//取消置顶
|
||||
projectLibraryBase.setSort(null);
|
||||
projectLibraryBase.setFlag(null);
|
||||
}else{
|
||||
//置顶
|
||||
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.isNotNull(ProjectLibraryBase::getSort).orderByDesc(ProjectLibraryBase::getSort);
|
||||
List<ProjectLibraryBase> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user