Browse Source

客户档案列表修改

anderx 1 year ago
parent
commit
7b1573e898

+ 20 - 1
src/main/java/com/goafanti/common/mapper/UserArchivesMapper.xml

@@ -280,8 +280,17 @@ interview_distribution = values(interview_distribution)
             </foreach>
             </if>
             <if test="shareType !=null">
-            and a.share_type = #{shareType}
+                and a.share_type = #{shareType}
+            </if>
+            <if test="businessScope !=null">
+                and find_in_set(#{businessScope},b.business_scope)
             </if>
+        <if test="industry !=null">
+            and b.industry in
+            <foreach collection="industry" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         </where>
         order by a.transfer_time desc
         <if test="page_sql != null">
@@ -291,6 +300,7 @@ interview_distribution = values(interview_distribution)
     <select id="selectUserArchivesCount" resultType="java.lang.Integer">
         select count(*)
         from user a
+        left join organization_identity b on a.id =b.uid
         left join user_mid d on a.id =d.uid
         <where>
             <if test="newChannel !=null">
@@ -311,6 +321,15 @@ interview_distribution = values(interview_distribution)
             <if test="shareType !=null">
                 and a.share_type = #{shareType}
             </if>
+            <if test="businessScope !=null">
+                and find_in_set(#{businessScope},b.business_scope)
+            </if>
+            <if test="industry !=null">
+                and b.industry in
+                <foreach collection="industry" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>

+ 18 - 0
src/main/java/com/goafanti/customer/bo/InputSelectUserArchives.java

@@ -7,10 +7,28 @@ public class InputSelectUserArchives {
     private String aid;
 
     private String  channelType;
+    private String  businessScope;
+    private String  industry;
     private Integer shareType;
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getBusinessScope() {
+        return businessScope;
+    }
+
+    public void setBusinessScope(String businessScope) {
+        this.businessScope = businessScope;
+    }
+
+    public String getIndustry() {
+        return industry;
+    }
+
+    public void setIndustry(String industry) {
+        this.industry = industry;
+    }
+
     public Integer getNewChannel() {
         return newChannel;
     }

+ 5 - 0
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -222,6 +222,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         }
         if (in.getName() != null)params.put("name", in.getName());
         if (in.getAid() != null)params.put("aid", in.getAid());
+        if (in.getBusinessScope() != null)params.put("businessScope", in.getBusinessScope());
+        if (in.getIndustry() != null){
+            String[] split = in.getIndustry().split(",");
+            params.put("industry", split);
+        }
         return findPage("selectUserArchivesList",
                 "selectUserArchivesCount", params, in.getPageNo(), in.getPageSize());
     }

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.23
+static.host=//static.jishutao.com/1.3.24
 #static.host=//172.16.1.187/1.3.19
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.23
+static.host=//static.jishutao.com/1.3.24
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false