计时计数包月

src/main/java/com/steerinfo/dil/controller/TmstruckTimeTaskResultController.java

@@ -1,13 +1,19 @@
 package com.steerinfo.dil.controller;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,6 +36,12 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckTimeTaskResultService tmstruckTimeTaskResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
     @ApiOperation(value="司机申请开始")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
@@ -110,4 +122,54 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(363)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String con
+    ){
+
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_time_task_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allResult = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_time_task_list");
+            //添加id
+            map.put("indexId","timeTaskId");
+            allResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allResult);
+            //删除
+            allResult.remove(allResult.size()-1);
+        }
+        if(allResult == null){
+            allResult = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> result = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allResult,result);
+        return success(pageList);
+    }
+
 }

src/main/java/com/steerinfo/dil/controller/TmstruckTotalResultController.java

@@ -51,7 +51,7 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
     @ApiOperation(value="查询计数实绩列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(364)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -63,17 +63,18 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
                                         Integer pageSize
     ){
         //不分页筛选数据
-        List<Map<String, Object>> allUnloadResult = tmstruckTotalResultService.selectCountList(mapValue);
+        List<Map<String, Object>> allCountList = tmstruckTotalResultService.selectCountList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> unloadResult = tmstruckTotalResultService.selectCountList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allUnloadResult,unloadResult);
+        List<Map<String, Object>> countList = tmstruckTotalResultService.selectCountList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCountList,countList);
         return success(pageList);
     }
+
     @ApiOperation(value="查询所有的包月作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(111)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(365)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -89,7 +90,6 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
-        DataChange.dataTo2Number(qualityResult, "resultDeduction");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
         return success(pageList);
     }

