Browse Source

客户档案新增筛选与字段

anderx 1 year ago
parent
commit
eed74270bc

+ 15 - 3
src/main/java/com/goafanti/common/mapper/UserArchivesMapper.xml

@@ -243,11 +243,11 @@ interview_distribution = values(interview_distribution)
     </select>
 
     <select id="selectUserArchivesList" resultType="com.goafanti.customer.bo.OutSelectUserArchives">
-        select a.id , a.nickname ,d1.name as  province ,d2.name as  city ,d3.name area ,
+        select a.id , a.nickname ,d1.name as  province ,d2.name as  city ,d3.name area ,a.sign_bills signBills,
         a.share_type as shareType ,d.channel_type as channelType ,e.enterprise_count as enterpriseCount,
         c.name contactName,f.name adminName,e.channel_indicators as channelIndicators,
         e.interview_ideas as interviewIdeas ,b.intended_project as intendedProject,
-        e.interview_distribution as interviewDistribution, g.name depName,
+        e.interview_distribution as interviewDistribution, g.name depName,e.update_time updateTime,
         ic.name as  industry ,b.business_scope as businessScope ,e.financial_data as financialData,
         e.early_communication as earlyCommunication,e.patent_count as patentCount,
         e.invention_patent_count as inventionPatentCount,e.utility_model_count as utilityModelCount,
@@ -283,10 +283,13 @@ interview_distribution = values(interview_distribution)
                 <if test="shareType &lt; 4">
                     and a.share_type = #{shareType}
                 </if>
-                <if test="shareType = 4">
+                <if test="shareType == 4">
                     and a.share_type in (0,2)
                 </if>
             </if>
+            <if test="signBills !=null">
+                and a.sign_bills = #{signBills}
+            </if>
             <if test="businessScope !=null">
                 and find_in_set(#{businessScope},b.business_scope)
             </if>
@@ -296,6 +299,9 @@ interview_distribution = values(interview_distribution)
                 #{item}
             </foreach>
         </if>
+            <if test="startTime !=null and endTime !=null">
+                and e.update_time between #{startTime} and #{endTime}
+            </if>
         </where>
         <if test="page_sql != null">
             ${page_sql}
@@ -330,6 +336,9 @@ interview_distribution = values(interview_distribution)
                     and a.share_type in (0,2)
                 </if>
             </if>
+            <if test="signBills !=null">
+                and a.sign_bills = #{signBills}
+            </if>
             <if test="businessScope !=null">
                 and find_in_set(#{businessScope},b.business_scope)
             </if>
@@ -339,6 +348,9 @@ interview_distribution = values(interview_distribution)
                     #{item}
                 </foreach>
             </if>
+            <if test="startTime !=null and endTime !=null">
+                and e.update_time between #{startTime} and #{endTime}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -10,9 +10,36 @@ public class InputSelectUserArchives {
     private String  businessScope;
     private String  industry;
     private Integer shareType;
+    private Integer signBills;
+    private String  startTime;
+    private String  endTime;
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getSignBills() {
+        return signBills;
+    }
+
+    public void setSignBills(Integer signBills) {
+        this.signBills = signBills;
+    }
+
     public String getBusinessScope() {
         return businessScope;
     }

+ 28 - 4
src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java

@@ -1,7 +1,10 @@
 package com.goafanti.customer.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
+import java.util.Date;
+
 public class OutSelectUserArchives {
     private String id;
     @Excel(name = "客户名称")
@@ -12,12 +15,16 @@ public class OutSelectUserArchives {
     private String city;
     @Excel(name = "区",width = 8)
     private String area;
-    @Excel(name = "客户类型",readConverterExp = "0=私有客户,1=公共客户,2=签单客户,3=外联客户",width = 12)
+    @Excel(name = "客户类型",readConverterExp = "0=私有客户,1=公共客户,2=签单客户,3=外联客户",width = 8)
     private Integer shareType;
+    @Excel(name = "签单标识",readConverterExp = "0=否,1=是",width = 8)
+    private Integer signBills;
     @Excel(name = "主营产品")
     private String businessScope;
     private Integer channelType;
     private Integer enterpriseCount;
+    private String channelIndicators;
+    private String interviewDistribution;
     @Excel(name = "行业",width = 8)
     private String industry;
     @Excel(name = "联系人")
@@ -26,8 +33,6 @@ public class OutSelectUserArchives {
     private String adminName;
     @Excel(name = "意向合作项目")
     private String intendedProject;
-    private String channelIndicators;
-    private String interviewIdeas;
     @Excel(name = "专利数",width = 8)
     private Integer  patentCount;
     @Excel(name = "发明专利数",width = 8)
@@ -45,9 +50,28 @@ public class OutSelectUserArchives {
     @Excel(name = "前期沟通")
     private String earlyCommunication;
     @Excel(name = "面谈思路及目的")
-    private String interviewDistribution;
+    private String interviewIdeas;
+
     @Excel(name = "所属部门")
     private String depName;
+    @Excel(name = "修改时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    public Integer getSignBills() {
+        return signBills;
+    }
+
+    public void setSignBills(Integer signBills) {
+        this.signBills = signBills;
+    }
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
     public String getId() {
         return id;

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

@@ -266,6 +266,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             String[] split = in.getIndustry().split(",");
             params.put("industry", split);
         }
+        if (in.getSignBills()!=null)params.put("signBills", in.getSignBills());
+        if (in.getStartTime() != null&&in.getEndTime() != null){
+            params.put("startTime", in.getStartTime());
+            params.put("endTime", in.getEndTime()+" 23:59:59");
+        }
         return params;
     }