优化 导入费用时，模板上能体现一下房屋状态，这样未销售房就不会依然被填入

java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml

@@ -20,11 +20,12 @@
         select t.section,t.remark,t.status_cd,t.status_cd statusCd,t.room_sub_type,t.room_sub_type
         roomSubType,t.room_area,t.room_area roomArea,t.user_id,t.user_id userId,t.room_id,t.room_id
         roomId,t.layer,t.fee_coefficient,t.fee_coefficient feeCoefficient,t.built_up_area,t.built_up_area
-        builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,t.community_id,t.community_id
+        builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,td.name stateName,t.community_id,t.community_id
         communityId,t.apartment,t.room_type,t.room_type roomType,t.room_rent,t.room_rent roomRent,f.floor_num floorNum,bu.unit_num unitNum
         from building_room t
         left join  building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
         left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         where 1 =1
         <if test="section !=null and section != ''">
             and t.section= #{section}

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

@@ -126,7 +126,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
 
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
-
+        paramIn.put("storeId",result.getStoreId());
         Assert.hasKeyAndValue(paramIn, "communityId", "请求中未包含小区");
         //Assert.hasKeyAndValue(paramIn, "floorIds", "请求中未包含楼栋");
         Assert.hasKeyAndValue(paramIn, "configIds", "请求中未包含费用项");
@@ -180,7 +180,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellStyle(cs);
         row.setHeight((short) (200 * 10));
         row = sheet.createRow(1);
-        row.createCell(0).setCellValue("房号/车牌号");
+        row.createCell(0).setCellValue("车牌号");
         row.createCell(1).setCellValue("类型");
         row.createCell(2).setCellValue("费用项ID");
         row.createCell(3).setCellValue("收费项目");
@@ -265,12 +265,14 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellStyle(cs);
         row.setHeight((short) (200 * 10));
         row = sheet.createRow(1);
-        row.createCell(0).setCellValue("房号/车牌号");
+        row.createCell(0).setCellValue("房号");
         row.createCell(1).setCellValue("类型");
         row.createCell(2).setCellValue("费用项ID");
         row.createCell(3).setCellValue("收费项目");
         row.createCell(4).setCellValue("建账时间");
         row.createCell(5).setCellValue("计费起始时间");
+        row.createCell(6).setCellValue("房屋状态");
+
 
         RoomDto roomDto = new RoomDto();
         roomDto.setCommunityId(paramIn.getString("communityId"));
@@ -299,6 +301,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
                 row.createCell(3).setCellValue(tmpFeeConfigDto.getFeeName());
                 row.createCell(4).setCellValue("");
                 row.createCell(5).setCellValue("");
+                row.createCell(6).setCellValue(tmpRoomDto.getStateName());
                 roomIndex += 1;
             }
         }
@@ -492,7 +495,6 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
 
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
-        pd.getHeaders().put("store-id",result.getStoreId());
 
         Assert.hasKeyAndValue(paramIn, "communityId", "请求中未包含小区");
         //Assert.hasKeyAndValue(paramIn, "floorIds", "请求中未包含楼栋");

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

@@ -249,6 +249,11 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
         }
         payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
         payFeePo.setState(FeeDto.STATE_DOING);
+        // 如果 当前读数小于等于上期读数
+        if(Double.parseDouble(importExportMeterWaterDto.getCurDegrees()) <= Double.parseDouble(importExportMeterWaterDto.getPreDegrees())){
+            payFeePo.setState(FeeDto.STATE_FINISH);
+        }
+
         payFeePo.setUserId(userId);
         payFeePo.setFeeTypeCd(feeTypeCd);
         payFeePo.setConfigId(configId);

springboot/src/main/java/com/java110/boot/smo/assetExport/impl/ExportRoomSMOImpl.java

@@ -180,7 +180,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellStyle(cs);
         row.setHeight((short) (200 * 10));
         row = sheet.createRow(1);
-        row.createCell(0).setCellValue("房号/车牌号");
+        row.createCell(0).setCellValue("车牌号");
         row.createCell(1).setCellValue("类型");
         row.createCell(2).setCellValue("费用项ID");
         row.createCell(3).setCellValue("收费项目");
@@ -265,12 +265,14 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellStyle(cs);
         row.setHeight((short) (200 * 10));
         row = sheet.createRow(1);
-        row.createCell(0).setCellValue("房号/车牌号");
+        row.createCell(0).setCellValue("房号");
         row.createCell(1).setCellValue("类型");
         row.createCell(2).setCellValue("费用项ID");
         row.createCell(3).setCellValue("收费项目");
         row.createCell(4).setCellValue("建账时间");
         row.createCell(5).setCellValue("计费起始时间");
+        row.createCell(6).setCellValue("房屋状态");
+
 
         RoomDto roomDto = new RoomDto();
         roomDto.setCommunityId(paramIn.getString("communityId"));
@@ -299,6 +301,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
                 row.createCell(3).setCellValue(tmpFeeConfigDto.getFeeName());
                 row.createCell(4).setCellValue("");
                 row.createCell(5).setCellValue("");
+                row.createCell(6).setCellValue(tmpRoomDto.getStateName());
                 roomIndex += 1;
             }
         }