任务池数据添加

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -307,6 +307,14 @@ public class InsOrders implements Serializable {
     @TableField(exist = false)
     private Integer underwritingStatus;
 
+    @ApiModelProperty("领导人工号")
+    @TableField(exist = false)
+    private String leaderId;
+
+    @ApiModelProperty("领导人名称")
+    @TableField(exist = false)
+    private String leaderName;
+
 
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
@@ -155,6 +156,12 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "非车保单号")
     private String noPolicyNo;
 
+    @ApiModelProperty("领导人工号")
+    private Integer leaderId;
+
+    @ApiModelProperty("领导人名称")
+    private Integer leaderName;
+
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){
             return endDate;

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -50,8 +50,9 @@
         <result property="agreementName" column="agreementName" jdbcType="VARCHAR"/>
         <result property="partnerCompaniesName" column="partnerCompaniesName" jdbcType="VARCHAR"/>
         <result property="managementSource" column="managementSource" jdbcType="VARCHAR"/>
+        <result property="leaderName" column="leader_name" jdbcType="VARCHAR"/>
+        <result property="leaderId" column="leader_id" jdbcType="VARCHAR"/>
         <result property="underwritingStatus" column="underwritingStatus" jdbcType="INTEGER"/>
-
     </resultMap>
     <resultMap id="OrderResultMap" type="com.ydtech.modules.order.entity.vo.OrderVo">
         <id property="orderno" column="orderno" jdbcType="VARCHAR"/>
@@ -900,6 +901,8 @@
         company.namesimple as partnerCompaniesName,
         iac.api_type,
         io.is_external,
+        u.leader_name,
+        u.leader_id,
         CASE dept.management_source
         WHEN '1' THEN '渠道'
         WHEN '2' THEN '个代'
@@ -916,6 +919,8 @@
            esm_ins_company   company  on  agree.partner_companies_id= company.id
         LEFT JOIN
                 sys_dept dept ON dept.id = io.deptid
+        LEFT JOIN
+                sys_user u on io.userid = u.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0" >
                 AND (
@@ -1011,6 +1016,14 @@
             <if test="orderQueryVo.auditId != null and orderQueryVo.auditId != ''">
                 and IFNULL( iac.new_operator_id, '' ) = #{orderQueryVo.auditId}
             </if>
+
+            <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
+                and u.leader_id = #{leaderId}
+            </if>
+            <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
+                and u.leader_name = #{leaderName}
+            </if>
+
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
                 DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
@@ -1043,6 +1056,8 @@
         ins_orders io  on iac.orderno = io.orderno
         LEFT JOIN
         sys_dept dept ON dept.id = io.deptid
+        LEFT JOIN
+        sys_user u on io.userid = u.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0" >
                 AND (
@@ -1136,6 +1151,14 @@
             <if test="orderQueryVo.auditId != null and orderQueryVo.auditId != ''">
                 and IFNULL( iac.new_operator_id, '' ) = #{orderQueryVo.auditId}
             </if>
+
+            <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
+                and u.leader_id = #{leaderId}
+            </if>
+            <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
+                and u.leader_name = #{leaderName}
+            </if>
+
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
                 DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}