1.大订单导出添加检索条件

2.大订单维护人使用用户表的维护人

src/main/java/com/ydtech/modules/admin/controller/CompanyDataReportConroller.java

@@ -126,7 +126,8 @@ public class CompanyDataReportConroller {
     @PostMapping("/largeOrdersExcel")
     @ApiOperation(value = "大订单导出")
     public HttpResult largeOrdersExcel(@RequestBody OrdersDataVo ordersDataVo) {
-        String userId = BaseController.getUserId();
-        return this.companyDataReportService.largeOrdersExcel(ordersDataVo,userId);
+        String userId = ordersDataVo.getUserId();
+        String userLoginId = BaseController.getUserId();
+        return this.companyDataReportService.largeOrdersExcel(ordersDataVo,userId,userLoginId);
     }
 }

src/main/java/com/ydtech/modules/admin/service/CompanyDataReportService.java

@@ -49,7 +49,7 @@ public interface CompanyDataReportService {
      * @author: whp
      * @date: 2024/9/13
      **/
-    HttpResult largeOrdersExcel(OrdersDataVo ordersDataVo,String userId);
+    HttpResult largeOrdersExcel(OrdersDataVo ordersDataVo,String userId,String userLoginId);
 
     /**
      * @description:   控制台-小定单报价明细

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

@@ -253,7 +253,7 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
      **/
     @Override
     @Async
-    public HttpResult largeOrdersExcel(OrdersDataVo ordersDataVo,String userId) {
+    public HttpResult largeOrdersExcel(OrdersDataVo ordersDataVo,String userId,String userLoginId) {
 
         //判断开始时间和结束时间是否为空,如果为空的走时间类型逻辑
         HashMap<String, String> dateMapByType = getDateMapByType(ordersDataVo.getDateType(), ordersDataVo.getBeginDate(), ordersDataVo.getEndDate());
@@ -279,6 +279,9 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
 //                }
 //            }
         dateMapByType.put("userId", userId);
+        dateMapByType.put("userName", ordersDataVo.getUserName());
+        dateMapByType.put("mobile", ordersDataVo.getMobile());
+        dateMapByType.put("userLoginId",userLoginId);
 
         this.insExcelTaskAsyncService.importasync(resultSubOrder,dateMapByType, ordersDataVo.getBeginDate(), ordersDataVo.getEndDate());
 //        String uploadPath = this.uploadPath + "/excel/";

src/main/java/com/ydtech/modules/console/vo/BigOrderUploadVo.java

@@ -27,4 +27,22 @@ public class BigOrderUploadVo implements Serializable {
     private  String   userId;
 
 
+    @ApiModelProperty("车型")
+    private String modelcname;
+
+
+    @ApiModelProperty("业务员名称")
+    private String userName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+
+    @ApiModelProperty("车架号")
+    private String frameno;
+
+
+    @ApiModelProperty("车牌号")
+    private String licenseno;
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsExcelTaskAsyncServiceImpl.java

@@ -66,7 +66,7 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         insExcelTaskEntity.setId(taskId);
         insExcelTaskEntity.setStatus("ready");
-        insExcelTaskEntity.setUserId(dateMapByType.get("userId"));
+        insExcelTaskEntity.setUserId(dateMapByType.get("userLoginId"));
         insExcelTaskEntity.setCreateTime(LocalDateTime.now());
         insExcelTaskEntity.setCreatedAt(LocalDateTime.now());
         insExcelTaskEntity.setType("1");
@@ -78,6 +78,9 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
             OrdersDataDto ordersDataDto = new OrdersDataDto();
             ordersDataDto.setBeginDate(dateMapByType.get("startDate"));
             ordersDataDto.setEndDate(dateMapByType.get("endDate"));
+            ordersDataDto.setUserId(dateMapByType.get("userId"));
+            ordersDataDto.setUserName(dateMapByType.get("userName"));
+            ordersDataDto.setMobile(dateMapByType.get("mobile"));
             for (OrdersDataExcel record : resultSubOrder) {
                 String licenseno = record.getLicenseno();  //车牌号
                 String frameno = record.getFrameno();   //车牌号

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

@@ -19,7 +19,7 @@
         ifnull( eic.NAME, '' ) AS companyName,
         io.userid  AS "userId",
         su.NAME  AS "userName",
-        iac.leader_name  AS "leaderName"
+        su.leader_name  AS "leaderName"
         FROM
         ins_orders io
         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
@@ -30,6 +30,25 @@
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
                 AND DATE_FORMAT( io.createtime, '%Y-%m-%d') BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
+
+            <if test="vo.licenseno !=null  and vo.licenseno!=''">
+                AND io.licenseno =#{vo.licenseno}
+            </if>
+            <if test="vo.frameno !=null  and vo.frameno!=''">
+                AND io.frameno =#{vo.frameno}
+            </if>
+
+            <if test="vo.userId !=null  and vo.userId!=''">
+                AND io.userId =#{vo.userId}
+            </if>
+
+            <if test="vo.userName  != null  and  vo.userName!=''  ">
+                AND su.name =#{vo.userName}
+            </if>
+
+            <if test="vo.mobile  != null  and  vo.mobile!=''  ">
+                AND su.mobile =#{vo.mobile}
+            </if>
         </where>
         order by io.createtime ,io.orderno
     </select>