修改

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

@@ -242,6 +242,25 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getAllLoadUnloadResult(map));
     }
 
+
+
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getLoadForLoadCarResult")
+    public RESTfulResult getLoadForLoadCarResult(@RequestBody (required = false) Map<String, Object> map){
+        return success(omstruckOrderSeparateService.getLoadForLoadCarResult(map));
+    }
+
+
+    //根据userId查找改运力是否为装机
+
+    @ApiOperation(value = "装机查询所以已装车的订单信息")
+    @PostMapping("/getCapacityTypeByUserId")
+    public RESTfulResult getCapacityTypeByUserId(@RequestBody (required = false) Map<String, Object> map){
+        Integer capacityTypeByUserId = omstruckOrderSeparateService.getCapacityTypeByUserId(map);
+        return success(capacityTypeByUserId);
+    }
+
+
     @ApiOperation(value = "查看计时完成详情")
     @PostMapping("/getTimeTaskEnd")
     public RESTfulResult getTimeTaskEnd(@RequestBody (required = false) Map<String, Object> map){

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

@@ -330,4 +330,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     int closeTruckOrder(BigDecimal orderId);
 
     Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
+
+    List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map);
 }

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

@@ -74,7 +74,6 @@ public interface OmstruckOrderSeparateMapper {
     int updateTranTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
 
 
-
     //查询当前车辆之前所有已完成的订单
     List<Map<String, Object>> getCapacityAllOrder(String capacityNumber);
 

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

@@ -20,4 +20,9 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
 
     @Select("select seq__RMS_PWAREHOUSE_GRIDTEST.nextval from dual")
     BigDecimal gridId();
+
+    String selectCapacityNumber(String userId);
+
+    //根据userId进行运力类型
+    BigDecimal getCapacityTypeByUserId(String userId);
 }

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

@@ -50,4 +50,8 @@ public interface IOmstruckOrderSeparateService {
     List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 
     List<Map<String,Object>> getPauseTimeTaskDetail(Integer orderId);
+
+    List<Map<String,Object>> getLoadForLoadCarResult(Map<String, Object> map);
+
+    Integer getCapacityTypeByUserId(Map<String, Object> map);
 }

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

@@ -42,6 +42,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     private OmstruckOrderMapper omstruckOrderMapper;
 
+    @Autowired
+    private RmsCapacityMapper rmsCapacityMapper;
+
     @Autowired
     private OmstruckOrderServiceImpl omstruckOrderService;
 
@@ -721,6 +724,24 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return omstruckOrderMapper.getPauseTimeTaskDetail(orderId);
     }
 
+    @Override
+    public List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        map.put("limitTime", sdf.format(new Date(new Date().getTime() - 43200000)));
+        String userId =(String) map.get("userId");
+        String userName = rmsCapacityMapper.selectCapacityNumber(userId);
+        map.put("userName",userName);
+        return omstruckOrderMapper.getLoadForLoadCarResult(map);
+    }
+
+    @Override
+    public Integer getCapacityTypeByUserId(Map<String, Object> map) {
+        String userId =(String) map.get("userId");
+        BigDecimal capacityType = rmsCapacityMapper.getCapacityTypeByUserId(userId);
+//        System.out.println("capacityType"+capacityType);
+        return capacityType.intValue();
+    }
+
     /**
      * Notes：取消装剩余物资
      * @Author: TXF

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
   BmsTruckFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -3110,7 +3110,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4, 9, 10, 11 , 20)
+        AND OO.ORDER_TYPE IN (4,9,10,11,20,21)
         AND OO.ORDER_STATUS = #{orderStatus}
         <if test="carrierId !=null">
             AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})
@@ -3421,7 +3421,7 @@
                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
                       AND TTTR2.RESULT_TIME_TYPE = 7
-                ) "pauseTime",
+                ) "pauseTime"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         ON OO.ORDER_ID=TTR.ORDER_ID
@@ -3501,4 +3501,30 @@
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
     </select>
+    <select id="getLoadForLoadCarResult" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from(select
+        COUNT(RC.CAPACITY_NUMBER) "number",
+        sum(TWR.RESULT_NET_WEIGHT) "netWeight",
+        TLR.CAPACITY_REMARK "LoaderCapacityNumber"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+        </if>
+        GROUP BY TLR.CAPACITY_REMARK
+        )
+    </select>
 </mapper>

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

@@ -707,4 +707,17 @@
         from RMS_STACKING rs
         order by rs.STACKING_ID asc
     </select>
+    <select id="selectCapacityNumber" parameterType="java.lang.String" resultType="java.lang.String">
+        select
+            RC.CAPACITY_NUMBER "capacityNumber"
+        from RMS_CAPACITY RC
+        where RC.CAPACITY_SSO_ID = #{userId}
+    </select>
+    <select id="getCapacityTypeByUserId" resultType="java.math.BigDecimal" parameterType="java.lang.String">
+        select  RCT.WHETHER_CAR "whetherCar"
+        from RMS_CAPACITY RC
+        LEFT JOIN RMS_CAPACITY_TYPE RCT
+        ON RC.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
+        WHERE  RC.CAPACITY_SSO_ID=#{userId}
+   </select>
 </mapper>