Эх сурвалжийг харах

1.控制台渠道显示234机构

wuhp 2 жил өмнө
parent
commit
8c06643cb7

+ 4 - 0
src/main/java/com/ydtech/modules/admin/model/dto/TaskStatisticsDto.java

@@ -106,4 +106,8 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "区级部门名称")
     private String districtName;
 
+
+    @ApiModelProperty(value = "省级机构名称")
+    private String provinceName;
+
 }

+ 12 - 11
src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -68,17 +68,18 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 if (StringUtils.isNotEmpty(deptId)) {
                     int length = deptId.length();
                     if (length > 0) {
-                        if (length > 10) {
-                            String substring = deptId.substring(0, 6);
-                            String substring1 = deptId.substring(0, 8);
-                            SysDept cityName = sysDeptService.getById(substring);
-                            SysDept districtName = sysDeptService.getById(substring1);
-                            record.setCityName(cityName.getName());
-                            record.setDistrictName(districtName.getName());
-                        } else if (length > 6) {
-                            String substring = deptId.substring(0, 6);
-                            SysDept cityName = sysDeptService.getById(substring);
-                            record.setCityName(cityName.getName());
+                        if (length > 0) {
+                            if (length > 10) {
+                                String substring = deptId.substring(0, 6);
+                                String substring1 = deptId.substring(0, 8);
+                                String province = deptId.substring(0, 4);
+                                SysDept cityName = sysDeptService.getById(substring);
+                                SysDept districtName = sysDeptService.getById(substring1);
+                                SysDept provinceName = sysDeptService.getById(province);
+                                record.setCityName(cityName.getName());
+                                record.setDistrictName(districtName.getName());
+                                record.setProvinceName(provinceName.getName());
+                            }
                         }
                     }
                 }