From eab6eca35b55b24a75d231931d2c9e6d1ea6c6e1 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Tue, 30 Jan 2024 10:29:28 +0800
Subject: [PATCH] xml

---
 .../mapper/SpecialProjectFeasibilityMapper.java      |  1 +
 .../service/SpecialProjectFeasibilityService.java    |  4 ++--
 .../service/SpecialProjectProposalService.java       |  8 +++++++-
 .../earlyStage/SpecialProjectFeasibilityMapper.xml   | 12 +++++++++---
 .../earlyStage/SpecialProjectProposalMapper.xml      |  4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java
index 5b000355..9e381e44 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java
@@ -29,6 +29,7 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
                                                  @Param("userType") String userType,
                                                  @Param("id") String id,
                                                  @Param("projectName") String projectName,
+                                                 @Param("projectCode") String projectCode,
                                                  @Param("adcd") String adcd,
                                                  @Param("orderBy") String orderBy,
                                                  @Param("pageNum") int pageNum,
diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
index 401fb40a..2a4ce043 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
@@ -49,10 +49,10 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
 
 
         if (ObjectUtil.isNull(params)) {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
         }else {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
         }
 
diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
index 7a723ae7..e3a492a7 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
@@ -1,8 +1,10 @@
 package com.kms.earlyStage.service;
 
 import cn.hutool.core.util.ObjectUtil;
+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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
@@ -56,7 +58,11 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         List<SpecialProjectProposal> list = null;
 
         if (ObjectUtil.isNull(data.getGetList())) {
-            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+            LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName())
+                    .like(data.getProjectCode() != null, SpecialProjectProposal::getProjectCode, data.getProjectCode())
+                    .likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(sp.getData().getAdcd()));
+
+            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
         }
 
 
diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
index 66d94225..637416c7 100644
--- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
@@ -14,7 +14,7 @@
                pf.PROJECT_INVESTMENT_ESTIMATE,
                pf.APPROVAL_OPINION,
                pf.create_time
-        from bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code
+        from  bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code
     </sql>
 
     <resultMap id="SpecialProjectFeasibility" type="SpecialProjectFeasibility">
@@ -59,7 +59,10 @@
                     AND user_id=#{userId})
                 </if>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pp.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="projectCode!=null and projectCode!=''">
+                    and pp.project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -68,7 +71,10 @@
         <if test="userType==00">
             <where>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pp.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="projectCode!=null and projectCode!=''">
+                    and pp.project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml
index 530384f0..3f851091 100644
--- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml
@@ -81,7 +81,7 @@
                     and project_name like concat('%',#{projectName},'%')
                 </if>
                 <if test="projectCode!=null and projectCode!=''">
-                    and project_code=#{projectCode}
+                    and project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -93,7 +93,7 @@
                     and project_name like concat('%',#{projectName},'%')
                 </if>
                 <if test="projectCode!=null and projectCode!=''">
-                    and project_code=#{projectCode}
+                    and project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>