1.控制台 报价次数 大订单添加 维护人 业务人员 业务人员工号

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

@@ -68,6 +68,9 @@ public class QuotationDetailsExcel {
     @ExcelProperty(value = "维护人",index = 19)
     private String leaderName;
 
+    @ExcelProperty(value = "大订单号",index = 20)
+    private String bigOrderno;
+
     @ExcelIgnore
     private String auditstatus;
 

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

@@ -526,6 +526,16 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDays(), taskStatisticsVo.getBeginDate(), taskStatisticsVo.getEndDate());
         taskStatisticsVo.setBeginDate(dateMapByType.get("startDate"));
         taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
+
+        if(StringUtils.isNotEmpty(taskStatisticsVo.getTaskType()) && "1".equals(taskStatisticsVo.getTaskType())){
+            taskStatisticsVo.setBeginDate(null);
+            taskStatisticsVo.setEndDate(null);
+            taskStatisticsVo.setSigningTimeStart(dateMapByType.get("startDate"));
+            taskStatisticsVo.setSigningTimeEnd(dateMapByType.get("endDate"));
+        }else {
+            taskStatisticsVo.setBeginDate(dateMapByType.get("startDate"));
+            taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
+        }
         IPage<TaskStatisticsDto> list = this.insAreaCompanyMapper.queryPageElectric(page,taskStatisticsVo);
         if (list != null && !list.getRecords().isEmpty()) {
             List<TaskStatisticsDto> records = list.getRecords();

src/main/java/com/ydtech/modules/console/dto/BigOrderUploadDto.java

@@ -61,4 +61,16 @@ public class BigOrderUploadDto implements Serializable {
     @ApiModelProperty(value = "承保公司")
     @ExcelProperty(value = "承保公司",index = 9)
     private  String  companyName;
+
+    @ApiModelProperty(value = "业务员名称")
+    @ExcelProperty(value = "业务员名称",index = 10)
+    private  String  userName;
+
+    @ApiModelProperty(value = "业务员工号")
+    @ExcelProperty(value = "业务员工号",index = 11)
+    private  String  userId;
+
+    @ApiModelProperty(value = "维护人")
+    @ExcelProperty(value = "维护人",index = 12)
+    private  String  leaderName;
 }

src/main/resources/mapper/modules/console/UpLoadOrderMapper.xml

@@ -16,10 +16,14 @@
         REPLACE ( JSON_EXTRACT( io.carinfo, '$.modelcname' ), '"', '' ) AS "modelName",
         ifnull( iac.id, '' ) AS subOrderNo,
         ifnull( iac.orderstatus, '' ) AS subOrderStatus,
-        ifnull( eic.NAME, '' ) AS companyName
+        ifnull( eic.NAME, '' ) AS companyName,
+        io.userid  AS "userId",
+        su.NAME  AS "userName",
+        iac.leader_name  AS "leaderName"
         FROM
         ins_orders io
         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
+        left join sys_user su  on su.id =io.userid
         LEFT JOIN esm_ins_company eic ON iac.company_id = eic.id
         <where>
             ( iac.del_flag = '1' OR io.del_flag IS NULL OR io.del_flag = 1 )

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

@@ -942,6 +942,7 @@
     <select id="quotationDetailsExcel" resultType="com.ydtech.modules.admin.model.dto.QuotationDetailsExcel">
         select
             iac.id as "orderno",
+            io.orderno as "bigOrderno",
             iac.agreement_id as "agreementId",
             iot.order_status as "orderstatus",
             iac.company_id as "companyId",
@@ -1286,6 +1287,11 @@
             <if test="taskStatisticsVo.provinceId != null and taskStatisticsVo.provinceId != ''">
                 and io.deptid like "${taskStatisticsVo.provinceId}%"
             </if>
+
+            <if test="taskStatisticsVo.signingTimeStart !=null and taskStatisticsVo.signingTimeStart != '' and taskStatisticsVo.signingTimeEnd !=null and taskStatisticsVo.signingTimeEnd != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.signingTimeStart}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.signingTimeEnd}, '%Y-%m-%d')
+            </if>
+
             <if test="taskStatisticsVo.cityId != null and taskStatisticsVo.cityId != ''">
                 and io.deptid like "${taskStatisticsVo.cityId}%"
             </if>
@@ -1381,6 +1387,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="taskStatisticsVo.signingTimeStart !=null and taskStatisticsVo.signingTimeStart != '' and taskStatisticsVo.signingTimeEnd !=null and taskStatisticsVo.signingTimeEnd != ''">
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.signingTimeStart}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.signingTimeEnd}, '%Y-%m-%d')
+            </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
@@ -1863,7 +1872,7 @@
             1=1
             and iac.id = ifa.ins_order_no
             AND iac.orderstatus = 3
-            AND ifa.audituser != '自动审核'
+            and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
             AND (ifa.auditstatus ='1' or ifa.auditstatus ='0')
             <if test="taskStatisticsVo.reviewer !=null  and  taskStatisticsVo.reviewer !=''">
                 and su.name =#{taskStatisticsVo.reviewer}