补充提交

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -249,7 +249,13 @@ public class SalesOrderController {
         return salesOrderService.salesKit(queryType,dateType,startDate,endDate);
     }
 
-
+    /**
+    * @Description: 首页 数据汇总
+    * @Param: [queryType, dateType, startDate, endDate]
+    * @return: com.management.platform.util.HttpRespMsg
+    * @Author: yurk
+    * @Date: 2024/5/16
+    */
     @RequestMapping("/dataSummary")
     public HttpRespMsg dataSummary(Integer queryType,Integer dateType,String startDate,String endDate){
         return salesOrderService.dataSummary(queryType,dateType,startDate,endDate);

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Custom.java

@@ -222,6 +222,14 @@ public class Custom extends Model<Custom> {
      */
     @TableField("is_delete")
     private Integer isDelete;
+
+    /**
+     * 是否成交 0-否 1-是
+     */
+    @TableField("close_deal")
+    private Integer closeDeal;
+
+
     @TableField(exist = false)
     private String ids;
     @TableField(exist = false)

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/BusinessOpportunityMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +30,6 @@ public interface BusinessOpportunityMapper extends BaseMapper<BusinessOpportunit
     BusinessOpportunity selectByIdToInfo(Integer id);
 
     void updateBatchById(List<Integer> ids);
+
+    Map<String, Object> getDataSummary(Integer companyId, String startDate, String endDate, String userId,@Param("list") List<String> targetUserIds);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/CustomMapper.java

@@ -3,8 +3,10 @@ package com.management.platform.mapper;
 import com.management.platform.entity.Clue;
 import com.management.platform.entity.Custom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +31,6 @@ public interface CustomMapper extends BaseMapper<Custom> {
     int getTotal2(Custom custom);
 
     Custom getInfo(Integer id);
+
+    Map<String, Object> getDataSummary(Integer companyId, String startDate, String endDate, String userId,@Param("list") List<String> targetUserIds);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessOpportunityServiceImpl.java

@@ -28,10 +28,7 @@ import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * <p>
@@ -364,6 +361,11 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
         bOMapper.update(bo, updateWrapper);
     }
 
+    @Override
+    public Map<String, Object> getDataSummary(Integer companyId, String startDate, String endDate, String userId, List<String> targetUserIds) {
+        return bOMapper.getDataSummary(companyId,startDate,endDate,userId,targetUserIds);
+    }
+
     private BusinessOpportunity setNull(BusinessOpportunity bo) {
         if (bo.getPlate1() == "") {
             bo.setPlate1(null);

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -385,6 +385,11 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         return msg;
     }
 
+    @Override
+    public Map<String, Object> getDataSummary(Integer companyId, String startDate, String endDate, String userId, List<String> targetUserIds) {
+        return customMapper.getDataSummary(companyId,startDate,endDate,userId,targetUserIds);
+    }
+
 
     private Custom setNull(Custom clue) {
         if (clue.getPlate1() == "") {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -644,8 +644,12 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         }
         Map<String, Object> customDataSummary = customService.getDataSummary(companyId, startDate, endDate, userId, targetUserIds);
         Map<String, Object> businessOpportunityDataSummary =businessOpportunityService.getDataSummary(companyId, startDate, endDate, userId, targetUserIds);
-        Map<String, Object> clueDataSummary =clueMapper.getDataSummary(companyId, startDate, endDate, userId, targetUserIds);
-        return null;
+//        Map<String, Object> clueDataSummary =clueMapper.getDataSummary(companyId, startDate, endDate, userId, targetUserIds);
+        Map<String,Object> resultMap=new HashMap<>();
+        resultMap.put("customDataSummary",customDataSummary);
+        resultMap.put("businessOpportunityDataSummary",businessOpportunityDataSummary);
+        msg.setData(resultMap);
+        return msg;
     }
 
 

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -255,7 +255,7 @@
         <if test="list!=null and list.size()>0">
             and incharger_id in
             <foreach collection="list" separator="," open="(" close=")" item="item">
-                item
+                #{item}
             </foreach>
         </if>
     </select>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -32,11 +32,15 @@
         <result column="creator_id" property="creatorId" />
         <result column="custom_desc" property="customDesc" />
         <result column="is_delete" property="isDelete" />
+        <result column="company_phone" property="companyPhone" />
+        <result column="incharger_id" property="inchargerId" />
+        <result column="address" property="address" />
+        <result column="close_deal" property="closeDeal" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, custom_name, custom_source_id, customer_industry_id, customer_level_id, email, owner_id, custom_code, tel_phone, fax, country_billing, province_billing, city_billing, street_billing, country_delivery, province_delivery, city_delivery, street_delivery, create_time, plate1, plate2, plate3, plate4, plate5, creator_id, custom_desc, is_delete
+        id, company_id, custom_name, custom_source_id, customer_industry_id, customer_level_id, email, owner_id, custom_code, tel_phone, fax, country_billing, province_billing, city_billing, street_billing, country_delivery, province_delivery, city_delivery, street_delivery, create_time, plate1, plate2, plate3, plate4, plate5, creator_id, custom_desc, is_delete, company_phone, incharger_id, address, close_deal
     </sql>
     <select id="getList" resultType="com.management.platform.entity.Custom">
         select id,
@@ -299,7 +303,7 @@
         <if test="list!=null and list.size()>0">
             and incharger_id in
             <foreach collection="list" separator="," open="(" close=")" item="item">
-                item
+                #{item}
             </foreach>
         </if>
     </select>