From 69ead14b10426f52446888706ad38c9a7a9a8cb5 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 6 Jun 2025 17:17:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(sip):=20=E4=BC=98=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ProjectInfoMapper.xml 中简化了 selectMaxProjectCode 查询语句
- 在 ProjectInfoServiceImpl.java 中优化了 setProjectCode 方法的逻辑
- 添加了对代理名称和支援用户名称的模糊查询功能
---
 .../ruoyi/sip/service/impl/ProjectInfoServiceImpl.java    | 8 ++++----
 .../src/main/resources/mapper/sip/ProjectInfoMapper.xml   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
index 19b9eb9f..4e83939f 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
@@ -143,11 +143,11 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
     private void setProjectCode(ProjectInfo projectInfo) {
         String s = projectInfoMapper.selectMaxProjectCode(projectInfo);
         if (s == null) {
-            projectInfo.setProjectCode(PROJECT_CODE_PREFIX + "00001");
-        }else{
-            projectInfo.setProjectCode(PROJECT_CODE_PREFIX + String.format("%0" + PROJECT_CODE_LENGTH + "d",
-                    Integer.parseInt(s.substring(PROJECT_CODE_PREFIX.length())) + 1));
+            s = "0";
         }
+        projectInfo.setProjectCode(PROJECT_CODE_PREFIX + String.format("%0" + PROJECT_CODE_LENGTH + "d",
+                Integer.parseInt(s.substring(PROJECT_CODE_PREFIX.length())) + 1));
+
     }
 
     private void saveOtherInfo(ProjectInfo projectInfo1) {
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index f4958f30..d57c4bde 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -77,11 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectProjectInfoList" parameterType="ProjectInfo" resultMap="ProjectInfoResult">
         <include refid="selectRelationProjectInfoVo"/>
-        <where>  
+        <where>
             <if test="projectCode != null  and projectCode != ''"> and t1.project_code = #{projectCode}</if>
             <if test="projectName != null  and projectName != ''"> and t1.project_name like concat('%', #{projectName}, '%')</if>
             <if test="customerCode != null  and customerCode != ''"> and t1.customer_code = #{customerCode}</if>
             <if test="agentCode != null  and agentCode != ''"> and t1.agent_code = #{agentCode}</if>
+            <if test="agentName != null  and agentName != ''"> and t2.agent_name  like concat('%', #{agentName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and t1.customer_name like concat('%', #{customerName}, '%')</if>
             <if test="industryType != null  and industryType != ''"> and t1.industry_type = #{industryType}</if>
             <if test="bgProperty != null  and bgProperty != ''"> and t1.bg_property = #{bgProperty}</if>
@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectStage != null  and projectStage != ''"> and t1.project_stage = #{projectStage}</if>
             <if test="projectGraspDegree != null  and projectGraspDegree != ''"> and t1.project_grasp_degree = #{projectGraspDegree}</if>
             <if test="hzSupportUser != null  and hzSupportUser != ''"> and t1.hz_support_user = #{hzSupportUser}</if>
+            <if test="hzSupportUserName != null  and hzSupportUserName != ''"> t3.user_name like concat('%', #{hzSupportUserName}, '%')</if>
             <if test="operateInstitution != null  and operateInstitution != ''"> and t1.operate_institution = #{operateInstitution}</if>
             <if test="partnerCode != null  and partnerCode != ''"> and t1.partner_code = #{partnerCode}</if>
             <if test="partnerName != null  and partnerName != ''"> and t1.partner_name = #{partnerName}</if>
@@ -154,9 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.id = #{id}
     </select>
     <select id="selectMaxProjectCode" resultType="java.lang.String">
-        select project_code from project_info
-            where agent_code=#{agentCode}
-        order by project_code desc limit 1
+        select max(project_code) from project_info
     </select>
     <select id="selectUserById" resultType="com.ruoyi.common.core.domain.entity.SysUser">
         select * from sys_user