Lianxun_Java.git

			@@ -434,15 +434,15 @@
			for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
			builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getRoomRent())));
			}
			feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
			feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
			feeReceiptDetailPo.setArea("");
			feeReceiptDetailPo.setSquarePrice(builtUpArea.doubleValue() + "");
			} else if ("1102".equals(computingFormula)) { // 租金
			BigDecimal builtUpArea = new BigDecimal(0);
			for (ContractRoomDto tmpContractRoomDto : contractRoomDtos) {
			builtUpArea = builtUpArea.add(new BigDecimal(Double.parseDouble(tmpContractRoomDto.getRoomRent())));
			}
			feeReceiptDetailPo.setArea(builtUpArea.doubleValue() + "");
			feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
			feeReceiptDetailPo.setArea("");
			feeReceiptDetailPo.setSquarePrice(builtUpArea.doubleValue() + "");
			}else if ("4004".equals(computingFormula)) {
			} else if ("5005".equals(computingFormula)) {
			if (StringUtil.isEmpty(feeDto.getCurDegrees())) {

			@@ -1291,6 +1291,7 @@
			JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
			reqJson.put("page", 1);
			reqJson.put("row", 10000);
			reqJson.put("storeId",result.getStoreId());
			apiUrl = "purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
			responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
			if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过保存单元信息

	java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史