8.费用--欠费信息中，导出功能中，多导出了一条金额为零的数据，但是列表中是不存在的

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

@@ -35,6 +35,7 @@ public class FeeConfigDto extends PageDto implements Serializable {
 
     public static final String COMPUTING_FORMULA_TEMP_CAR = "9999";
     public static final String COMPUTING_FORMULA_RANT_RATE = "1102"; // 租金递增
+    public static final String COMPUTING_FORMULA_DYNAMIC = "4004"; // 租金递增
 
     public static final String PAYMENT_CD_PRE = "1200";
     public static final String PAYMENT_CD_AFTER = "2100";

service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -1103,6 +1103,7 @@ public class ExportReportFeeSMOImpl extends DefaultAbstractComponentSMO implemen
         JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
         reqJson.put("page", 1);
         reqJson.put("row", 10000);
+        reqJson.put("hasOweFee","Y");
         apiUrl = "/reportOweFee/queryReportAllOweFee" + mapToUrlParam(reqJson);
         responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
         if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息

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

@@ -122,6 +122,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setFeeTypeCd(feeTypeCd);
         feeConfigDto.setFeeName(feeName);
+        feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
         feeConfigDto.setCommunityId(communityId);
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
         // 根据费用大类 判断是否有存在 费用导入收入项
@@ -319,6 +320,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setFeeTypeCd(feeTypeCd);
         feeConfigDto.setFeeName(feeName);
+        feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
         feeConfigDto.setCommunityId(communityId);
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
         // 根据费用大类 判断是否有存在 费用导入收入项
@@ -497,6 +499,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setFeeTypeCd(feeTypeCd);
         feeConfigDto.setFeeName(feeName);
+        feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
         feeConfigDto.setCommunityId(communityId);
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
         // 根据费用大类 判断是否有存在 费用导入收入项
@@ -654,7 +657,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(feeConfigDto, PayFeeConfigPo.class);
         payFeeConfigPo.setAdditionalAmount("0");
         payFeeConfigPo.setBillType(FeeConfigDto.BILL_TYPE_MONTH);
-        payFeeConfigPo.setComputingFormula("4004");
+        payFeeConfigPo.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
         payFeeConfigPo.setEndTime(DateUtil.getLastTime());
         payFeeConfigPo.setFeeFlag("2006012");
         payFeeConfigPo.setIsDefault("F");

service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java

@@ -226,8 +226,8 @@ public class ListFeeCmd extends Cmd {
         //动态费用
         if ("4004".equals(computingFormula)
                 && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
-                && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
-            feeDto.setAmountOwed(df.format(curFeePrice) + "");
+                && !FeeDto.STATE_FINISH.equals(feeDto.getState())
+                && feeDto.getDeadlineTime() == null) {
             feeDto.setDeadlineTime(DateUtil.getCurrentDate());
         }
 

service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java

@@ -134,11 +134,13 @@ public class ReportOweFeeApi {
     public ResponseEntity<String> queryReportAllOweFee(@RequestParam(value = "communityId") String communityId,
                                                        @RequestParam(value = "configIds", required = false) String configIds,
                                                        @RequestParam(value = "payObjType", required = false) String payObjType,
+                                                       @RequestParam(value = "hasOweFee", required = false) String hasOweFee,
                                                        @RequestParam(value = "num", required = false) String num) {
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
         reportOweFeeDto.setPayerObjType(payObjType);
         reportOweFeeDto.setPayerObjName(num);
         reportOweFeeDto.setCommunityId(communityId);
+        reportOweFeeDto.setHasOweFee(hasOweFee);
         if (!StringUtil.isEmpty(configIds)) {
             String[] tmpConfigIds = configIds.split(",");
             reportOweFeeDto.setConfigIds(tmpConfigIds);