yangzian 3 роки тому
батько
коміт
8161810747

+ 14 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/controller/SaleClueInfoController.java

@@ -116,6 +116,20 @@ public class SaleClueInfoController extends BaseController {
 
 
 
+    @ApiOperation(value = "销售线索任务列表查询",notes = "销售线索任务列表查询")
+    @GetMapping(value = "/selectSaleClueTaskList")
+    public ResultResponse<List<SaleClueInfoPojo>> selectSaleClueTaskList(
+            @ApiParam("模糊查询") @RequestParam(value = "sellerName",required = false) String sellerName,
+            @ApiParam("状态 1-未开始 2-进行中 3-已结束") @RequestParam(value = "state",required = false)Integer state,
+            @ApiParam("当前用户id") @RequestParam(value = "userId") Long userId){
+
+        return saleClueInfoServiceImpl.selectSaleClueTaskList(sellerName,state, userId);
+
+    }
+
+
+
+
 
 
 }

+ 11 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/mapper/SaleClueInfoMapper.java

@@ -42,6 +42,17 @@ public interface SaleClueInfoMapper {
                                                   @Param(value = "state") String state,
                                                   @Param(value = "userId") Long userId);
 
+    /**
+     *  销售线索 任务 列表信息
+     * @param sellerName
+     * @param state
+     * @param saleId
+     * @return
+     */
+    List<SaleClueInfoPojo> selectSaleClueTaskList(@Param(value = "sellerName") String sellerName,
+                                                  @Param(value = "state") Integer state,
+                                                  @Param(value = "saleId") Long saleId);
+
 
     /**
      * 根据卖家ids 查询销售线索

+ 2 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/pojo/SaleClueInfoPojo.java

@@ -70,6 +70,8 @@ public class SaleClueInfoPojo {
 
     @ApiModelProperty("销售人员id")
     private Long saleId;
+    @ApiModelProperty("销售人员")
+    private String saleName;
 
     @ApiModelProperty("进行状态 1-未开始 2-进行中 3-已结束")
     private int state;

+ 2 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/service/ISaleClueInfoService.java

@@ -23,6 +23,8 @@ public interface ISaleClueInfoService {
 
     ResultResponse<List<SaleClueInfoPojo>> selectSaleClueInfoList(String sellerName, Long uploadDate, String distributionSaleFlag, String industryId, String fansType,String state, Long userId)throws Exception;
 
+    ResultResponse<List<SaleClueInfoPojo>> selectSaleClueTaskList(String sellerName,Integer state, Long userId);
+
     ResultResponse<List<SaleClueInfoPojo>> selectSaleClueInfoBySellers(List<Long> sellerIds);
 
     ResultResponse saleClueDistribution(List<String> sellerIds, Long saleId,Long createUserId);

+ 18 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/service/impl/SaleClueInfoServiceImpl.java

@@ -189,6 +189,24 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
     }
 
 
+    /**
+     *
+     * @description: 销售线索任务列表查询
+     *
+     * @param sellerName 模糊查询
+     * @param state 状态 1-未开始 2-进行中 3-已结束
+     * @param userId  当前用户id
+     * @return: com.ruixuan.common.core.domain.ResultResponse<java.util.List<com.ruixuan.salesLeads.pojo.SaleClueInfoPojo>>
+     * @author: zianY
+     */
+    @Override
+    public ResultResponse<List<SaleClueInfoPojo>> selectSaleClueTaskList(String sellerName,Integer state, Long userId) {
+        PageUtils.startPage();
+        List<SaleClueInfoPojo> saleList =  saleClueInfoMapper.selectSaleClueTaskList(sellerName,state, userId);
+        return ResultResponse.successMsg("查询成功。",saleList);
+    }
+
+
 
     /**
      *

+ 41 - 5
ruixuan-salesLeads/src/main/resources/mapper/salesLeads/SaleClueInfoMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 	</insert>
 
+
 	<!-- 销售线索列表信息 -->
 	<select id="selectSaleClueInfoList" resultType="com.ruixuan.salesLeads.pojo.SaleClueInfoPojo">
 		SELECT
@@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sale_clue_info s
 		<where>
 			<if test="sellerName !=null and sellerName != ''">
-				and s.seller_name like CONCAT('%', CONCAT(#{sellerName}, '%')) or s.seller_id like CONCAT('%', CONCAT(#{sellerName}, '%'))
+				and (s.seller_name like CONCAT('%', CONCAT(#{sellerName}, '%')) or s.seller_id like CONCAT('%', CONCAT(#{sellerName}, '%')))
 			</if>
 			<if test="uploadDate !=null and uploadDate != ''">
 				and s.upload_date = #{uploadDate}
@@ -106,14 +107,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="fansType == '4'.toString()">
 				and s.fans &gt;=5000000
 			</if>
-
 		</where>
 
+	</select>
 
 
-
-
-
+	<!-- 销售线索 任务 列表信息 -->
+	<select id="selectSaleClueTaskList" resultType="com.ruixuan.salesLeads.pojo.SaleClueInfoPojo">
+		SELECT
+			s.id,
+			s.sales_leads_type,
+			s.seller_id,
+			s.seller_name,
+			s.fans,
+			s.industry_id,
+			(SELECT name from sys_industry_info i where i.id = s.industry_id) industryName,
+			s.province_id,
+			(SELECT name from sys_area_info a WHERE a.`code` = s.province_id) provinceName,
+			s.city_id,
+			(SELECT name from sys_area_info a WHERE a.`code` = s.city_id) cityName,
+			s.telephone,
+			s.provider_flag,
+			s.transition_flag,
+			s.upload_date,
+			s.distribution_sale_flag,
+			s.sale_id,
+			(SELECT u.nick_name FROM sys_user u WHERE u.user_id = s.sale_id ) saleName,
+			s.state,
+			s.offline_sale_flag,
+			s.create_user_id,
+			s.create_time
+		FROM
+			sale_clue_info s
+		<where>
+			<if test="sellerName !=null and sellerName != ''">
+				and (s.seller_name like CONCAT('%', CONCAT(#{sellerName}, '%')) or s.seller_id like CONCAT('%', CONCAT(#{sellerName}, '%')))
+			</if>
+			<if test="state !=null and state != ''">
+				and s.state = #{state}
+			</if>
+			<if test="saleId !=null and saleId != ''">
+				and s.sale_id = #{saleId}
+			</if>
+		</where>
 
 	</select>