模糊查詢

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/ItdmWtkehu/controller/ItdmWtkehuController.java

@@ -9,6 +9,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -66,7 +70,11 @@ public class ItdmWtkehuController extends JeecgController<ItdmWtkehu, IItdmWtkeh
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ItdmWtkehu> queryWrapper = QueryGenerator.initQueryWrapper(itdmWtkehu, req.getParameterMap());
+		ItdmWtkehu itdmWtkehu1 = new ItdmWtkehu();
+		QueryWrapper<ItdmWtkehu> queryWrapper = QueryGenerator.initQueryWrapper(itdmWtkehu1, req.getParameterMap());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmWtkehu.getWeituiClient()),ItdmWtkehu::getWeituiClient,itdmWtkehu.getWeituiClient());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmWtkehu.getWeituiLxr()),ItdmWtkehu::getWeituiLxr,itdmWtkehu.getWeituiLxr());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmWtkehu.getWeituiPhone()),ItdmWtkehu::getWeituiPhone,itdmWtkehu.getWeituiPhone());
 		Page<ItdmWtkehu> page = new Page<ItdmWtkehu>(pageNo, pageSize);
 		IPage<ItdmWtkehu> pageList = itdmWtkehuService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -88,10 +96,10 @@ public class ItdmWtkehuController extends JeecgController<ItdmWtkehu, IItdmWtkeh
 	//@RequiresPermissions("org.jeecg.modules:itdm_wtkehu:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ItdmWtkehu itdmWtkehu) {
-		ItdmWtkehu queryResult = itdmWtkehuService.getOne(new QueryWrapper<ItdmWtkehu>().eq("weitui_client", itdmWtkehu.getWeituiClient()));
-		if (queryResult != null) {
-			return Result.error("添加失败，委托单位名称已存在！");
-		}
+		//ItdmWtkehu queryResult = itdmWtkehuService.getOne(new QueryWrapper<ItdmWtkehu>().eq("weitui_client", itdmWtkehu.getWeituiClient()));
+		//if (queryResult != null) {
+		//	return Result.error("添加失败，委托单位名称已存在！");
+		//}
 		itdmWtkehuService.save(itdmWtkehu);
 		return Result.OK("添加成功！");
 	}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/controller/ItdmChuanganqiController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -79,7 +81,9 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ItdmChuanganqi> queryWrapper = QueryGenerator.initQueryWrapper(itdmChuanganqi, req.getParameterMap());
+		ItdmChuanganqi itdmChuanganqi1 = new ItdmChuanganqi();
+		QueryWrapper<ItdmChuanganqi> queryWrapper = QueryGenerator.initQueryWrapper(itdmChuanganqi1, req.getParameterMap());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXuliehao()),ItdmChuanganqi::getXuliehao,itdmChuanganqi.getXuliehao());
 		Page<ItdmChuanganqi> page = new Page<ItdmChuanganqi>(pageNo, pageSize);
 		IPage<ItdmChuanganqi> pageList = itdmChuanganqiService.page(page, queryWrapper);
 		return Result.OK(pageList);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -74,7 +75,10 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ItdmDevice> queryWrapper = QueryGenerator.initQueryWrapper(itdmDevice, req.getParameterMap());
+		ItdmDevice itdmDevice1 = new ItdmDevice();
+		QueryWrapper<ItdmDevice> queryWrapper = QueryGenerator.initQueryWrapper(itdmDevice1, req.getParameterMap());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmDevice.getDeviceName()),ItdmDevice::getDeviceName,itdmDevice.getDeviceName());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmDevice.getDeviceType()),ItdmDevice::getDeviceType,itdmDevice.getDeviceType());
 		Page<ItdmDevice> page = new Page<ItdmDevice>(pageNo, pageSize);
 		IPage<ItdmDevice> pageList = itdmDeviceService.page(page, queryWrapper);
 		return Result.OK(pageList);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituoyiju/controller/ItdmWeituoYijuController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -66,7 +68,10 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ItdmWeituoYiju> queryWrapper = QueryGenerator.initQueryWrapper(itdmWeituoYiju, req.getParameterMap());
+		ItdmWeituoYiju itdmWeituoYiju1 = new ItdmWeituoYiju();
+		QueryWrapper<ItdmWeituoYiju> queryWrapper = QueryGenerator.initQueryWrapper(itdmWeituoYiju1, req.getParameterMap());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmWeituoYiju.getCore()),ItdmWeituoYiju::getCore,itdmWeituoYiju.getCore());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmWeituoYiju.getName()),ItdmWeituoYiju::getName,itdmWeituoYiju.getName());
 		Page<ItdmWeituoYiju> page = new Page<ItdmWeituoYiju>(pageNo, pageSize);
 		IPage<ItdmWeituoYiju> pageList = itdmWeituoYijuService.page(page, queryWrapper);
 		return Result.OK(pageList);