@@ -53,7 +53,7 @@ public class TauvInspectDriverController { | |||
@PostMapping("/index") | |||
@RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION) | |||
public Response index(@RequestBody(required = false) Map<String, Object> map) { | |||
Byte[] st = new Byte[]{1}; | |||
Integer[] st = new Integer[]{1}; | |||
if (map == null) { | |||
map = new HashMap<>(); | |||
} | |||
@@ -70,13 +70,13 @@ public class TauvInspectDriverController { | |||
@PostMapping("/assignedList") | |||
@RequiresPermissions(controllerName + ":assignedList") | |||
public Response assignedList(@RequestBody(required = false) Map<String, Object> map) { | |||
Byte[] st = new Byte[]{2, 3, 4, 5, 6}; | |||
Integer[] st = new Integer[]{2, 3, 4, 5, 6}; | |||
if (map == null) { | |||
map = new HashMap<>(); | |||
} | |||
String status = "status"; | |||
if (map.containsKey(status) && !"".equals(map.get(status))) { | |||
map.put("status", new Byte[]{Byte.valueOf(map.get(status).toString())}); | |||
map.put("status", new Integer[]{Integer.valueOf(map.get(status).toString())}); | |||
} else { | |||
map.put("status", st); | |||
} | |||
@@ -99,7 +99,7 @@ public class TauvInspectDriverController { | |||
if (map.containsKey(status) && !"".equals(map.get(status))) { | |||
map.put("status", Integer.valueOf(map.get(status).toString())); | |||
} else { | |||
map.put("status", new Byte[]{2, 3, 4, 5, 6}); | |||
map.put("status", new Integer[]{2, 3, 4, 5, 6}); | |||
} | |||
return iTauvInspectDriverService.getPageList(map, "list"); | |||
} |
@@ -57,7 +57,7 @@ public class TauvInspectDriverPicDTO extends BaseInspectDriverDTO { | |||
/** | |||
* 状态 | |||
*/ | |||
private Byte status; | |||
private Integer status; | |||
private String statusText; | |||
/** |
@@ -30,7 +30,7 @@ public class TauvReportDTO extends BaseReportDTO { | |||
/** | |||
* 状态值 1待生成 2审核中 3审核通过 4审核驳回 | |||
*/ | |||
private Byte status; | |||
private Integer status; | |||
/** | |||
* 状态描述 |
@@ -168,7 +168,7 @@ public class SysAdminServiceImpl extends BaseServiceImpl<SysAdminMapper, SysAdmi | |||
@Override | |||
public Response findAdminPageList(Map<String, String> map) { | |||
QueryWrapper<SysAdmin> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("mark", Byte.valueOf("1")); | |||
wrapper.eq("mark", 1); | |||
wrapper.orderByAsc("status"); | |||
wrapper.orderByAsc("id"); | |||
Integer pageNo = 1; |
@@ -104,7 +104,7 @@ public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper, | |||
public SysAuthGroup getInfoByName(String name) { | |||
QueryWrapper<SysAuthGroup> queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("name", name); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.last("limit 1"); | |||
SysAuthGroup info = authGroupMapper.selectOne(queryWrapper); | |||
return info; | |||
@@ -132,7 +132,7 @@ public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper, | |||
@Override | |||
public Response getList(Map<String, String> map) { | |||
QueryWrapper<SysAuthGroup> queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.eq("pid", 0); | |||
queryWrapper.orderByAsc("id"); | |||
queryWrapper.select("id,name,pid,has_child,rules,remark,status,sort,create_time,create_user"); | |||
@@ -140,7 +140,7 @@ public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper, | |||
if (list != null) { | |||
for (Map<String, Object> sysAuthGroup : list) { | |||
queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.eq("pid", sysAuthGroup.get("id")); | |||
queryWrapper.orderByAsc("id"); | |||
queryWrapper.select("id,name,pid,has_child,rules,remark,status,sort,create_time,create_user"); |
@@ -66,7 +66,7 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
QueryWrapper<SysAuthRule> queryWrapper = new QueryWrapper<>(); | |||
//超级管理员拥有所有权限 | |||
if (adminId.equals(1)) { | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
} else { | |||
List<SysAuthGroup> groupList = iSysAuthGroupService.getAuthGroups(adminId); | |||
if (groupList != null) { | |||
@@ -80,8 +80,8 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
rules = rules.substring(0, rules.length() - 1); | |||
Object[] ruleList = rules.split(","); | |||
queryWrapper.in("id", ruleList); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("status", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.eq("status", 1); | |||
} | |||
List<SysAuthRule> authRuleList = authRuleMapper.selectList(queryWrapper); | |||
@@ -321,7 +321,7 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
@Override | |||
public List<Map<String, Object>> getListByPid(Integer pid) { | |||
QueryWrapper queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.eq("pid", pid); | |||
queryWrapper.select("id,title"); | |||
List<Map<String, Object>> list = authRuleMapper.selectMaps(queryWrapper); | |||
@@ -332,7 +332,7 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
public List<Menu> buildTreeMenu() { | |||
List<Menu> menuList = new ArrayList<>(); | |||
QueryWrapper<SysAuthRule> queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
queryWrapper.orderByAsc("id"); | |||
queryWrapper.orderByAsc("sort"); | |||
List<SysAuthRule> list = authRuleMapper.selectList(queryWrapper); | |||
@@ -388,7 +388,7 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
*/ | |||
private List<Map<String, Object>> getListByPid(Map<String, Object> map) { | |||
QueryWrapper queryWrapper = new QueryWrapper<>(); | |||
queryWrapper.eq("mark", Byte.valueOf("1")); | |||
queryWrapper.eq("mark", 1); | |||
String pid = "pid"; | |||
String status = "status"; | |||
String type = "type"; | |||
@@ -397,10 +397,10 @@ public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, S | |||
queryWrapper.eq("pid", Integer.valueOf(map.get("pid").toString())); | |||
} | |||
if (map.containsKey(status)) { | |||
queryWrapper.eq("status", Byte.valueOf(map.get("status").toString())); | |||
queryWrapper.eq("status", Integer.valueOf(map.get("status").toString())); | |||
} | |||
if (map.containsKey(type)) { | |||
queryWrapper.eq("type", Byte.valueOf(map.get("type").toString())); | |||
queryWrapper.eq("type", Integer.valueOf(map.get("type").toString())); | |||
} | |||
if (map.containsKey(rules)) { | |||
queryWrapper.in("id", map.get("ruleIds")); |
@@ -843,7 +843,7 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM | |||
QueryWrapper<TauvInspectFile> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("inspect_driver_id", inspectDriverId); | |||
wrapper.eq("file_document", fileDocument); | |||
wrapper.eq("status", Byte.valueOf("1")); | |||
wrapper.eq("status", 1); | |||
wrapper.eq("file_type", 1); | |||
wrapper.eq("is_review", 1); | |||
wrapper.eq("is_effective", 1); | |||
@@ -860,7 +860,7 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM | |||
*/ | |||
@Override | |||
public Integer getTotalFileByInspectDriverId(Integer inspectDriverId) { | |||
Byte b = Byte.valueOf("1"); | |||
Integer b = 1; | |||
QueryWrapper<TauvInspectFile> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("is_review", b); | |||
wrapper.eq("is_effective", b); | |||
@@ -879,7 +879,7 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM | |||
*/ | |||
@Override | |||
public TauvInspectFile getInfoByInspectDriverId(Integer inspectDriverId) { | |||
Byte b = Byte.valueOf("1"); | |||
Integer b = 1; | |||
QueryWrapper<TauvInspectFile> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("is_review", b); | |||
wrapper.eq("is_effective", b); | |||
@@ -899,7 +899,7 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM | |||
*/ | |||
@Override | |||
public List<TauvInspectFile> getListByInspectDriverId(Integer inspectDriverId) { | |||
Byte b = Byte.valueOf("1"); | |||
Integer b = 1; | |||
QueryWrapper<TauvInspectFile> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("is_review", b); | |||
wrapper.eq("is_effective", b); |
@@ -36,7 +36,7 @@ public class TauvReportRemarkServiceImpl extends BaseServiceImpl<TauvReportRemar | |||
QueryWrapper<TauvReportRemark> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("report_id", reportId); | |||
wrapper.eq("question_id", questionId); | |||
wrapper.eq("mark", Byte.valueOf("1")); | |||
wrapper.eq("mark", 1); | |||
wrapper.last("limit 1"); | |||
TauvReportRemark info = tauvReportRemarkMapper.selectOne(wrapper); | |||
return info; |
@@ -730,7 +730,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau | |||
wrapper.in("driver_area", (Integer[]) ConvertUtils.convert(driverAreaStr, Integer.class)); | |||
} | |||
query.put("driverArea", (Integer[]) ConvertUtils.convert(driverAreaStr, Integer.class)); | |||
wrapper.eq("status", Byte.valueOf("3")); | |||
wrapper.eq("status", 3); | |||
Integer startTime = 0; | |||
Integer endTime = 0; | |||
@@ -814,7 +814,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau | |||
QueryWrapper<TauvReport> wrapper = new QueryWrapper<>(); | |||
wrapper.eq("mark", 1); | |||
if (map.containsKey("status")) { | |||
wrapper.eq("status", Byte.valueOf(map.get("status"))); | |||
wrapper.eq("status", Integer.valueOf(map.get("status"))); | |||
} | |||
if (map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) { | |||
String[] driverAreaStr = map.get("driverArea").split(","); |