Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysPcAddressController.java

@@ -15,7 +15,6 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,8 +69,8 @@ public class SysPcAddressController extends BaseController{
      */
     @PostMapping("/locations")
     @ApiOperation(value = "pc地址范围查询")
-    public List<SysPcAddress> getLocationsWithinRadius(@RequestBody AdressRangeDto adressRangeDto) {
-        return sysPcAddressService.findLocationsWithinRadius(adressRangeDto);
+    public HttpResult<List<SysPcAddress>> getLocationsWithinRadius(@RequestBody AdressRangeDto adressRangeDto) {
+        return HttpResult.ok("success",sysPcAddressService.findLocationsWithinRadius(adressRangeDto));
     }
 
     @PostMapping("/queryPcNum")

src/main/java/com/ydtech/modules/admin/controller/websocket/SysGeographyPositionController.java

@@ -57,8 +57,8 @@ public class SysGeographyPositionController {
 
     @PostMapping("/locations")
     @ApiOperation(value = "APP地址范围查询")
-    public List<SysGeographyPositionInfoVo> getLocationsWithinRadius(@RequestBody AdressRangeDto adressRangeDto) {
-        return sysGeographyPositionService.findLocationsWithinRadius(adressRangeDto);
+    public HttpResult<List<SysGeographyPositionInfoVo>> getLocationsWithinRadius(@RequestBody AdressRangeDto adressRangeDto) {
+        return HttpResult.ok("success",sysGeographyPositionService.findLocationsWithinRadius(adressRangeDto));
     }
 
     @PostMapping("/queryGeographyInfo")

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;
+
 }

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());
+                            }
                         }
                     }
                 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1978,7 +1978,6 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             if (!CollectionUtils.isEmpty(byTaskId)) {
                 params.put("incomeIds", byTaskId);
             }
-            params.put("handlingFeesStatus","0");
             List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(params);
             if (!CollectionUtils.isEmpty(insPlyIncomes)) {
                 if (insPlyIncomeVo != null) { // 确保insPlyIncomeVo不是null