diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index 0dd3e8f..161cc68 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -172,7 +172,7 @@ } }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "人员"; String[] title = new String[]{"姓名", "性别", "证件号码", "手机号", "生日", "入职年月", "部门名称", "人员类型", "岗位", "作业内容", "负责片区", "备注"}; String[] properties = new String[]{"name", "sex", "idCard", "tel", "birthday", "hireDate", "deptName", "type", diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index 0dd3e8f..161cc68 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -172,7 +172,7 @@ } }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "人员"; String[] title = new String[]{"姓名", "性别", "证件号码", "手机号", "生日", "入职年月", "部门名称", "人员类型", "岗位", "作业内容", "负责片区", "备注"}; String[] properties = new String[]{"name", "sex", "idCard", "tel", "birthday", "hireDate", "deptName", "type", diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 37fac5f..17fe7b6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -80,7 +80,7 @@ query.like("CODE", keywords); } List> maps = this.selectMaps(query); - if (maps != null && maps.size() > 0) { + if (maps != null) { maps.stream().forEach(map -> { if (ToolUtil.isNotEmpty(map.get("ts"))) { map.put("ts",dft.format(map.get("ts"))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index 0dd3e8f..161cc68 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -172,7 +172,7 @@ } }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "人员"; String[] title = new String[]{"姓名", "性别", "证件号码", "手机号", "生日", "入职年月", "部门名称", "人员类型", "岗位", "作业内容", "负责片区", "备注"}; String[] properties = new String[]{"name", "sex", "idCard", "tel", "birthday", "hireDate", "deptName", "type", diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 37fac5f..17fe7b6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -80,7 +80,7 @@ query.like("CODE", keywords); } List> maps = this.selectMaps(query); - if (maps != null && maps.size() > 0) { + if (maps != null) { maps.stream().forEach(map -> { if (ToolUtil.isNotEmpty(map.get("ts"))) { map.put("ts",dft.format(map.get("ts"))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index 1d29765..440c70d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -85,7 +85,7 @@ List> maps = this.selectMaps(query); maps.stream().filter(map -> ToolUtil.isNotEmpty(map.get("ts"))).forEach(map -> map.put("ts", dft.format(map.get("ts")))); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "中转站"; String[] title = new String[]{"编号", "名称", "地址", "建设单位", "经度", "纬度", "建设时间", "责任人", "责任人电话", "占地面积", "备注", "最新垃圾量"}; String[] properties = new String[]{"code", "name", "position", "owner", "lng", "lat", "ts", "responsiblePerson", "responsiblePersonTel", "area", "notes", "capacity"}; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index 0dd3e8f..161cc68 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -172,7 +172,7 @@ } }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "人员"; String[] title = new String[]{"姓名", "性别", "证件号码", "手机号", "生日", "入职年月", "部门名称", "人员类型", "岗位", "作业内容", "负责片区", "备注"}; String[] properties = new String[]{"name", "sex", "idCard", "tel", "birthday", "hireDate", "deptName", "type", diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 37fac5f..17fe7b6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -80,7 +80,7 @@ query.like("CODE", keywords); } List> maps = this.selectMaps(query); - if (maps != null && maps.size() > 0) { + if (maps != null) { maps.stream().forEach(map -> { if (ToolUtil.isNotEmpty(map.get("ts"))) { map.put("ts",dft.format(map.get("ts"))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index 1d29765..440c70d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -85,7 +85,7 @@ List> maps = this.selectMaps(query); maps.stream().filter(map -> ToolUtil.isNotEmpty(map.get("ts"))).forEach(map -> map.put("ts", dft.format(map.get("ts")))); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "中转站"; String[] title = new String[]{"编号", "名称", "地址", "建设单位", "经度", "纬度", "建设时间", "责任人", "责任人电话", "占地面积", "备注", "最新垃圾量"}; String[] properties = new String[]{"code", "name", "position", "owner", "lng", "lat", "ts", "responsiblePerson", "responsiblePersonTel", "area", "notes", "capacity"}; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index 7a346f9..2c9470f 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -94,7 +94,7 @@ } map.put("type", iCommonPermissionService.getDictNameByCode( "wastebinType",String.valueOf(map.get("type")))); }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "垃圾桶"; String[] title = new String[]{ "编号","名称","位置", "类型", "启用时间", "定位经度", "定位纬度", "责任人电话", "责任人", "备注"}; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index 0dd3e8f..161cc68 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -172,7 +172,7 @@ } }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "人员"; String[] title = new String[]{"姓名", "性别", "证件号码", "手机号", "生日", "入职年月", "部门名称", "人员类型", "岗位", "作业内容", "负责片区", "备注"}; String[] properties = new String[]{"name", "sex", "idCard", "tel", "birthday", "hireDate", "deptName", "type", diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 37fac5f..17fe7b6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -80,7 +80,7 @@ query.like("CODE", keywords); } List> maps = this.selectMaps(query); - if (maps != null && maps.size() > 0) { + if (maps != null) { maps.stream().forEach(map -> { if (ToolUtil.isNotEmpty(map.get("ts"))) { map.put("ts",dft.format(map.get("ts"))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index 1d29765..440c70d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -85,7 +85,7 @@ List> maps = this.selectMaps(query); maps.stream().filter(map -> ToolUtil.isNotEmpty(map.get("ts"))).forEach(map -> map.put("ts", dft.format(map.get("ts")))); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "中转站"; String[] title = new String[]{"编号", "名称", "地址", "建设单位", "经度", "纬度", "建设时间", "责任人", "责任人电话", "占地面积", "备注", "最新垃圾量"}; String[] properties = new String[]{"code", "name", "position", "owner", "lng", "lat", "ts", "responsiblePerson", "responsiblePersonTel", "area", "notes", "capacity"}; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index 7a346f9..2c9470f 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -94,7 +94,7 @@ } map.put("type", iCommonPermissionService.getDictNameByCode( "wastebinType",String.valueOf(map.get("type")))); }); - if (maps != null && maps.size() > 0) { + if (maps != null) { String sheetTitle = "垃圾桶"; String[] title = new String[]{ "编号","名称","位置", "类型", "启用时间", "定位经度", "定位纬度", "责任人电话", "责任人", "备注"}; diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index f57daa2..f80b32d 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -63,7 +63,7 @@ List> maps = this.selectMaps(query); - if (maps != null && maps.size() > 0) { + if (maps != null) { String companyName = "公厕作业记录"; String sheetTitle = companyName; String[] title = new String[]{"序号", "公厕ID", "定位经度", "定位纬度", "修改时间", "创建时间", "删除标志", "图片路径", "作业人", "作业内容"};