查询数字平台或车型平台
This commit is contained in:
+6
@@ -354,4 +354,10 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
|
|||||||
public Result<?> overallReplacementUser(@RequestBody JSONObject json){
|
public Result<?> overallReplacementUser(@RequestBody JSONObject json){
|
||||||
return this.projectLibraryBaseService.overallReplacementUser(json);
|
return this.projectLibraryBaseService.overallReplacementUser(json);
|
||||||
}
|
}
|
||||||
|
@AutoLog(value = "查询数字平台或车型平台")
|
||||||
|
@ApiOperation(value="查询数字平台或车型平台", notes="查询数字平台或车型平台")
|
||||||
|
@GetMapping(value = "/getPlatform")
|
||||||
|
public List<String> getPlatform(String platform){
|
||||||
|
return projectLibraryBaseService.getPlatform(platform);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+45
@@ -0,0 +1,45 @@
|
|||||||
|
package com.jero.modules.project.enums;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 任务状态枚举类
|
||||||
|
*/
|
||||||
|
public enum PlatformEnum {
|
||||||
|
NUMBER_PLATFORM("数字平台","numberPlatform"),
|
||||||
|
CAR_PLATFORM("车型平台","carPlatform"),
|
||||||
|
;
|
||||||
|
|
||||||
|
|
||||||
|
String name;
|
||||||
|
String value;
|
||||||
|
|
||||||
|
private PlatformEnum(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) {
|
||||||
|
PlatformEnum[] values = values();
|
||||||
|
for (PlatformEnum taskStatusEnum : values) {
|
||||||
|
if (taskStatusEnum.value.equals(value)) {
|
||||||
|
return taskStatusEnum.name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
@@ -204,4 +204,6 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
|
|||||||
List<ProjectLibraryBase> queryList(List<String> projectIdList);
|
List<ProjectLibraryBase> queryList(List<String> projectIdList);
|
||||||
|
|
||||||
List<ProjectLibraryBase> getListByIds(List<String> projectIdList);
|
List<ProjectLibraryBase> getListByIds(List<String> projectIdList);
|
||||||
|
|
||||||
|
List<String> getPlatform(String platform);
|
||||||
}
|
}
|
||||||
|
|||||||
-14
@@ -116,20 +116,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
|
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
|
||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
ncrTrackVO.setUserId(loginUser.getId());
|
ncrTrackVO.setUserId(loginUser.getId());
|
||||||
// if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){
|
|
||||||
// if(ncrTrackVO.getSerialNumber().contains("%")){
|
|
||||||
// ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%"));
|
|
||||||
// }
|
|
||||||
// ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*",""));
|
|
||||||
// }
|
|
||||||
// if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){
|
|
||||||
// if(ncrTrackVO.getTitle().contains("%")){
|
|
||||||
// ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%"));
|
|
||||||
// }
|
|
||||||
// ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
|
|
||||||
// }
|
|
||||||
// List<SysUser> sysUserList = sysUserService.list();
|
|
||||||
|
|
||||||
|
|
||||||
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
|
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
|
||||||
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
|
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
|
||||||
|
|||||||
+18
@@ -42,6 +42,7 @@ import com.jero.modules.project.enums.FlowStateEnum;
|
|||||||
import com.jero.modules.project.enums.HSStatisticalNodesEnum;
|
import com.jero.modules.project.enums.HSStatisticalNodesEnum;
|
||||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||||
import com.jero.modules.project.enums.PermissionDescriptionEnum;
|
import com.jero.modules.project.enums.PermissionDescriptionEnum;
|
||||||
|
import com.jero.modules.project.enums.PlatformEnum;
|
||||||
import com.jero.modules.project.enums.ProjectRoleEnum;
|
import com.jero.modules.project.enums.ProjectRoleEnum;
|
||||||
import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
|
import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
|
||||||
import com.jero.modules.project.enums.ProjectUserLocationEnum;
|
import com.jero.modules.project.enums.ProjectUserLocationEnum;
|
||||||
@@ -4219,6 +4220,23 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getPlatform(String platform) {
|
||||||
|
List<ProjectLibraryBase> projectLibraryBaseList = this.list();
|
||||||
|
List<String> platformList = new ArrayList<>();
|
||||||
|
if(PlatformEnum.NUMBER_PLATFORM.getValue().equals(platform)){
|
||||||
|
platformList = projectLibraryBaseList.stream()
|
||||||
|
.filter(e -> StringUtils.isNotBlank(e.getDigitalPlatform()))
|
||||||
|
.map(ProjectLibraryBase::getDigitalPlatform).distinct().collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
if(PlatformEnum.CAR_PLATFORM.getValue().equals(platform)){
|
||||||
|
platformList = projectLibraryBaseList.stream()
|
||||||
|
.filter(e -> StringUtils.isNotBlank(e.getVehiclePlatform()))
|
||||||
|
.map(ProjectLibraryBase::getVehiclePlatform).distinct().collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
return platformList;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user