修改查询数据

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -42,6 +42,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -75,7 +76,16 @@ public class BasicdataClientController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataClient")
 	public R<IPage<BasicdataClientEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataClient, Query query) {
-		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class));
+		Object o = basicdataClient.get("contractStartTime");
+		Object o1 = basicdataClient.get("contractEntTime");
+		basicdataClient.put("contractStartTime",null);
+		basicdataClient.put("contractEntTime",null);
+		QueryWrapper<BasicdataClientEntity> queryWrapper = Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class);
+		queryWrapper.apply(o != null,
+				"date_format (contract_start_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", o)
+			.apply(o1 != null,
+				"date_format (contract_ent_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", o1);
+		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}