From 2c47237a314a8965f1b33be140f03eaa3e8804df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 六月 2024 16:47:44 +0800
Subject: [PATCH] 花城 修改关联项目筛选无数据2

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java |   13 +++---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml                                     |   44 ++++++++++++++++++++++
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java             |    8 +++
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java
index 4fbaff8..5283b16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java
@@ -1,9 +1,15 @@
 package com.panzhihua.service_dangjian.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.common.model.vos.partybuilding.ProjectVO;
 import com.panzhihua.service_dangjian.entity.ComActProject;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
-public interface ComActProjectMapper extends BaseMapper<ComActProject> {
+public interface ComActProjectMapper extends BaseMapper<ComActProject>
+{
+    List<ComActProject> getList(@Param("item")  ProjectVO projectVO);
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 334b67c..a98bf96 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -1207,12 +1207,13 @@
 
     @Override
     public R getProject(ProjectVO projectVO) {
-        LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
-        wrapper.eq(projectVO.getSpeciality()!=null,ComActProject::getSpeciality,projectVO.getSpeciality());
-        wrapper.eq(projectVO.getProject()!=null,ComActProject::getProject,projectVO.getProject());
-        wrapper.orderByDesc(ComActProject::getCreateTime);
-        List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
+//        LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
+//        wrapper.eq(projectVO.getSpeciality()!=null,ComActProject::getSpeciality,projectVO.getSpeciality());
+//        wrapper.eq(projectVO.getProject()!=null,ComActProject::getProject,projectVO.getProject());
+//        wrapper.orderByDesc(ComActProject::getCreateTime);
+//        List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
+        List<ComActProject> comActProjects = comActProjectMapper.getList(projectVO);
         return R.ok(comActProjects);
     }
 
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml
new file mode 100644
index 0000000..1e56477
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml
@@ -0,0 +1,44 @@
+<?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="com.panzhihua.service_dangjian.dao.ComActProjectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.entity.ComActProject">
+        <id column="id" property="id" />
+        <result column="unit_id" property="unitId" />
+        <result column="unit_name" property="unitName" />
+        <result column="speciality" property="speciality" />
+        <result column="project" property="project" />
+        <result column="phone" property="phone" />
+        <result column="image" property="image" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <select id="getList" resultMap="BaseResultMap">
+        select
+            id,
+            unit_id,
+            unit_name,
+            speciality,
+            project,
+            phone,
+            image,
+            create_time
+        from com_act_project
+        <where>
+            1=1
+            <if test="item.unitId !=null and item.unitId !='' ">
+                and unit_id=#{item.unitId}
+            </if>
+            <if test="item.speciality !=null and item.speciality !='' ">
+                and speciality like concat ('%',#{item.speciality},'%')
+            </if>
+            <if test="item.project !=null and item.project !='' ">
+                and speciality like concat ('%',#{item.project},'%')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+
+</mapper>

--
Gitblit v1.7.1