Browse Source

小程序企业查询修改

master
DX 1 month ago
parent
commit
99a1938775
  1. 1
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
  2. 6
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java
  3. 4
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java
  4. 25
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java
  5. 37
      yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java

@ -91,4 +91,5 @@ public class EnterprisePageReqVO extends PageParam {
private List<Long> tagList;
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/enterprise/EnterpriseMapper.java

@ -6,8 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.*;
import org.apache.ibatis.annotations.Param;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
@ -67,4 +71,6 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
.inIfPresent(EnterpriseDO::getId,reqVO.getIds())
.orderByDesc(EnterpriseDO::getId));
}
IPage<EnterpriseDO> getAppPage(Page<EnterpriseDO> page, @Param("params") EnterprisePageReqVO pageReqVO);
}

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java

@ -78,7 +78,7 @@ public class TaskSendStartMessageJob implements JobHandler {
LambdaQueryWrapper<EnterpriseInspectionsDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(EnterpriseInspectionsDO::getTaskId, x.getId());
List<EnterpriseInspectionsDO> enterpriseInspectionsDOList = enterpriseInspectionsMapper.selectList(wrapper);
if(enterpriseInspectionsDOList!=null && enterpriseInspectionsDOList.size() > 0){
if(enterpriseInspectionsDOList!=null && enterpriseInspectionsDOList.size() > 0) {
List<EnterpriseInspectionsDO> list = new ArrayList<>();
for (EnterpriseInspectionsDO enterpriseInspectionsDO : enterpriseInspectionsDOList) {
//站内信发送通知
@ -96,8 +96,6 @@ public class TaskSendStartMessageJob implements JobHandler {
}
enterpriseInspectionsMapper.updateBatch(list);
}
}
});

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java

@ -24,6 +24,8 @@ import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.tomcat.jni.FileInfo;
import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
@ -240,27 +242,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
pageReqVO.setDepartmentId(typeVO.getValue());
}
final PageResult<EnterpriseDO> enterpriseDOPageResult = enterpriseMapper.selectPage(pageReqVO);
Page<EnterpriseDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
final IPage<EnterpriseDO> appPage = enterpriseMapper.getAppPage(page, pageReqVO);
return new PageResult<>(appPage.getRecords(), appPage.getTotal());
if (pageReqVO.getTagList() != null && pageReqVO.getTagList().size() > 0) {
LambdaQueryWrapper<EnterpriseTagDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(EnterpriseTagDO::getTagId, pageReqVO.getTagList());
List<EnterpriseTagDO> enterpriseTagDOList = enterpriseTagMapper.selectList(wrapper);
//根据enterpriseTagDOList 筛选
List<EnterpriseDO> enterpriseDOList = new ArrayList<>();
for (EnterpriseDO enterpriseDO : enterpriseDOPageResult.getList()) {
for (EnterpriseTagDO enterpriseTagDO : enterpriseTagDOList) {
if (enterpriseTagDO.getEnterpriseId().equals(enterpriseDO.getId())) {
enterpriseDOList.add(enterpriseDO);
break;
}
}
}
enterpriseDOPageResult.setList(enterpriseDOList);
enterpriseDOPageResult.setTotal(Long.valueOf(enterpriseDOList.size()));
}
return enterpriseDOPageResult;
}
//审核状态
@Override

37
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/enterprise/EnterpriseMapper.xml

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.enterprise.EnterpriseMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
-->
<select id="getAppPage" resultType="cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO">
select e.*
from
enterprises e
left join enterprise_tag et on e.id = et.enterprise_id
left join tag_library tl on et.tag_id = tl.id
where
e.deleted = 0
<if test="params.region != null and params.region != ''">
and region = #{params.region}
</if>
<if test="params.userId != null and params.userId != ''">
and user_id = #{params.userId}
</if>
<if test="params.departmentId != null and params.departmentId != ''">
and department_id = #{params.departmentId}
</if>
<if test="params.tagList != null and params.tagList != ''">
and tl.id in
<foreach collection="params.tagList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>
Loading…
Cancel
Save