Parcourir la source

1.控制台大订单已承保查询调整

wuhp il y a 1 an
Parent
commit
fca1e78f9f

+ 9 - 0
src/main/java/com/ydtech/modules/admin/model/report/company/OrdersDataDto.java

@@ -77,4 +77,13 @@ public class OrdersDataDto  implements Serializable {
 
     @ApiModelProperty("车型")
     private String modelcname;
+
+    @ApiModelProperty("业务员id")
+    private String userId;
+
+    @ApiModelProperty("业务员名称")
+    private String userName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
 }

+ 3 - 0
src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -181,6 +181,9 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
             OrdersDataDto ordersDataDto = new OrdersDataDto();
             ordersDataDto.setBeginDate(dateMapByType.get("startDate"));
             ordersDataDto.setEndDate(dateMapByType.get("endDate"));
+            ordersDataDto.setUserId(ordersDataVo.getUserId());
+            ordersDataDto.setUserName(ordersDataVo.getUserName());
+            ordersDataDto.setMobile(ordersDataVo.getMobile());
             for (OrdersDataDto record : records) {
                 String licenseno = record.getLicenseno();  //车牌号
                 String frameno = record.getFrameno();   //车牌号

+ 14 - 0
src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -3244,6 +3244,7 @@
         GROUP_CONCAT(inscompany ORDER BY inscompany SEPARATOR ',') as "namesimple"
         from ins_area_company iac
         left join ins_orders io on io.orderno = iac.orderno
+        left join sys_user  su  on su.id =io.userid
         <where>
             iac.orderstatus ='3'
             <if test="vo.licenseno !=null  and vo.licenseno!=''">
@@ -3252,6 +3253,19 @@
             <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>
+
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
                 AND io.createtime BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>