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/EnterpriseBussinessSupplierProjectPageBody.java

@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
      * 供应商企业
      */
     @NotNull(message = "企业不能为空")
-    private Integer companyName;
+    private String companyName;
 
     /**
      * 查询关键字

dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessSearchDto.java

 package com.dsk.system.domain.business.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class BusinessSearchDto implements Serializable {
+public class BusinessSearchDto extends BaseEntity implements Serializable {
     /**
      * 用户id
      */
@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
      */
     private Integer status;
 
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
     public BusinessSearchDto(Long userId) {
         this.userId = userId;
     }

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

 package com.dsk.system.domain.customer.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class CustomerSearchDto implements Serializable {
+public class CustomerSearchDto extends BaseEntity implements Serializable {
     /**
      * 企业id
      */
@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
      * 信资等级
      */
     private List<String> creditLevels;
-
-
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
 }

dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml

@@ -71,11 +71,11 @@
         left join sys_dept d on u.dept_id = d.dept_id
         <where>
             <if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if>
-            <if test="startTime != null and startTime != '' "> and f.creat_time &gt;= #{startTime} </if>
-            <if test="endTime != null and endTime != '' "> and f.creat_time &lt;= #{endTime} </if>
+            <if test="startTime != null and startTime != '' "> and f.visit_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and f.visit_time &lt;= #{endTime} </if>
             ${params.dataScope}
         </where>
-        ORDER BY f.creat_time DESC
+        ORDER BY f.visit_time DESC
     </select>
     <select id="selectRelateProject" resultType="com.dsk.system.domain.business.vo.BusinessListVo">
         select i.id,i.project_name as projectName

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -314,10 +314,9 @@
     </delete>
 
     <delete id="deleteBusinessInfoByIds" parameterType="Long">
-        delete i,b,co,f,l,r,u
+        delete i,b,f,l,r,u
         from business_info i
         left join business_backlog b on b.business_id = i.id
-        left join business_contacts co on co.business_id = i.id
         left join business_follow_record f on f.business_id = i.id
         left join business_label l on l.business_id = i.id
         left join business_relate_company r on r.business_id = i.id

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

@@ -23,7 +23,7 @@
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
         </where>
-        order by cfr.create_time desc
+        order by cfr.visit_time desc
     </select>
 
 </mapper>