bug修改

This commit is contained in:
guoshengxiong 2024-04-24 22:36:54 +08:00
parent f4ab5c8945
commit 75b97151ce

View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.xz.service.impl; package com.zhgd.xmgl.modules.xz.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -16,6 +17,7 @@ import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -75,8 +77,12 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
} }
private QueryWrapper<XzTaskProgressContent> getQueryWrapper(HashMap<String, Object> paramMap) { private QueryWrapper<XzTaskProgressContent> getQueryWrapper(HashMap<String, Object> paramMap) {
String taskName = MapUtils.getString(paramMap, "taskName");
String alias = "c."; String alias = "c.";
QueryWrapper<XzTaskProgressContent> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressContent.class, paramMap, alias); QueryWrapper<XzTaskProgressContent> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressContent.class, paramMap, alias);
if (StrUtil.isNotBlank(taskName)) {
queryWrapper.like("xtp.task_name", taskName);
}
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate)); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate));
return queryWrapper; return queryWrapper;
} }