提交车险平台的订单查询查询当前登陆人的订单信息

admin 可以查看所有人的订单信息

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -330,6 +330,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public BasePageResult<InsOrders> newQueryPageOrder(OrderQueryVo orderQueryVo) {
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
+        boolean adminFalg = false;
+        //修改逻辑   add by  hxl   修改查询当前登陆人的订单   admin 可以查看所有
+        if("admin".equals(orderQueryVo.getUserId())){
+            adminFalg=true;
+        }
+        /**
         // 领导标志
         boolean isTeamLeader = false;
         //是否出单员标志
@@ -344,10 +350,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 isCdy = true;
             }
         }
-        orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
-
-        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, isTeamLeader, isCdy);
-        Long total = baseMapper.queryPageOrderCount(orderQueryVo, isTeamLeader, isCdy);
+         orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
+         **/
+        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, adminFalg, null);
+        Long total = baseMapper.queryPageOrderCount(orderQueryVo, adminFalg, null);
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()

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

@@ -278,7 +278,7 @@
                 <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                     and io.orderno = #{orderQueryVo.orderNo}
                 </if>
-                <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
+                <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != ''">
                     and io.deptid like "${orderQueryVo.deptId}%"
                 </if>
                 <if test="orderQueryVo.orderStatus != null and orderQueryVo.orderStatus != ''">
@@ -294,17 +294,19 @@
                     and io.insuredname = #{orderQueryVo.insuredName}
                 </if>
                 <if test="orderQueryVo.startDate != null and orderQueryVo.endDate != null">
-                    and io.createtime between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
+                    and DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
                 </if>
                 <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                     and iac.company_id = #{orderQueryVo.companyId}
                 </if>
-<!--                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">-->
-<!--                    and io.operatorid = #{orderQueryVo.userId}-->
-<!--                </if>-->
-<!--                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">-->
-<!--                    and io.userid = #{orderQueryVo.userId}-->
-<!--                </if>-->
+                <!--
+               <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
+                    and io.operatorid = #{orderQueryVo.userId}
+              </if>
+               -->
+              <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
+                   and io.userid = #{orderQueryVo.userId}
+              </if>
             </where>
             group by io.orderno
         ) as s
@@ -324,7 +326,7 @@
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
-            <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
+            <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != ''">
                 and io.deptid like "${orderQueryVo.deptId}%"
             </if>
             <if test="orderQueryVo.orderStatus != null and orderQueryVo.orderStatus != ''">
@@ -340,14 +342,16 @@
                 and io.insuredname = #{orderQueryVo.insuredName}
             </if>
             <if test="orderQueryVo.startDate != null and orderQueryVo.endDate != null">
-                and io.createtime between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
+                and DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
+             <!--
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
                 and io.operatorid = #{orderQueryVo.userId}
             </if>
+             -->
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
                 and io.userid = #{orderQueryVo.userId}
             </if>