src/main/java/com/steerinfo/dil/service/ITmstruckTimeTaskResultService.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.TmstruckTimeTaskResult;
 import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,4 +45,7 @@ public interface ITmstruckTimeTaskResultService {
 
     //用车单位确认结束
     int unitSureEndTime(Map<String, Object> map);
+
+    //查询计时作业
+    List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -177,4 +177,15 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     }
 
 
+    /**
+     * 查询计时作业
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map) {
+        return tmstruckTimeTaskResultMapper.getAllTimeTaskResult(map);
+    }
+
+
 }

src/main/resources/com/steerinfo/dil/mapper/TmstruckTimeTaskResultMapper.xml

@@ -642,7 +642,7 @@
       AND TTTR.RESULT_TIME_TYPE = 7
   </select>
 
-  <!--  通过签收时间排序 -->
+
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
       order by "${orderField}"
@@ -650,16 +650,16 @@
         ${orderType}
       </if>
     </if>
-    <if test="orderField == null  ">
-      order by "insertTime" desc
-    </if>
   </sql>
 
   <!-- 查询计时作业 -->
   <select id="getAllTimeTaskResult" resultType="java.util.Map">
     SELECT *
     FROM (
-           SELECT OO.ORDER_NUMBER "orderNumber",
+           SELECT
+                  TTTR.TIME_TASK_RESULT_ID  "timeTaskResultId",
+                  TTTR.INSERT_TIME      "insertTime",
+                  OO.ORDER_NUMBER "orderNumber",
                   RC.CAPACITY_NUMBER "capacityNumber",
                   RCD.DRIVER_NAME "driverName",
                   RCT.CAPACITY_TYPE_NAME "capacityTypeName",
@@ -691,7 +691,7 @@
                             ON RM.MATERIAL_ID = OOM.MATERIAL_ID
 
                   LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-                            ON AIP.PLAN_ID = OO.ORDER_PLAN_ID AND OO.ORDER_TYPE = 4
+                            ON AIP.PLAN_ID = OO.ORDER_PLAN_ID AND OO.ORDER_TYPE = 11
                   LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
                             ON ARP.PLAN_ID = AIP.PLAN_ID
                   LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
@@ -770,5 +770,10 @@
         </foreach>
       </if>
     </where>
+    <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
   </select>
+
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.xml

@@ -14,11 +14,11 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
   </resultMap>
   <sql id="columns">
-    RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME, 
+    RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
   </sql>
   <sql id="columns_alias">
-    t.RESULT_TOTAL_ID, t.ORDER_ID, t.RESULT_DURATION, t.STANDARD_DATA_ID, t.RESULT_OUTLIER, 
+    t.RESULT_TOTAL_ID, t.ORDER_ID, t.RESULT_DURATION, t.STANDARD_DATA_ID, t.RESULT_OUTLIER,
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
   </sql>
   <sql id="select">
@@ -28,7 +28,7 @@
     SELECT <include refid="columns_alias" /> FROM TMSTRUCK_TOTAL_RESULT t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="resultTotalId != null">
         and RESULT_TOTAL_ID = #{resultTotalId}
       </if>
@@ -62,7 +62,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="resultTotalId != null">
         and RESULT_TOTAL_ID = #{resultTotalId}
       </if>
@@ -101,7 +101,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from TMSTRUCK_TOTAL_RESULT
-    where 1!=1 
+    where 1!=1
       <if test="orderId != null">
         or ORDER_ID = #{orderId}
       </if>
@@ -131,13 +131,13 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
-    insert into TMSTRUCK_TOTAL_RESULT (RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION, 
-      STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    insert into TMSTRUCK_TOTAL_RESULT (RESULT_TOTAL_ID, ORDER_ID, RESULT_DURATION,
+      STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
       INSERT_UPDATE_REMARK)
-    values (#{resultTotalId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{resultDuration,jdbcType=DECIMAL}, 
-      #{standardDataId,jdbcType=DECIMAL}, #{resultOutlier,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+    values (#{resultTotalId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{resultDuration,jdbcType=DECIMAL},
+      #{standardDataId,jdbcType=DECIMAL}, #{resultOutlier,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
       #{insertUpdateRemark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckTotalResult">
@@ -266,21 +266,21 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into TMSTRUCK_TOTAL_RESULT 
-      (RESULT_TOTAL_ID, 
-      ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, 
-      RESULT_OUTLIER, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
+    insert into TMSTRUCK_TOTAL_RESULT
+      (RESULT_TOTAL_ID,
+      ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID,
+      RESULT_OUTLIER, INSERT_USERNAME,
+      INSERT_TIME, UPDATE_USERNAME,
       UPDATE_TIME, INSERT_UPDATE_REMARK
       )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.resultTotalId,jdbcType=DECIMAL}, 
-      #{item.orderId,jdbcType=DECIMAL}, #{item.resultDuration,jdbcType=DECIMAL}, #{item.standardDataId,jdbcType=DECIMAL}, 
-      #{item.resultOutlier,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.resultTotalId,jdbcType=DECIMAL},
+      #{item.orderId,jdbcType=DECIMAL}, #{item.resultDuration,jdbcType=DECIMAL}, #{item.standardDataId,jdbcType=DECIMAL},
+      #{item.resultOutlier,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -326,14 +326,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_TOTAL_ID" separator=" ">
           when #{item.resultTotalId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
        </foreach>
-     where RESULT_TOTAL_ID in 
+     where RESULT_TOTAL_ID in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.resultTotalId,jdbcType=DECIMAL}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRUCK_TOTAL_RESULT
-    where RESULT_TOTAL_ID in 
+    where RESULT_TOTAL_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -342,54 +342,125 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 <!-- 查询计数实绩 -->
   <select id="selectCountList" resultType="java.util.Map" parameterType="java.lang.String">
-    SELECT RM.MATERIAL_NAME "materialName",
-           OO.ORDER_NUMBER "orderNumber",
-           RC.CAPACITY_NUMBER "capacityNumber",
-           RW.WAREHOUSE_NAME "warehouseName",
-           RCD.DRIVER_NAME "driverName",
-           RCT.CAPACITY_TYPE_NAME "capacityTypeName",
-           RS.SHIPPER_NAME "shipperName",
-           AIR.REQUIREMENT_WORK_CONTENT "requirmentWorkContent"
 
-    FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-           LEFT JOIN OMSTRUCK_ORDER OO
-                     ON OO.ORDER_PLAN_ID=AIR.PURCHASE_ORDER_ID
-           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                     ON OO.ORDER_ID = OOM.ORDER_ID
-           LEFT JOIN RMS_MATERIAL RM
-                     ON RM.MATERIAL_ID=OOM.MATERIAL_ID
-           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                     ON TTR.ORDER_ID=OO.ORDER_ID
-           LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
-                     ON TTR.RESULT_TOTAL_ID=TUR.RESULT_TOTAL_ID
-           LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
-                     ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
-           LEFT JOIN RMS_CAPACITY RC
-                     ON OO.CAPACITY_ID = RC.CAPACITY_ID
-           LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                     ON RC.CAPACITY_ID=RDC.CAPACITY_ID
-           LEFT JOIN RMS_CAPACITY_TYPE RCT
-                     ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
-           LEFT JOIN RMS_CAR_DRIVER RCD
-                     ON RDC.DRIVER_ID=RCD.DRIVER_ID
-      --   LEFT JOIN RMS_PWAREHOUSE_PLATFORM RPP
---   ON TLR.LOADER_ID=RPP.PLATFORM_ID
-           LEFT JOIN RMS_WAREHOUSE RW
-                     ON RW.WAREHOUSE_ID=TUR.RESULT_UNLOAD_PLACE_ID
-           LEFT JOIN RMS_WAREHOUSE_TYPE RWT
-                     ON RWT.WAREHOUSE_TYPE_ID=RW.WAREHOUSE_TYPE_ID
-           LEFT JOIN RMS_SHIPPER RS
-                     ON AIR.REQUIREMENT_SHIPPER_ID=RS.SHIPPER_ID
-    WHERE AIR.REQUIREMENT_TYPE=2 AND RW.WAREHOUSE_TYPE_ID=3
-      AND  OO.ORDER_STATUS=4
+      SELECT *
+      FROM (
+               SELECT RM.MATERIAL_NAME             "materialName",
+                      OO.ORDER_NUMBER              "orderNumber",
+                      RC.CAPACITY_NUMBER           "capacityNumber",
+                      RW1.WAREHOUSE_NAME           "warehouseName1",
+                      RW2.WAREHOUSE_NAME           "warehouseName2",
+                      RCD.DRIVER_NAME              "driverName",
+                      RCT.CAPACITY_TYPE_NAME       "capacityTypeName",
+                      RS.SHIPPER_NAME              "shipperName",
+                      AIR.REQUIREMENT_WORK_CONTENT "requirmentWorkContent",
+                      AIR.INSERT_TIME           "insertTime"
+               FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+                        LEFT JOIN OMSTRUCK_ORDER OO
+                                  ON OO.ORDER_PLAN_ID = AIR.PURCHASE_ORDER_ID
+                        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                                  ON OO.ORDER_ID = OOM.ORDER_ID
+                        LEFT JOIN RMS_MATERIAL RM
+                                  ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                  ON TTR.ORDER_ID = OO.ORDER_ID
+                        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                                  ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                                  ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN RMS_WAREHOUSE RW1
+                                  ON TLR.LOADING_ID = RW1.WAREHOUSE_ID
+                        LEFT JOIN RMS_WAREHOUSE RW2
+                                  ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                        LEFT JOIN RMS_CAPACITY RC
+                                  ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                        LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                                  ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                        LEFT JOIN RMS_CAPACITY_TYPE RCT
+                                  ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+                        LEFT JOIN RMS_CAR_DRIVER RCD
+                                  ON RDC.DRIVER_ID = RCD.DRIVER_ID
+                        LEFT JOIN RMS_SHIPPER RS
+                                  ON AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
+               WHERE AIR.REQUIREMENT_TYPE = '计时'
+                 AND OO.ORDER_STATUS = 11
+           )
+    <where>
+        <if test="materialName != null">
+            <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                "materialName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="orderNumber != null">
+            and
+            <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                "orderNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="capacityNumber != null">
+            and
+            <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                "capacityNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="warehouseName1 != null">
+            and
+            <foreach collection="warehouseName1" item="item" open="(" separator="or" close=")">
+                "warehouseName1" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="warehouseName2 != null">
+            and
+            <foreach collection="warehouseName2" item="item" open="(" separator="or" close=")">
+                "warehouseName2" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="driverName != null">
+            and
+            <foreach collection="driverName" item="item" open="(" separator="or" close=")">
+                "driverName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="capacityTypeName != null">
+            and
+            <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                "capacityTypeName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="shipperName != null">
+            and
+            <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                "shipperName" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="requirmentWorkContent != null">
+            and
+            <foreach collection="requirmentWorkContent" item="item" open="(" separator="or" close=")">
+                "requirmentWorkContent" like '%${item}%'
+            </foreach>
+        </if>
+    </where>
+      <include refid="orderBy"></include>
+      <if test="orderField == null  ">
+          order by "insertTime" desc
+      </if>
   </select>
   <!-- 查询所有的包月作业实绩 -->
   <select id="getTmstruckMonthResult" parameterType="java.util.Map" resultType="java.util.Map">
     select * from tmstruck_total_result  ttr
-                    left join omstruck_order oo on ttr.order_id=oo.order_id
-                    left join amstruck_inward_plan aip on oo.order_plan_id=aip.plan_id
-                    left join amstruck_requirement_plan arp on aip.plan_id=arp.plan_id
-                    left join amstruck_inward_requirement air on arp.requirement_plan_id=air.requirement_id
-    where oo.order_type=4 and air.requirement_type=3
+                    left join omstruck_order oo on ttr.order_id = oo.order_id
+                    left join amstruck_inward_plan aip on oo.order_plan_id = aip.plan_id
+                    left join amstruck_requirement_plan arp on aip.plan_id = arp.plan_id
+                    left join amstruck_inward_requirement air on arp.requirement_plan_id = air.requirement_id
+    where oo.order_type = 11 and air.requirement_type = '包月'
   </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
 </mapper>