后台需求

lb-module/src/main/java/com/ydd/module/domain/Agent.java

@@ -177,4 +177,16 @@ private static final long serialVersionUID=1L;
      */
     @TableField(exist = false)
     private String packageCommissionName;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date endTime;
 }

lb-module/src/main/java/com/ydd/module/service/impl/AgentServiceImpl.java

@@ -163,6 +163,12 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
             }
             // lqw.like(Agent::getDistrictName ,agent.getDistrictName());
         }
+        if (agent.getStartTime() != null) {
+          lqw.ge(Agent::getCreateTime, agent.getStartTime());
+        }
+        if (agent.getEndTime() != null) {
+          lqw.le(Agent::getCreateTime, agent.getEndTime());
+        }
         lqw.orderByDesc(Agent::getCreateTime);
         List<Agent> list = this.list(lqw);
         List<AgentLevel> agentLevelList = iAgentLevelService.queryList(new AgentLevel(), user);

lb-module/src/main/java/com/ydd/module/service/impl/ProfitsActivityServiceImpl.java

@@ -15,6 +15,7 @@ import com.ydd.module.service.IAgentService;
 import com.ydd.module.service.IMerchantService;
 import com.ydd.module.service.IProfitsActivityService;
 import com.ydd.module.service.IShopService;
+import com.ydd.module.utils.CommonUtils;
 import lombok.SneakyThrows;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
@@ -125,6 +126,12 @@ public class ProfitsActivityServiceImpl extends ServiceImpl<ProfitsActivityMappe
         // 查询表中所有商户信息
         List<ProfitsActivity> activityList = baseMapper.selectAllMerchant(page, profitsActivity, agents);
         for (ProfitsActivity activity: activityList) {
+            // 脱敏手机号
+            if (activity.getMobile() != null) {
+              String encodeMobile = CommonUtils.hiddenMobile(activity.getMobile());
+              activity.setMobile(encodeMobile);
+            }
+
             ProfitsActivity newActivity = baseMapper.selectActivityInfo(profitsActivity, activity.getMerchantId());
             newActivity.setSignupTime(activity.getSignupTime());
             newActivity.setMerchantId(activity.getMerchantId());

web-ui/src/views/module/agent/index.vue

@@ -37,6 +37,17 @@
       </el-form-item>
       <el-form-item label="代理商地区">
           <OldSend :sendAreaProp="sendAreaProp" @changeArea="changeSendArea" ref="sendArea"/>
+      </el-form-item>、
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker 
+          v-model="date" 
+          type="datetimerange" 
+          start-placeholder="开始时间"
+          range-separator="至"
+          end-placeholder="结束时间"
+          :default-time="['00:00:00', '23:59:59']"
+          value-format="yyyy-MM-dd HH:mm:ss" 
+          format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
@@ -295,6 +306,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      date: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -310,7 +322,9 @@ export default {
         avatar: undefined,
         mobile: undefined,
         address: undefined,
-        remark: undefined
+        remark: undefined,
+        startTime: undefined,
+        endTime: undefined
       },
       // 表单参数
       form: {},
@@ -424,6 +438,14 @@ export default {
         this.$router.push({ path: '/agent/agent/info' })
       }
       this.loading = true;
+      if(null != this.date && "" != this.date) {
+        this.queryParams.startTime = this.date[0];
+        this.queryParams.endTime = this.date[1];
+      }else {
+        this.queryParams.startTime = "";
+        this.queryParams.endTime = "";
+      }
+
       listAgent(this.queryParams).then(response => {
         this.agentList = response.rows;
         this.total = response.total;
@@ -485,6 +507,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.date = []
+      this.queryParams.startTime = ""
+      this.queryParams.endTime = ""
       this.sendStartArea = {
         province: '',
         city: '',