yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询条件不好使的问题

This commit is contained in:
yangjun 2026-04-10 14:42:41 +08:00
parent c93320b965
commit 4a794ce30b
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java
View File

@ -90,6 +90,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
String dbStr = "";//电表集合
String sbStr = "";//水表集合
String wsdjStr = "";//温湿度计集合
if(wlsbList == null){
continue;
}
for (NuBaseInfo wlsb : wlsbList) {
if (info.getNuId().equals(wlsb.getNuId())) {
if ("1".equals(wlsb.getDeviceType())) {

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java
View File

@ -3,6 +3,8 @@ package com.nu.modules.employees.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
@ -65,6 +67,9 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuEmployeesAdvisoryInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuEmployeesAdvisoryInfo, req.getParameterMap());
if(StringUtils.isNotBlank(nuEmployeesAdvisoryInfo.getOrgCode())){
queryWrapper.eq("org_code", nuEmployeesAdvisoryInfo.getOrgCode());
}
Page<NuEmployeesAdvisoryInfo> page = new Page<NuEmployeesAdvisoryInfo>(pageNo, pageSize);
IPage<NuEmployeesAdvisoryInfo> pageList = nuEmployeesAdvisoryInfoService.getTjList(page, queryWrapper);
return Result.OK(pageList);

4
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java
View File

@ -8,6 +8,7 @@ import com.nu.modules.elderinfo.service.IElderInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
@ -47,6 +48,9 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
@GetMapping(value = "/getElderTjList")
public Result<IPage<ElderInfo>> getElderTjList(ElderInfo elderInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<ElderInfo> queryWrapper = QueryGenerator.initQueryWrapper(elderInfo, req.getParameterMap());
if(StringUtils.isNotBlank(elderInfo.getSysOrgCode())){
queryWrapper.eq("sys_org_code", elderInfo.getSysOrgCode());
}
Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize);
IPage<ElderInfo> pageList = elderInfoService.getElderTjList(page, queryWrapper);
return Result.OK(pageList);

3
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
View File

@ -781,6 +781,9 @@ public class SysDepartController {
HttpServletRequest req) {
QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
Page<SysDepart> page = new Page<>(pageNo, pageSize);
if(StringUtils.isNotBlank(sysDepart.getTitle())){
queryWrapper.apply("(depart_name like '%"+sysDepart.getTitle()+"%' or org_leader like '"+sysDepart.getTitle()+"' or org_leader_phone like '%"+sysDepart.getTitle()+"%')");
}
IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper);
return Result.ok(pageList);
}

2
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
View File

@ -522,6 +522,8 @@ public class SysDepart implements Serializable {
*/
@TableField(exist = false)
private String oldDirectorUserIds;
@TableField(exist = false)
private String title;
//update-end---author:wangshuai ---date:20200308 for：[JTC-119]新增字段负责人ids和旧的负责人ids