From 63ee4dbc198eb7c8ec0694cf2d5a041acdb82f4e Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Sat, 27 May 2023 17:02:12 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/jeecg/common/system/query/QueryGenerator.java | 2 +- .../modules/basicdata/mapper/xml/CompanyConfigMapper.xml | 9 ++++----- .../service/impl/SjSafeEnvironmentFileServiceImpl.java | 1 - .../modules/worker/controller/WorkerInfoController.java | 8 ++++---- .../xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml | 6 ++++++ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index 40504d302..09134c0d7 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -179,7 +179,7 @@ public class QueryGenerator { //模糊查询 if (fieldNameSet != null && fieldNameSet.contains(name)) { Object v = PropertyUtils.getSimpleProperty(searchObj, name); - queryWrapper.like(v != null, enableAlias ? defaultAlias + StrUtil.toUnderlineCase(name) : StrUtil.toUnderlineCase(name), v); + queryWrapper.like(!StrUtil.isBlankIfStr(v), enableAlias ? defaultAlias + StrUtil.toUnderlineCase(name) : StrUtil.toUnderlineCase(name), v); continue; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml index 0174f1c74..f77eb7d7e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyConfigMapper.xml @@ -9,12 +9,11 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java index 2f4972a93..f9f1bd1c5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java @@ -179,7 +179,6 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl() .eq(SjSafeEnvironmentFile::getFileUrl, oldSjSafeEnvironmentFile.getFileUrl()) .in(SjSafeEnvironmentFile::getProjectSn, projectSnList) - .eq(StringUtils.isNotBlank(sjSafeEnvironmentFile.getProjectSn()), SjSafeEnvironmentFile::getProjectSn, sjSafeEnvironmentFile.getProjectSn()) .eq(SjSafeEnvironmentFile::getIsDir, 0) ); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index 0f335a822..6c9edabf6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -12,10 +12,7 @@ import com.zhgd.xmgl.modules.worker.entity.vo.PersonnelSituationVO; import com.zhgd.xmgl.modules.worker.entity.vo.WorkerInfoDetailsVo; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.util.MessageUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -140,6 +137,9 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "leaderName", value = "负责人姓名（班组）", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "chargePersonName", value = "负责人姓名（部门）", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "belongingSection", value = "所属标段（部门）", paramType = "query", required = false, dataType = "String"), }) @PostMapping(value = "/selectWorkerInfoList") public Result> selectWorkerInfoList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 3353000ca..d0e67d45d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -39,6 +39,12 @@ and c.charge_person_name like CONCAT(CONCAT('%',#{param.chargePersonName}),'%') + + and b.leader_name like CONCAT(CONCAT('%',#{param.leaderName}),'%') + + + and c.belonging_section like CONCAT(CONCAT('%',#{param.belongingSection}),'%') + and c.belonging_section like CONCAT(CONCAT('%',#{param.belongingSection}),'%')