tj

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

@@ -74,6 +74,11 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         return success(i);
     }
 
+//    @PostMapping("/genernateInwardTime")
+//    public RESTfulResult genernateInwardTime(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
+//        int i = tmstruckTimeTaskResultService.genernateInwardTime(mapValue);
+//        return success(i);
+//    }
 
     @ApiOperation(value="用于计时判断")
     @ApiImplicitParams({
@@ -230,7 +235,8 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
                                           String con,
                                           String userId,
                                           String startTime,
-                                          String endTime
+                                          String endTime,
+                                          Integer orderType
     ){
         if (mapValue==null){
             mapValue=new HashMap<>();
@@ -242,6 +248,9 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         if (userId!=null&&!userId.equals("undifined")&&!userId.equals("")){
             mapValue.put("userId",userId);
         }
+        if (orderType!=null&&!orderType.equals("undifined")&&!orderType.equals("")){
+            mapValue.put("orderType",orderType);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> result = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);

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

@@ -31,7 +31,7 @@ public interface TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTa
     //查询所有确认暂停结束时间
     List<Map<String, Object>> getAllTimeout(BigDecimal resultTotalId);
 
-    //查询计时作业
+    //查询计时(计次)作业
     List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map);
 
     //根据运输订单号查找需要用车时长

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

@@ -402,6 +402,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 map.put("orderStatus", 2);
                 i = utilsMapper.updateOrderStatusByOrderIdOrNum(map);
                 //生成计次计费详单
+                genernateInwardTime(map);
             }
          }
             return i;
@@ -455,7 +456,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
         Map<String,Object>mapInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId1);
         Map<String,Object>mapPrice = null;
         try {
-            mapPrice = amsFeign.getInwardPriceBy(mapInfo);
+            mapPrice = amsFeign.getInwardPriceBy(mapInfo);//只查到计时，没有类型id
             if(mapPrice != null){
                 mapPrice.put("orderId",orderId1);
                 mapPrice.putAll(map);
@@ -467,7 +468,6 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return i;
     }
 

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

@@ -779,6 +779,9 @@
     LEFT JOIN RMS_CAPACITY_TYPE RCT
     ON RCT.CAPACITY_TYPE_ID=AIR.CAPACITY_TYPE_ID
     where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
+    <if test="orderType!=null">
+      AND OO.ORDER_TYPE =#{orderType}
+    </if>
     <if test="con!=null">
       AND RC.CAPACITY_NUMBER LIKE #{con} or RM.MATERIAL_NAME LIKE #{con}
       or RS.SHIPPER_NAME LIKE #{con}
@@ -885,18 +888,19 @@
   <!--获取需求信息-->
   <select id="getRequirementInfo" resultType="java.util.Map" parameterType="decimal">
     select DISTINCT
-           AIR.CAPACITY_TYPE_ID "capacityTypeId" ,
-           AIR.REQUIREMENT_TYPE "requirementType",
-           RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+      AIR.CAPACITY_TYPE_ID "capacityTypeId" ,
+      AIR.REQUIREMENT_TYPE "requirementType",
+      RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+      AIR.insert_update_remark "insertUpdateRemark"
     from OMSTRUCK_ORDER OO
-           left join AMSTRUCK_INWARD_PLAN AIP
-                     on aip.PLAN_ID = OO.ORDER_PLAN_ID
-           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_CAPACITY_TYPE RCT
-                     ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+      left join AMSTRUCK_INWARD_PLAN AIP
+        on aip.PLAN_ID = OO.ORDER_PLAN_ID
+      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_CAPACITY_TYPE RCT
+         ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
     where oo.ORDER_ID = #{orderId1}
     fetch next 1 rows only
   </select>