as

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

@@ -147,10 +147,15 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));
         }
-        mapValue.put("planStatus",new BigDecimal(planStatus));
+        List<Map<String, Object>> columnList = null;
         PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = amstruckInwardPlanService.getTruckPlanList(mapValue);
+        if(planStatus == 100){
+            columnList = amstruckInwardPlanService.getTruckPlanList2(mapValue);
+        }else {
+            mapValue.put("planStatus",new BigDecimal(planStatus));
+            //分页查询数据
+            columnList =  amstruckInwardPlanService.getTruckPlanList(mapValue);
+        }
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }

src/main/java/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.java

@@ -23,6 +23,8 @@ public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan
 
     List<Map<String, Object>> getIssuedPlanList(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getIssuedPlanList2(Map<String, Object> mapValue);
+
     List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
 
 }

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

@@ -26,6 +26,8 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue);
+
     int deleteTruckPlan(BigDecimal planId);
 
     int updateTruckPlan(AmstruckInwardPlan amstruckInwardPlan);

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

@@ -101,6 +101,10 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         return mapList;
     }
 
+    public List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getIssuedPlanList2(mapValue);
+    }
+
     /**
      * 删除计划
      * @param planId

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

@@ -475,7 +475,6 @@
         )
         <where>
             <if test="purchaseOrderNo != null">
-                and
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'
                 </foreach>
@@ -631,7 +630,6 @@
         )
         <where>
             <if test="purchaseOrderNo != null">
-                and
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'
                 </foreach>
@@ -748,6 +746,42 @@
         <include refid="orderBy"></include>
     </select>
 
+    <select id="getIssuedPlanList2" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        AIP.PLAN_ID                        AS "planId",
+        AIP.CARRIER_ID                     AS "carrierId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RS.SHIPPER_NAME                    AS "shipperName"
+        FROM AMSTRUCK_INWARD_PLAN AIP
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        WHERE  AIP.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
+        <if test="planId != null">
+            and AIP.PLAN_ID = #{planId}
+        </if>
+        )
+    </select>
+
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">
             order by "${orderField}"