Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigBidPageBody.java

@@ -18,11 +18,11 @@ public class IndexBigBidPageBody extends BasePage
     /**
      * 开始时间
      */
-    private Date timeStart = DateUtils.addDays(new Date(), -7);
+    private String timeStart = DateUtils.dateTime(DateUtils.addDays(new Date(), -6));
     /**
      * 截止时间
      */
-    private Date timeEnd = new Date();
+    private String timeEnd = DateUtils.getDate();
     /**
      * 金额起 默认2亿
      */

dsk-common/src/main/java/com/dsk/common/core/domain/model/IndexBigWinningBidsPageBody.java

@@ -17,11 +17,11 @@ public class IndexBigWinningBidsPageBody extends BasePage {
     /**
      * 开始时间
      */
-    private Date timeStart = DateUtils.addDays(new Date(), -7);
+    private String timeStart = DateUtils.dateTime(DateUtils.addDays(new Date(), -6));
     /**
      * 截止时间
      */
-    private Date timeEnd = new Date();
+    private String timeEnd = DateUtils.getDate();
     /**
      * 金额起 默认2亿
      */

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -9,7 +9,7 @@
         <div class="empty" v-if="total==0">
           <img src="@/assets/images/project/empty.png">
           <div class="p1">暂无数据展示</div>
-          <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
+          <div class="p2" v-if="isDisabled==false">抱歉，你还未添加相关数据，快去添加吧</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
         </div>
         <el-table class="fixed-table" v-else max-height="640"
@@ -36,7 +36,7 @@
             label="姓名"
             width="113">
             <template slot-scope="scope">
-              <div class="wordprimary"><span @click="getDetail(scope.row)">{{scope.row.name || '--'}} </span><img v-if="isDisabled == false" @click="deltip(scope.row.id)" src="@/assets/images/delete.png"></div>
+              <div :class="isDisabled==false?'wordprimary':''"><span @click="getDetail(scope.row)">{{scope.row.name || '--'}} </span><img v-if="isDisabled == false" @click="deltip(scope.row.id)" src="@/assets/images/delete.png"></div>
             </template>
           </el-table-column>
           <!--<el-table-column-->

dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerFollowRecordSearchDto.java

@@ -4,7 +4,6 @@ import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Map;
 
 /**
  * 客户跟进记录筛选对象
@@ -23,4 +22,12 @@ public class CustomerFollowRecordSearchDto extends BaseEntity implements Seriali
      * 用户id
      */
     private Long userId;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

dsk-system/src/main/java/com/dsk/system/mapper/CustomerFollowRecordMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface CustomerFollowRecordMapper extends BaseMapper<CustomerFollowRecord> {
 
-    List<CustomerFollowRecordListVo> selectAuthList(@Param("dto") CustomerFollowRecordSearchDto dto);
+    List<CustomerFollowRecordListVo> selectAuthList(CustomerFollowRecordSearchDto dto);
 
 }
 

dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml

@@ -16,10 +16,12 @@
         join sys_user u on u.user_id = cfr.user_id
         left join sys_dept d on d.dept_id = u.dept_id
         <where>
-            <if test="dto.userId != null "> and cfr.user_id = #{dto.userId} </if>
-            <if test="dto.customerId != null and dto.customerId != '' "> and cfr.customer_id = #{dto.customerId} </if>
+            <if test="userId != null "> and cfr.user_id = #{userId} </if>
+            <if test="customerId != null and customerId != '' "> and cfr.customer_id = #{customerId} </if>
+            <if test="startTime != null and startTime != '' "> and cfr.visit_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and cfr.visit_time &lt;= #{endTime} </if>
             <!-- 数据范围过滤 -->
-            <if test="dto.params.dataScope != null and dto.params.dataScope != '' "> ${dto.params.dataScope} </if>
+            <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
         </where>
         order by cfr.create_time desc
     </select>