1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementOrderFeeController.java

@@ -409,7 +409,10 @@ public class BusAgreementOrderFeeController extends JeecgController<BusAgreement
 	 //@AutoLog(value = "协议账单表-消费、收款信息")
 	 @ApiOperation(value="协议账单表-消费、收款信息", notes="协议账单表-消费、收款信息")
 	 @GetMapping(value = "/queryAgreementAccount")
-	 public Result<AgreementAccountVo> queryAgreementAccount(@RequestParam(name="agreementUnitId",required=true) String agreementUnitId) {
+	 public Result<AgreementAccountVo> queryAgreementAccount(
+			 @RequestParam(name="startTime",required = true) String startTime,
+			 @RequestParam(name="endTime",required = true) String endTime,
+			 @RequestParam(name="agreementUnitId",required=true) String agreementUnitId) {
 		 AgreementAccountVo agreementAccountVo = new AgreementAccountVo();
 		 agreementAccountVo.setConsume(BigDecimal.valueOf(0));
 		 agreementAccountVo.setPayment(BigDecimal.valueOf(0));
@@ -420,6 +423,9 @@ public class BusAgreementOrderFeeController extends JeecgController<BusAgreement
 		 querOrderFee.eq("agreement_unit_id", agreementUnitId);
 		 querOrderFee.eq("status", AgreementOrderStatusEnum.NOT_SETTLEMENT.getKey());
 		 querOrderFee.notIn("type",typeList);
+		 if (oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)){
+			 querOrderFee.between("created_time", startTime,endTime);
+		 }
 		 List<BusAgreementOrderFee> orderFeeList = busAgreementOrderFeeService.list(querOrderFee);
 
 		 BigDecimal _consume = new BigDecimal("0.00");
@@ -437,7 +443,9 @@ public class BusAgreementOrderFeeController extends JeecgController<BusAgreement
 		 querOrderFee1.eq("agreement_unit_id", agreementUnitId);
 		 querOrderFee1.eq("status", AgreementOrderStatusEnum.NOT_SETTLEMENT.getKey());
 		 querOrderFee1.in("type", typeList);
-
+		 if (oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)){
+			 querOrderFee1.between("created_time", startTime,endTime);
+		 }
 		 List<BusAgreementOrderFee> orderFeeList1 = busAgreementOrderFeeService.list(querOrderFee1);
 
 		 BigDecimal _payment = new BigDecimal("0.00");