|
|
|
|
@ -34,6 +34,17 @@ public class NameTableController {
|
|
|
|
|
@Value("${UserStaNO}")
|
|
|
|
|
public String staNO;
|
|
|
|
|
|
|
|
|
|
@GetMapping("/roadNoNameTypeAll")
|
|
|
|
|
public R<List<NameTable>> roadNoNameTypeAll(
|
|
|
|
|
@RequestParam(defaultValue = "0") Integer roadNO){
|
|
|
|
|
QueryWrapper<NameTable> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
if(roadNO != 0){
|
|
|
|
|
queryWrapper.eq("roadno",roadNO);
|
|
|
|
|
}
|
|
|
|
|
List<NameTable> nameType = nameTableMapper.selectList(queryWrapper);
|
|
|
|
|
return R.SUCCESS(nameType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @Author ChenXuDong
|
|
|
|
|
* @Date 2022/07/07 09:17
|
|
|
|
|
@ -44,7 +55,7 @@ public class NameTableController {
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/nameTypeAllSelected")
|
|
|
|
|
public R<List<NameTable>> nameTypeAllSelected(
|
|
|
|
|
@RequestParam(value = "roadname", required = false) String roadname){
|
|
|
|
|
@RequestParam(value = "roadno", required = false) String roadno){
|
|
|
|
|
|
|
|
|
|
QueryWrapper<NameTable> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
|
|
@ -52,20 +63,12 @@ public class NameTableController {
|
|
|
|
|
Integer roadNOInteger = Integer.valueOf(roadNO);
|
|
|
|
|
queryWrapper.eq("roadno",roadNOInteger);
|
|
|
|
|
}
|
|
|
|
|
if(staNO != null && staNO.length() != 0){
|
|
|
|
|
if(staNO != null && staNO.length() != 0 && Integer.valueOf(staNO) != 169){
|
|
|
|
|
Integer staNOInteger = Integer.valueOf(staNO);
|
|
|
|
|
queryWrapper.eq("STANO",staNOInteger);
|
|
|
|
|
}
|
|
|
|
|
if(roadname != "" && roadname != null){
|
|
|
|
|
if(roadname.equals("高路公司(10)")){
|
|
|
|
|
queryWrapper.eq("roadno",10);
|
|
|
|
|
//queryWrapper.eq("roadname","高路公司");
|
|
|
|
|
}else if(roadname.equals("高路公司(15)")){
|
|
|
|
|
queryWrapper.eq("roadno",15);
|
|
|
|
|
//queryWrapper.eq("roadname","高路公司");
|
|
|
|
|
}else{
|
|
|
|
|
queryWrapper.eq("roadname",roadname);
|
|
|
|
|
}
|
|
|
|
|
if(roadno != "" && roadno != null){
|
|
|
|
|
queryWrapper.eq("roadno",roadno);
|
|
|
|
|
}
|
|
|
|
|
List<NameTable> nameType = nameTableMapper.selectList(queryWrapper);
|
|
|
|
|
return R.SUCCESS(nameType);
|
|
|
|
|
@ -98,15 +101,4 @@ public class NameTableController {
|
|
|
|
|
return R.SUCCESS(nameType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/roadNoNameTypeAll")
|
|
|
|
|
public R<List<NameTable>> roadNoNameTypeAll(
|
|
|
|
|
@RequestParam(defaultValue = "0") Integer roadno){
|
|
|
|
|
QueryWrapper<NameTable> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
if(roadno != 0){
|
|
|
|
|
queryWrapper.eq("roadno",roadno);
|
|
|
|
|
}
|
|
|
|
|
List<NameTable> nameType = nameTableMapper.selectList(queryWrapper);
|
|
|
|
|
return R.SUCCESS(nameType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|