1.控制台任务统计导出添加保险公司合作公司

src/main/java/com/ydtech/modules/admin/model/dto/OrdersDetailsExcel.java

@@ -30,7 +30,13 @@ public class OrdersDetailsExcel {
     @ExcelProperty(value = "是否app报价",index = 7)
     private String orderSource;
 
-    @ExcelProperty(value = "是否代课录单",index = 8)
+    @ExcelProperty(value = "录入状态 1 车险录入 2 待客录单 3 外部订单",index = 8)
     private String entryStatus;
 
+    @ExcelProperty(value = "合作公司名称",index = 9)
+    private String partnerCompaniesName;
+
+    @ExcelProperty(value = "保险公司名称",index = 10)
+    private String inscompany;
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -210,6 +211,16 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
 
     private void saveTranslate(List<OrdersDetailsExcel> list) {
         for (OrdersDetailsExcel ordersDetailsExcel : list) {
+            if(StringUtils.isNotEmpty(ordersDetailsExcel.getOrderSource())){
+                if("1".equals(ordersDetailsExcel.getOrderSource())  && "0".equals(ordersDetailsExcel.getOrderstatus())  ){
+                    ordersDetailsExcel.setOrderSource("app报价");
+                }
+                if("0".equals(ordersDetailsExcel.getOrderSource())  && "0".equals(ordersDetailsExcel.getOrderstatus())){
+                    ordersDetailsExcel.setOrderSource("pc报价");
+                }
+
+            }
+
             if (StringUtils.isNotEmpty(ordersDetailsExcel.getOrderstatus())) {
                 if ("0".equals(ordersDetailsExcel.getOrderstatus())) {
                     ordersDetailsExcel.setOrderstatus("报价中");
@@ -227,22 +238,18 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                     ordersDetailsExcel.setOrderstatus("核保退回");
                 }
 
-            }
-            if(StringUtils.isNotEmpty(ordersDetailsExcel.getOrderSource())){
-                if("1".equals(ordersDetailsExcel.getOrderSource())  && "0".equals(ordersDetailsExcel.getOrderstatus())  ){
-                    ordersDetailsExcel.setOrderSource("app报价");
-                }
-                if("0".equals(ordersDetailsExcel.getOrderSource())  && "0".equals(ordersDetailsExcel.getOrderstatus())  ){
-                    ordersDetailsExcel.setOrderSource("pc报价");
-                }
-
             }
             if(StringUtils.isNotEmpty(ordersDetailsExcel.getEntryStatus())){
+                if("1".equals(ordersDetailsExcel.getEntryStatus())){
+                    ordersDetailsExcel.setEntryStatus("车险录入");
+                }
                 if("2".equals(ordersDetailsExcel.getEntryStatus())){
-                    ordersDetailsExcel.setEntryStatus("是");
-                }else {
-                    ordersDetailsExcel.setEntryStatus("否");
+                    ordersDetailsExcel.setEntryStatus("待客录单");
                 }
+                if("3".equals(ordersDetailsExcel.getEntryStatus())){
+                    ordersDetailsExcel.setEntryStatus("外部订单");
+                }
+
             }
         }
     }

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -626,14 +626,18 @@
             io.orderno as "orderno",
             iot.order_status as "orderStatus",
             io.order_source  as "orderSource",
-            iac.entry_status  as "orderSource"
+            iac.entry_status  as "entryStatus",
+            ins.namesimple as "partnerCompaniesName",
+            agree.insurance_company as "inscompany"
         from (select iot.suborder, iot.order_status  from `ins_orders_track` iot GROUP BY iot.suborder, iot.order_status) iot
                  left join ins_area_company iac ON iac.id = iot.suborder
+                 LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id
                  LEFT JOIN ins_orders io ON io.orderno = iac.orderno
                  LEFT JOIN sys_dept sd ON sd.id = io.deptid
                  LEFT JOIN sys_user  su on  su.id =io.userid
+                 LEFT JOIN esm_ins_company ins ON agree.partner_companies_id = ins.id
         <where>
-              ( io.del_flag is null   or   io.del_flag ='1')
+             (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
             <if test="taskStatisticsVo.provinceId != null and taskStatisticsVo.provinceId != ''">
                 and io.deptid like "${taskStatisticsVo.provinceId}%"
             </if>

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

@@ -967,7 +967,7 @@
             LEFT JOIN esm_ins_company ins ON agree.partner_companies_id = ins.id
         <where>
             agree.id IS NOT NULL
-            and  ( io.del_flag is null   or   io.del_flag ='1')
+            and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
             <if test="vo.companyId  != null  and  vo.companyId!='' ">
                 AND agree.insurance_company_id = #{vo.companyId}
             </if>
@@ -1160,6 +1160,7 @@
         LEFT JOIN sys_dept sd ON sd.id = io.deptid
         <where>
             sd.management_source = '1'
+            and  (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
             <if test="taskStatisticsVo.provinceId != null and taskStatisticsVo.provinceId != ''">
                 and io.deptid like "${taskStatisticsVo.provinceId}%"
             </if>