优化费用出账

java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -191,6 +191,9 @@
         <if test="paymentCycle !=null and paymentCycle != ''">
             and t.payment_cycle= #{paymentCycle}
         </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -313,6 +316,9 @@
         <if test="paymentCycle !=null and paymentCycle != ''">
             and t.payment_cycle= #{paymentCycle}
         </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
 
 
     </select>

service-api/src/main/java/com/java110/api/listener/fee/SaveParkingSpaceCreateFeeListener.java

@@ -88,7 +88,6 @@ public class SaveParkingSpaceCreateFeeListener extends AbstractServiceApiListene
             parkingSpaceDto.setStates(new String[]{"S", "H"});
         }
         if ("1000".equals(reqJson.getString("locationTypeCd"))) {//小区
-
             parkingSpaceDto.setCommunityId(reqJson.getString("communityId"));
             parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
 

service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java

@@ -99,6 +99,10 @@ public class GenerateBillTemplate extends TaskSystemQuartz {
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setCommunityId(communityDto.getCommunityId());
         feeConfigDto.setBillType(getCurTaskAttr(taskDto, TASK_ATTR_BILL_TYPE).getValue());
+
+        if(StringUtil.isEmpty(feeConfigDto.getBillType())){
+            throw new IllegalArgumentException("配置错误 未拿到属性值");
+        }
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
 
         for (FeeConfigDto tmpFeeConfigDto : feeConfigDtos) {