Merge branch 'dev20230707'

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -43,7 +43,7 @@ export default {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
     min-height: calc(100vh - 68px);
-	min-width:1440px;
+	min-width:1240px;
     background: #F5F5F5;
     overflow: initial;
   }

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -292,6 +292,8 @@ export default {
                         this.childListTotal = res.data.total;
                     }
                 })
+            }else{
+                this.getCompany()
             }
 
         },

dsk-operate-ui/src/views/macro/nationalEconomies/component/jzqyfx.vue

@@ -225,10 +225,7 @@
       }
     },
     created() {
-      setTimeout(() => {
-        this.isSkeleton=false;
-        this.getData()
-      }, 1000);
+      this.getAreaGroupByProvince()
       var date = new Date()
       var year = date.getFullYear()
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1
@@ -274,9 +271,13 @@
             total=total+this.jzglData[i].count
           }
           this.total=total;
-
+          this.$nextTick(() => {
             this.initChart()
           })
+
+        })
+      },
+      getCertGroupByMajorProvinceLevel(){
         certGroupByMajorProvinceLevel().then(res => {
           this.dqData=res.data;
           let data=this.dqData[0].province;
@@ -305,9 +306,15 @@
             list.push(item)
           }
           this.jzdqData=list
+          this.$nextTick(() => {
             this.initChart1()
           })
+
+        })
+      },
+      getAreaGroupByProvince(){
         areaGroupByProvince().then(res => {
+          this.isSkeleton=false;
           this.zbData=res.data;
           //定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
           // let dataArr = JSON.parse(JSON.stringify(res.data))
@@ -321,10 +328,15 @@
           this.rankList=data;
           //将原数组数据赋值回去  保持数据不变
           // this.zbData = JSON.parse(JSON.stringify(dataArr))
+          this.$nextTick(() => {
             this.initChart2()
           })
+          this.getData()
+          this.getCertGroupByMajorProvinceLevel()
+        })
       },
       initChart() {
+        this.$nextTick(() => {
           let myChart = echarts.init(document.getElementById("gl-echarts"))
           let option ={
             tooltip: {
@@ -382,8 +394,10 @@
           window.addEventListener("resize", function () {
             myChart.resize();//图表跟随页面大小变化宽度
           });
+        })
       },
       initChart1() {
+        this.$nextTick(() => {
           let myChart = echarts.init(document.getElementById("jzqy-echarts"))
           let option ={
             legend: {
@@ -549,8 +563,11 @@
           window.addEventListener("resize", function () {
             myChart.resize();//图表跟随页面大小变化宽度
           });
+        })
+
       },
       initChart2() {
+        this.$nextTick(() => {
           let myChart = echarts.init(document.getElementById("ba-echarts"))
           let option ={
             tooltip: {
@@ -615,6 +632,7 @@
           window.addEventListener("resize", function () {
             myChart.resize();//图表跟随页面大小变化宽度
           });
+        })
       },
       handleClick(type,index){
         if(type === 1){

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>