优化代码

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

@@ -197,7 +197,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
 
 
         PayFeePo payFeePo = new PayFeePo();
-        payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+        payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId,true));
         payFeePo.setIncomeObjId(storeId);
         payFeePo.setAmount("-1");
         payFeePo.setStartTime(importExportMeterWaterDto.getPreReadingTime());
@@ -213,7 +213,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
             FeeAttrPo feeAttrPo = new FeeAttrPo();
             feeAttrPo.setCommunityId(communityId);
-            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
             String feeName = roomName;
             if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
@@ -235,7 +235,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
         feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
         feeAttrPo.setValue(roomName);
         feeAttrPo.setFeeId(payFeePo.getFeeId());
-        feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+        feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
         feeAttrPos.add(feeAttrPo);
 
         OwnerDto ownerDto = new OwnerDto();
@@ -249,7 +249,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
             feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
             feeAttrPo.setFeeId(payFeePo.getFeeId());
-            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
             feeAttrPos.add(feeAttrPo);
 
             feeAttrPo = new FeeAttrPo();
@@ -257,7 +257,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
             feeAttrPo.setValue(ownerDtos.get(0).getLink());
             feeAttrPo.setFeeId(payFeePo.getFeeId());
-            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
             feeAttrPos.add(feeAttrPo);
 
             feeAttrPo = new FeeAttrPo();
@@ -265,7 +265,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
             feeAttrPo.setValue(ownerDtos.get(0).getName());
             feeAttrPo.setFeeId(payFeePo.getFeeId());
-            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
             feeAttrPos.add(feeAttrPo);
 
         }
@@ -294,7 +294,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
         meterWaterPo.setObjType(MeterWaterDto.OBJ_TYPE_ROOM);
         meterWaterPo.setPreDegrees(importExportMeterWaterDto.getPreDegrees());
         meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
-        meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
+        meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId,true));
         meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
         meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
         meterWaterPos.add(meterWaterPo);