优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -61,6 +61,7 @@ public class FeeDto extends PageDto implements Serializable {
     private double oweFee; // 欠费金额
     private String billType;
     private String billTypeName;
+    private String builtUpArea;
 
     private String paymentCd;
 
@@ -507,4 +508,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setIncomeObjName(String incomeObjName) {
         this.incomeObjName = incomeObjName;
     }
+
+    public String getBuiltUpArea() {
+        return builtUpArea;
+    }
+
+    public void setBuiltUpArea(String builtUpArea) {
+        this.builtUpArea = builtUpArea;
+    }
 }

service-fee/src/main/java/com/java110/fee/api/FeeApi.java

@@ -181,11 +181,29 @@ public class FeeApi extends BaseController {
         return queryOweFeeImpl.query(feeDto);
     }
 
+    /**
+     * 查询欠费费用
+     *
+     * @param feeId       费用ID
+     * @param communityId 小区ID
+     * @return
+     * @path /app/feeApi/listFeeObj
+     */
+    @RequestMapping(value = "/listFeeObj", method = RequestMethod.GET)
+    public ResponseEntity<String> listFeeObj(
+            @RequestParam(value = "feeId") String feeId,
+            @RequestParam(value = "communityId") String communityId) {
+        FeeDto feeDto = new FeeDto();
+        feeDto.setFeeId(feeId);
+        feeDto.setCommunityId(communityId);
+        return queryOweFeeImpl.listFeeObj(feeDto);
+    }
+
 
     /**
      * 查询欠费费用(批量查询)
      *
-     * @param num    停车位或房屋编号
+     * @param num         停车位或房屋编号
      * @param communityId 小区ID
      * @return
      * @path /app/feeApi/getOweFees
@@ -197,7 +215,7 @@ public class FeeApi extends BaseController {
             @RequestParam(value = "billType") String billType,
             @RequestParam(value = "row") int row,
             @RequestParam(value = "page") int page,
-            @RequestParam(value = "num",required = false) String num
+            @RequestParam(value = "num", required = false) String num
     ) {
         FeeDto feeDto = new FeeDto();
         feeDto.setPayerObjId(num);

service-fee/src/main/java/com/java110/fee/bmo/IQueryOweFee.java

@@ -1,6 +1,5 @@
 package com.java110.fee.bmo;
 
-import com.java110.dto.fee.FeeAttrDto;
 import com.java110.dto.fee.FeeDto;
 import org.springframework.http.ResponseEntity;
 
@@ -8,6 +7,7 @@ public interface IQueryOweFee {
 
     /**
      * 查询费用
+     *
      * @param feeDto
      * @return
      */
@@ -15,8 +15,17 @@ public interface IQueryOweFee {
 
     /**
      * 查询费用
+     *
      * @param feeDto
      * @return
      */
     ResponseEntity<String> queryAllOwneFee(FeeDto feeDto);
+
+    /**
+     * 查询费用作用对象 接口
+     *
+     * @param feeDto
+     * @return
+     */
+    ResponseEntity<String> listFeeObj(FeeDto feeDto);
 }

service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -15,6 +15,9 @@ import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.ListenerExecuteException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
@@ -26,12 +29,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class QueryOweFeeImpl implements IQueryOweFee {
@@ -104,6 +102,50 @@ public class QueryOweFeeImpl implements IQueryOweFee {
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> listFeeObj(FeeDto feeDto) {
+
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        if (feeDtos == null || feeDtos.size() < 1) {
+            return ResultVo.success();
+        }
+
+        feeDto = feeDtos.get(0);
+
+        if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋相关
+            RoomDto roomDto = new RoomDto();
+            roomDto.setRoomId(feeDto.getPayerObjId());
+            roomDto.setCommunityId(feeDto.getCommunityId());
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+            if (roomDtos == null || roomDtos.size() != 1) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
+            }
+            roomDto = roomDtos.get(0);
+            feeDto.setPayerObjName(roomDto.getFloorNum() + "栋" + roomDto.getUnitNum() + "单元" + roomDto.getRoomNum() + "室");
+            feeDto.setBuiltUpArea(roomDto.getBuiltUpArea());
+
+        } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关
+            OwnerCarDto ownerCarDto = new OwnerCarDto();
+            ownerCarDto.setCommunityId(feeDto.getCommunityId());
+            ownerCarDto.setCarId(feeDto.getPayerObjId());
+            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+            Assert.listOnlyOne(ownerCarDtos, "未找到车辆信息");
+            ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+            parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
+            parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
+            List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+            if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //数据有问题
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到停车位信息，查询多条数据");
+            }
+            ownerCarDto = ownerCarDtos.get(0);
+            parkingSpaceDto = parkingSpaceDtos.get(0);
+            feeDto.setPayerObjName(ownerCarDto.getCarNum() + "(" + parkingSpaceDto.getAreaNum() + "停车场" + parkingSpaceDto.getNum() + "车位)");
+            feeDto.setBuiltUpArea(parkingSpaceDto.getArea());
+        }
+        return ResultVo.createResponseEntity(feeDto);
+    }
+
     private boolean freshFeeDtoParam(FeeDto feeDto) {
 
         if (StringUtil.isEmpty(feeDto.getPayerObjId())) {