1

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

@@ -29,10 +29,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.business.dto.BatchAgreementOrderSavaDto;
-import org.jeecg.modules.business.entity.BusAgreementOrderFee;
-import org.jeecg.modules.business.entity.BusCommodityRecord;
-import org.jeecg.modules.business.entity.BusDict;
-import org.jeecg.modules.business.entity.BusSalesPersonPost;
+import org.jeecg.modules.business.entity.*;
 import org.jeecg.modules.business.enums.*;
 import org.jeecg.modules.business.service.IBusAgreementOrderFeeService;
 import org.jeecg.modules.business.service.IBusCommodityRecordService;
@@ -92,15 +89,20 @@ public class BusAgreementOrderFeeController extends JeecgController<BusAgreement
 	public Result<IPage<BusAgreementOrderFee>> queryPageList(BusAgreementOrderFee busAgreementOrderFee,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									@RequestParam(name="startTime",required = true) String startTime,
+									@RequestParam(name="endTime",required = true) String endTime,
 								   HttpServletRequest req) {
 		QueryWrapper<BusAgreementOrderFee> queryWrapper = QueryGenerator.initQueryWrapper(busAgreementOrderFee, req.getParameterMap());
 		Page<BusAgreementOrderFee> page = new Page<BusAgreementOrderFee>(pageNo, pageSize);
+		if (oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)){
+			queryWrapper.between("created_time", startTime,endTime);
+		}
 		IPage<BusAgreementOrderFee> pageList = busAgreementOrderFeeService.page(page, queryWrapper);
-		pageList.getRecords().forEach(item->{
+		pageList.getRecords().forEach(item -> {
 			//处理客人信息
-			if (oConvertUtils.isEmpty(item.getOrderFeeId())){
+			if (oConvertUtils.isEmpty(item.getOrderFeeId())) {
 				item.setGuest("协议单位");
-			}else{
+			} else {
 				//根据关联的入住单找到客户信息
 			}
 		});