fix: 别名管理调整，去掉目标基金名称和备案编码字段

service-base/src/main/java/com/simuwang/base/pojo/dos/FundAliasDO.java

@@ -9,62 +9,50 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("fund_alias")
 public class FundAliasDO {
     /**
      * 主键Id
      */
-    @TableId(value = "id")
     private Integer id;
     /**
      * 邮件解析基金名称
      */
-    @TableField(value = "source_fund_name")
     private String sourceFundName;
     /**
      * 邮件解析基金的备案编码
      */
-    @TableField(value = "source_register_number")
     private String sourceRegisterNumber;
     /**
      * 匹配的源数据基金名称
      */
-    @TableField(value = "target_fund_name")
     private String targetFundName;
     /**
      * 匹配的源基金ID
      */
-    @TableField(value = "target_fund_id")
     private String targetFundId;
     /**
      * 匹配的源备案编码
      */
-    @TableField(value = "target_register_number")
     private String targetRegisterNumber;
     /**
      * 记录的有效性；1-有效；0-无效；
      */
-    @TableField(value = "isvalid")
     private Integer isvalid;
     /**
      * 创建者Id;第一次创建时与Creator值相同，修改时与修改人值相同
      */
-    @TableField(value = "creatorid")
     private Integer creatorId;
     /**
      * 修改者Id;第一次创建时与Creator值相同，修改时与修改人值相同
      */
-    @TableField(value = "updaterid")
     private Integer updaterId;
     /**
      * 创建时间,默认第一次创建的getdate()时间
      */
-    @TableField(value = "createtime")
     private Date createTime;
     /**
      * 修改时间;第一次创建时与CreatTime值相同，修改时与修改时间相同
      */
-    @TableField(value = "updatetime")
     private Date updateTime;
 
     public FundAliasVO toVo() {

service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -15,7 +15,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <update id="saveFundAlias" parameterType="com.simuwang.base.pojo.dos.FundAliasDO">
-        update PPW_EMAIL.fund_alias set target_fund_id=#{targetFundId},target_fund_name=#{targetFundName},target_register_number=#{targetRegisterNumber},updatetime=#{updateTime}
+        update PPW_EMAIL.fund_alias set target_fund_id=#{targetFundId},updatetime=#{updateTime}
         where isvalid =1 and id=#{id}
     </update>
     <update id="batchDelete">
@@ -26,68 +26,107 @@
     </update>
 
     <select id="queryFundByNameAndRegisterNumber" resultMap="BaseResultMap">
-        select target_fund_id, target_fund_name, target_register_number
-        from PPW_EMAIL.fund_alias
-        where isvalid = 1
-          and source_fund_name = #{fundName}
-          and source_register_number = #{registerNumber}
+        select alias.target_fund_id,
+               info.fund_name as target_fund_name,
+               info.register_number as target_register_number
+        from PPW_EMAIL.fund_alias alias
+                 left join PPW_EMAIL.pvn_fund_info info
+                           on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid = 1
+          and alias.source_fund_name = #{fundName}
+          and alias.source_register_number = #{registerNumber}
     </select>
 
     <select id="queryFundByName" resultMap="BaseResultMap">
-        select target_fund_id, target_fund_name, target_register_number
-        from PPW_EMAIL.fund_alias
-        where isvalid = 1
-          and source_fund_name = #{fundName}
+        select alias.target_fund_id,
+               info.fund_name as target_fund_name,
+               info.register_number as target_register_number
+        from PPW_EMAIL.fund_alias alias
+                 left join PPW_EMAIL.pvn_fund_info info
+                           on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid = 1
+          and alias.source_fund_name = #{fundName}
     </select>
 
     <select id="queryFundByRegisterNumber" resultMap="BaseResultMap">
-        select target_fund_id, target_fund_name, target_register_number
-        from PPW_EMAIL.fund_alias
-        where isvalid = 1
-          and source_register_number = #{registerNumber}
+        select alias.target_fund_id,
+               info.fund_name as target_fund_name,
+               info.register_number as target_register_number
+        from PPW_EMAIL.fund_alias alias
+                 left join PPW_EMAIL.pvn_fund_info info
+                           on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid = 1
+          and alias.source_register_number = #{registerNumber}
     </select>
 
     <select id="searchFundAlias" resultMap="BaseResultMap"
             parameterType="com.simuwang.base.pojo.dto.query.FundAliasPageQuery">
-        select id,source_fund_name,source_register_number,target_fund_id,target_fund_name,target_register_number,isvalid,
-        creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.fund_alias where isvalid=1
+        select alias.id,
+        alias.source_fund_name,
+        alias.source_register_number,
+        alias.target_fund_id,
+        info.fund_name as target_fund_name,
+        info.register_number as target_register_number,
+        alias.isvalid,
+        alias.creatorid,
+        alias.createtime,
+        alias.updatetime,
+        alias.updaterid
+        from PPW_EMAIL.fund_alias alias
+        left join PPW_EMAIL.pvn_fund_info info
+        on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and (source_fund_name like concat('%',#{fundName},'%') or source_register_number like concat('%',#{fundName},'%') )
+            and (alias.source_fund_name like concat('%',#{fundName},'%') or alias.source_register_number like concat('%',#{fundName},'%') )
         </if>
         <if test="fundAliasName != null and fundAliasName !=''">
-            and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
+            and (info.fund_name like concat('%',#{fundAliasName},'%')  or info.fund_short_name like concat('%',#{fundAliasName},'%')  or info.register_number like concat('%',#{fundAliasName},'%') )
         </if>
         <if test="isMapping != null and isMapping == 0">
-            and target_fund_id is null
+            and alias.target_fund_id is null
         </if>
         <if test="isMapping != null and isMapping == 1">
-            and target_fund_id is not null
+            and alias.target_fund_id is not null
         </if>
-        order by updatetime desc
+        order by alias.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countFundAlias" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.FundAliasPageQuery">
-        select count(1) from PPW_EMAIL.fund_alias where isvalid=1
+        select count(1) from PPW_EMAIL.fund_alias alias
+        left join PPW_EMAIL.pvn_fund_info info
+        on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and (source_fund_name like concat('%',#{fundName},'%') or source_register_number like concat('%',#{fundName},'%') )
+            and (alias.source_fund_name like concat('%',#{fundName},'%') or alias.source_register_number like concat('%',#{fundName},'%') )
         </if>
         <if test="fundAliasName != null and fundAliasName !=''">
-            and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
+            and (info.fund_name like concat('%',#{fundAliasName},'%')  or info.fund_short_name like concat('%',#{fundAliasName},'%')  or info.register_number like concat('%',#{fundAliasName},'%') )
         </if>
         <if test="isMapping != null and isMapping == 0">
-            and target_fund_id is null
+            and alias.target_fund_id is null
         </if>
         <if test="isMapping != null and isMapping == 1">
-            and target_fund_id is not null
+            and alias.target_fund_id is not null
         </if>
     </select>
     <select id="searchFundAliasById" resultType="com.simuwang.base.pojo.dos.FundAliasDO"
             parameterType="java.lang.Integer">
-        select id,source_fund_name,source_register_number,target_fund_id,target_fund_name,target_register_number,isvalid,
-               creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.fund_alias where isvalid=1 and id=#{id}
+        select alias.id,
+               alias.source_fund_name,
+               alias.source_register_number,
+               alias.target_fund_id,
+               info.fund_name as target_fund_name,
+               info.register_number as target_register_number,
+               alias.isvalid,
+               alias.creatorid,
+               alias.createtime,
+               alias.updatetime,
+               alias.updaterid
+        from PPW_EMAIL.fund_alias alias
+                 left join PPW_EMAIL.pvn_fund_info info
+                           on alias.target_fund_id = info.fund_id and info.isvalid=1
+        where alias.isvalid=1 and alias.id=#{id}
     </select>
 
     <insert id="insert">