Browse Source

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 year ago
parent
commit
ccd648d12c

+ 31 - 0
src/main/java/com/goafanti/RD/bo/InputRdList.java

@@ -4,11 +4,42 @@ public class InputRdList {
     private String rdStart;
     private String rdEnd;
     private String rdName;
+    private String endTime;
+    private String startTime;
+    /**
+     * 公司名称
+     */
+    private String userName;
     private String rdNo;
     private String consultantName;
     private Integer pageSize;
     private Integer pageNo;
 
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     public String getConsultantName() {
         return consultantName;
     }

+ 13 - 2
src/main/java/com/goafanti/RD/bo/OutExcelRdDetails.java

@@ -1,10 +1,8 @@
 package com.goafanti.RD.bo;
 
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.excel.Excel;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 public class OutExcelRdDetails extends InputRdDetails{
 
@@ -97,6 +95,19 @@ public class OutExcelRdDetails extends InputRdDetails{
     @Excel(name="咨询师名称")
     private String consultantName;
 
+    /**
+     * 上传时间
+     */
+    @Excel(name="上传时间")
+    private String createTimeStr;
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
 
     @Override
     public String getRdStartStr() {

+ 5 - 1
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -82,8 +82,12 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
         param.put("RdEnd", in.getRdEnd());
         param.put("RdName", in.getRdName());
         param.put("consultantName", in.getConsultantName());
+        param.put("userName", in.getUserName());
+        if (in.getStartTime()!=null&&in.getEndTime()!=null){
+            param.put("startTime",in.getStartTime());
+            param.put("endTime",in.getEndTime()+" 23:59:59");
+        }
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.CED)){
-
         }else {
             param.put("aid", TokenManager.getAdminId());
         }

+ 12 - 0
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -316,6 +316,12 @@
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>
+    <if test="userName !=null">
+      and a.user_name like concat('%',#{userName},'%')
+    </if>
+    <if test="startTime !=null and endTime !=null">
+      and a.create_time between #{startTime} and #{endTime}
+    </if>
     <if test="page_sql !=null ">
         ${page_sql}
     </if>
@@ -340,6 +346,12 @@
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>
+    <if test="userName !=null">
+      and a.user_name like concat('%',#{userName},'%')
+    </if>
+    <if test="startTime !=null and endTime !=null">
+      and a.create_time between #{startTime} and #{endTime}
+    </if>
   </select>
 
     <insert id="insertBatch">

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

@@ -59,7 +59,7 @@ amb.maxLvl=6
 #avatar.host=//172.16.1.199:3000
 #static.host=//172.16.0.255:3000/1.2.62
 avatar.host=//static.jishutao.com
-rd.static.host=//static.jishutao.com/RD/1.0.03
+rd.static.host=//static.jishutao.com/RD/1.0.04
 
 #\u5FAE\u4FE1\u6253\u5361\u5C0F\u7A0B\u5E8F
 wx.appId=wxff2f5720ed7d7f63

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

@@ -54,7 +54,7 @@ amb.maxLvl=6
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 
-rd.static.host=//static.jishutao.com/RD/1.0.03
+rd.static.host=//static.jishutao.com/RD/1.0.04
 avatar.upload.host=//static.jishutao.com/upload
 
 wx.appId=wxff2f5720ed7d7f63