修改计时和计次

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

@@ -68,6 +68,45 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="用于计时判断")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/JudgeTimeTask")
+    public RESTfulResult JudgeTimeTask(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
+        int i=0;
+        try {
+            i=tmstruckTimeTaskResultService.JudgeTimeTask(mapValue);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
+        return success(i);
+    }
+
+
+
+
+
+
+
+
+    @ApiOperation(value="用于计时暂停判断")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/JudgeTimeTaskPause")
+    public RESTfulResult JudgeTimeTaskPause(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
+        int i=0;
+        try {
+            i=tmstruckTimeTaskResultService.JudgeTimeTaskPause(mapValue);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
+        return success(i);
+    }
+
+
+
 
 
     @ApiOperation(value="用车单位确认开始")
@@ -90,7 +129,7 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="用车单位确认暂停申请开始")
+    @ApiOperation(value="暂停计时")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
     })
@@ -165,13 +204,13 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           String con,
-                                          String orgCode
+                                          String userId
     ){
         if (con!=null&&!con.equals("undifined")&&!con.equals("")){
             mapValue.put("con","%" + con + "%");
         }
-        if (orgCode!=null&&!orgCode.equals("undifined")&&!con.equals("")){
-            mapValue.put("userId",orgCode);
+        if (userId!=null&&!userId.equals("undifined")&&!con.equals("")){
+            mapValue.put("userId",userId);
         }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据

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

@@ -22,6 +22,9 @@ public interface TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTa
     //查询上一次用车单位确认暂停结束时间
     Map<String, Object> getLastTimeout(BigDecimal resultTotalId);
 
+    //查询上一次用车单位确认暂停 确认结束时间
+    Map<String, Object> getLastTimeEnd(BigDecimal resultTotalId);
+
     //查询用车单位确认开始时间
     Map<String, Object> getStartTime(BigDecimal resultTotalId);
 

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

@@ -100,13 +100,22 @@ public interface UtilsMapper {
     Map<String,Object> timeTaskResult(BigDecimal orderId);
 
     //根据运输订单id查找订单类型
-   Map<String,Object> getTimeStatus(Map<String,Object> map);
+    Map<String,Object> getTimeStatus(Map<String,Object> map);
 
+    //通过运输订单号查找内转类型
+    BigDecimal getInwardType(BigDecimal orderId);
 
 
     //根据运输订单id查找两次计时作业实绩
    Map<String,Object> FristTimeTask(Map<String,Object> map);
 
+   //根据运输订单id查找计时暂停时间
+    List<Map<String,Object>> TimeTaskPause(Map<String,Object> map);
+
    //通过运输订单id查找计时是否开始
     BigDecimal getTime(BigDecimal orderId);
+
+    BigDecimal getInwardStartTime(BigDecimal orderId);
+
+    BigDecimal getInwardEndTime(BigDecimal orderId);
 }

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

@@ -52,6 +52,11 @@ public interface ITmstruckTimeTaskResultService {
     //新增作业实绩
     int addTimeTaskResult(Map<String,Object> map) throws Exception;
 
+    int JudgeTimeTask(Map<String, Object> mapValue) throws Exception;
+
+    int JudgeTimeTaskPause(Map<String, Object> mapValue) throws Exception;
+
+
     //修改计时作业
 //    int updateTimeTaskResult(Map<String,Object> map);
 }

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

@@ -56,7 +56,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
-    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17);
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,22);
 
     //给达兴发委托
     private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
@@ -330,7 +330,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计量委托
 
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission);
+//        return sendMesToMeasure(measureCommission);
+        System.out.println(measureCommission);
+        return 1;
 
     }
 

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

@@ -42,103 +42,132 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
 
     /**
      * 通用生成实例数据
+     *
      * @param map
      * @return
      */
-    public TmstruckTimeTaskResult generateTimeTaskResult(Map<String, Object> map, Integer timeType){
+    public TmstruckTimeTaskResult generateTimeTaskResult(Map<String, Object> map) {
         TmstruckTimeTaskResult tmstruckTimeTaskResult = new TmstruckTimeTaskResult();
         //获取主键ID
         tmstruckTimeTaskResult.setId(tmstruckTimeTaskResultMapper.selectMaxId());
         String orderNumber = (String) map.get("orderNumber");
+        BigDecimal inwardType = DataChange.dataToBigDecimal(map.get("inwardType"));
         //通过运输订单号查询总实绩ID等数据
         map.putAll(tmstruckTimeTaskResultMapper.getResultTotalIdByOrderNum(orderNumber));
         tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //生成时间
         tmstruckTimeTaskResult.setResultTime(new Date());
+        //生成订单结束
+        tmstruckTimeTaskResult.setResultUomId(new BigDecimal(900));
         //设置时间类型
-        tmstruckTimeTaskResult.setResultTimeType(new BigDecimal(timeType));
+        tmstruckTimeTaskResult.setResultTimeType(inwardType);
+        String personnelSsoId =(String) map.get("personnelSsoId");
+        tmstruckTimeTaskResult.setInsertUsername(personnelSsoId);
+        tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
         return tmstruckTimeTaskResult;
     }
 
     /**
      * 司机申请开始
+     *
      * @param map
      * @return
      */
     @Override
     public int applyStartTime(Map<String, Object> map) {
         //设置时间类型 0
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 0);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
     /**
      * 用车单位确认开始
+     *
      * @param map
      * @return
      */
     @Override
     public int unitSureStartTime(Map<String, Object> map) {
         //设置时间类型 1
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 1);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
     /**
      * 司机申请暂停
+     *
      * @param map
      * @return
      */
     @Override
     public int applyStartTimeout(Map<String, Object> map) {
         //设置时间类型 4
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 4);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
     /**
      * 用车单位确认
+     *
      * @param map
      * @return
      */
     @Override
     public int unitSureStartTimeout(Map<String, Object> map) {
         //设置时间类型 5
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 5);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
     /**
      * 司机申请暂停结束
+     *
      * @param map
      * @return
      */
     @Override
     public int applyEndTimeout(Map<String, Object> map) {
         //设置时间类型 6
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 6);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
     /**
      * 用车单位确认暂停结束
+     *
      * @param map
      * @return
      */
     @Override
     public int unitSureEndTimeout(Map<String, Object> map) {
-        //设置时间类型 7
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 7);
-        //查询上一次结束的时间
-        Map<String, Object> timeMap = tmstruckTimeTaskResultMapper.getLastTimeout(tmstruckTimeTaskResult.getResultTotalId());
-        Object resultTime = timeMap.get("resultTime");
-        if(resultTime != null){
-            Date lastTimeout = (Date) resultTime;
-            //计算相差时间戳 存入当前实绩中  更精确
-            long differenceTime = new Date().getTime() - lastTimeout.getTime();
-            tmstruckTimeTaskResult.setResultValue(new BigDecimal(differenceTime));
+        int i=0;
+        //map中传输的参数为InwardType,orderNumber
+        //根据运输订单号查找订单id
+        //如果订单类型为5
+        String personnelSsoId =(String) map.get("personnelSsoId");
+        String orderNumber =(String) map.get("orderNumber");
+        BigDecimal inwardType =DataChange.dataToBigDecimal(map.get("inwardType"));
+        if (inwardType.intValue()==5){
+            generateTimeTaskResult(map);
+        }else if (inwardType.intValue()==7){
+            TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
+            //生成计时实绩暂停
+            //根据运输订单号查找总实绩id
+            BigDecimal totalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
+            //根据总实绩id查找开始时间
+            Map<String, Object> lastTimeout = tmstruckTimeTaskResultMapper.getLastTimeout(totalId);
+            Date startTime =(Date) lastTimeout.get("resultTime");
+            //根据总实绩id查找结束时间
+            Map<String, Object> lastTimeEnd = tmstruckTimeTaskResultMapper.getLastTimeEnd(totalId);
+            Date EndTime = (Date) lastTimeEnd.get("resultTime");
+            long dueTime=EndTime.getTime()-startTime.getTime();
+            tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResult.getTimeTaskResultId());
+            tmstruckTimeTaskResult.setResultValue(new BigDecimal((dueTime/(1000*60))));
+            tmstruckTimeTaskResult.setUpdateTime(new Date());
+            i+=tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
         }
-        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+
+        return i;
     }
 
     /**
@@ -149,7 +178,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     @Override
     public int applyEndTime(Map<String, Object> map) {
         //设置时间类型 2
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 2);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
     }
 
@@ -161,7 +190,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     @Override
     public int unitSureEndTime(Map<String, Object> map) {
         //设置时间类型 3
-        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 3);
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map);
         //查询当前车辆排队开始时间 计算出总时长
         Map<String, Object> startTimeMap = tmstruckTimeTaskResultMapper.getStartTime(tmstruckTimeTaskResult.getResultTotalId());
         Date endTime = new Date();
@@ -202,66 +231,98 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addTimeTaskResult(Map<String, Object> map) throws Exception {
+           //判断是否是计时开始还是计时结束
         int i=0;
-        Date resultTime2 = null;
-        Date resultTime1;
-        String orderNumber =(String)map.get("orderNumber");
+        BigDecimal inwardType =DataChange.dataToBigDecimal(map.get("inwardTypes")) ;
+        String orderNumber = (String) map.get("orderNumber");
+        String personnelSsoId = (String) map.get("personnelSsoId");
         BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
-        TmstruckTimeTaskResult tmstruckTimeTaskResult=new TmstruckTimeTaskResult();
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = new TmstruckTimeTaskResult();
         BigDecimal orderId = utilsMapper.getOrderIdByOrderNumber(orderNumber);
-        map.put("orderId",orderId);
+        map.put("orderId", orderId);
         //根据运输订单id查找实绩中是否已经含有计时结束的实绩，如果有则抛出异常
         int countEndTimeNum = tmstruckTimeTaskResultMapper.CountTimeTaskByOrderId(orderId);
-        if (countEndTimeNum>=1){
+        if (countEndTimeNum >= 1) {
             throw new Exception("请勿重复计时");
         }
-        //根据运输订单号判断是否计时开始
-        BigDecimal Time = utilsMapper.getTime(orderId);
-        if (Time==null) {
+        if (inwardType.intValue()==1){
             tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResultMapper.selectMaxId());
             tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(resultTotalId));
             //获取计时开始的订单类型
-            BigDecimal inwardType = DataChange.dataToBigDecimal(map.get("inwardType"));
             tmstruckTimeTaskResult.setResultTimeType(inwardType);
             tmstruckTimeTaskResult.setResultTime(new Date());
             tmstruckTimeTaskResult.setInsertTime(new Date());
+            tmstruckTimeTaskResult.setInsertUsername(personnelSsoId);
             //新增第一条计时实绩
             i += tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
-        }else {
-            //已经有计时开始时间
-            //新增第二条实绩，计时结束
+        }else if (inwardType.intValue()==3){
             tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(resultTotalId));
             //获取计时结束的订单类型
             tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResultMapper.selectMaxId());
             tmstruckTimeTaskResult.setResultTime(new Date());
             tmstruckTimeTaskResult.setResultTimeType(new BigDecimal(3));
-            i += tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
-            //此时获取他的上一条实绩生成计时时间
-        }
-        //判断如果计时结束则生成作业时长，根据运输订单号查找作业是否结束
-        Map<String,Object> timeStatus = utilsMapper.getTimeStatus(map);
-        //首先判断计时是否开始,如果计时开始则生成计时结束实绩
-        //通过运输订单id和实绩结束状态查找时间实绩id
-        resultTime1 =(Date) timeStatus.get("resultTime");
-        Map<String, Object> timeTask = utilsMapper.FristTimeTask(map);
-        //获取计时开始时间
-        if (resultTime1!=null&&timeTask!=null) {//生成计时结束时间得同时.生成作业时长
-            BigDecimal timeTaskresultId = DataChange.dataToBigDecimal(timeTask.get("timeResultId"));
-            map.put("timeTaskresultId",timeTaskresultId);
+            tmstruckTimeTaskResult.setInsertUsername(personnelSsoId);
+            tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+            //获取最新暂停结束确认时间
+            Map<String, Object> map2 = new HashMap<>();
+            map2.put("type", 7);
+            map2.put("orderId", orderId);
+            List<Map<String, Object>> List = utilsMapper.TimeTaskPause(map2);
+            Map<String, Object> map4 = List.get(0);
+            BigDecimal resultPauseTimeEnd = DataChange.dataToBigDecimal( map4.get("resultPauseTime"));
             Map<String, Object> timeMaps = utilsMapper.FristTimeTask(map);
-            resultTime2 = (Date) timeMaps.get("resultTime");
-            BigDecimal timeResultId = (BigDecimal) timeMaps.get("timeResultId");
-            long dateTime = resultTime2.getTime() - resultTime1.getTime();
-            tmstruckTimeTaskResult.setTimeTaskResultId(timeResultId);
-            tmstruckTimeTaskResult.setResultValue(new BigDecimal(dateTime / 3600000));
+            Date resultTime2 = (Date) timeMaps.get("resultTime");
+            Map<String, Object> timeStatus = utilsMapper.getTimeStatus(map);
+            Date  resultTime1 = (Date) timeStatus.get("resultTime");
+            long dateTime1 = resultTime2.getTime() - resultTime1.getTime();
+            BigDecimal dateTime3 = new BigDecimal(dateTime1 / (1000 * 60));
+            int Time1 = dateTime3.intValue() - resultPauseTimeEnd.intValue();
+            tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResult.getTimeTaskResultId());
+            tmstruckTimeTaskResult.setResultValue(new BigDecimal((Time1)));
             tmstruckTimeTaskResult.setResultUomId(new BigDecimal(900));
-            tmstruckTimeTaskResult.setUpdateTime(new Date());
-             i+=tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
+            tmstruckTimeTaskResult.setUpdateUsername(personnelSsoId);
+            i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
             map.put("orderStatus", 2);
             utilsMapper.updateOrderStatusByOrderIdOrNum(map);
         }
-        return i;
+            return i;
+        }
+
+   //通过运输订单号判断计时是否开始
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int JudgeTimeTask(Map<String, Object> mapValue) throws Exception {
+        String orderNumber =(String)mapValue.get("orderNumber");
+        BigDecimal orderId = utilsMapper.getOrderIdByOrderNumber(orderNumber);
+        //通过运输订单号查找当前是第几次
+        BigDecimal inwardType = utilsMapper.getInwardType(orderId);
+        if (inwardType!=null){
+            throw new Exception("计时已经开始");
+        }
+        return inwardType.intValue();
     }
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int JudgeTimeTaskPause(Map<String, Object> mapValue) throws Exception {
+        String orderNumber =(String)mapValue.get("orderNumber");
+        int i=0;
+        BigDecimal orderId = utilsMapper.getOrderIdByOrderNumber(orderNumber);
+        //通过运输订单号查找当前是第几次
+        BigDecimal inwardStartTime = utilsMapper.getInwardStartTime(orderId);
+//        System.out.println(inwardStartTime);
+        BigDecimal inwardEndTime = utilsMapper.getInwardEndTime(orderId);
+//        System.out.println(inwardEndTime);
+        int Time=inwardEndTime.intValue()-inwardStartTime.intValue();
+//        System.out.println(Time);
+       if (Time==0) {
+           i=0;
+       }else if (Time==-1){
+           i=1;
+       }else {
+           i=3;
+       }
+        return i;
+    }
 }

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

@@ -144,7 +144,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         BigDecimal orderType = DataChange.dataToBigDecimal(mesMap.get("orderType"));
         //判断是不是内转
-        if(orderType.intValue() == 11){
+        if(orderType.intValue() == 11||orderType.intValue() == 22){
             //如果是内转新增卸货实绩
             Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
             sqe = sqe == null ? 1 : sqe +1;

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

@@ -626,6 +626,19 @@
     where rownum = 1
   </select>
 
+
+  <select id="getLastTimeEnd" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    select *
+    from(
+          SELECT TTTR.RESULT_TIME "resultTime"
+          FROM TMSTRUCK_TIME_TASK_RESULT TTTR
+          WHERE TTTR.RESULT_TOTAL_ID = #{resultTotalId}
+            AND TTTR.RESULT_TIME_TYPE = 7
+          ORDER BY "resultTime" DESC
+        )
+    where rownum = 1
+  </select>
+
 <!--  查询用车单位确认开始时间-->
   <select id="getStartTime" parameterType="java.math.BigDecimal" resultType="java.util.Map">
     SELECT TTTR.RESULT_TIME "resultTime"
@@ -654,61 +667,68 @@
 
   <!-- 查询计时作业 -->
   <select id="getAllTimeTaskResult" resultType="java.util.Map">
-        select RC.CAPACITY_NUMBER "capacityNumber",
-               OO.ORDER_NUMBER "orderNumber",
-               CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME)  AS "resultTime",
-               RCT.CAPACITY_TYPE_NAME "capacityTypeName",
-               TTTR.INSERT_TIME "insertTime",
-           (
-           SELECT TTTR2.RESULT_TIME
-           FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
-           WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-          AND TTTR2.RESULT_TIME_TYPE = 1
-         ) "startTime",
-        (
-         SELECT TTTR2.RESULT_TIME
-         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
-         WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-         AND TTTR2.RESULT_TIME_TYPE = 3
-         ) "endTime",
-          RM.MATERIAL_NAME "materialName",
-          RS.SHIPPER_NAME "shipperName",
-          RW.WAREHOUSE_NAME "unloadPointName",
-          RW2.WAREHOUSE_NAME "loadPointName"
-        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 AMSTRUCK_REQUIREMENT_MATERIAL ARM
-        ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_ID
-         LEFT JOIN RMS_WAREHOUSE RW
-            ON ARM.REQUIREMENT_UNLOAD_UNIT_ID =RW.WAREHOUSE_ID
-            LEFT JOIN RMS_WAREHOUSE RW2
-            ON RW2.WAREHOUSE_ID=ARM.REQUIREMENT_PLATFORM_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=ARM.MATERIAL_ID
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID=OO.ORDER_ID
-        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
-        ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
-        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
-        ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
-        LEFT JOIN  RMS_CAPACITY RC
-        ON RC.CAPACITY_ID=OO.CAPACITY_ID
-        LEFT JOIN RMS_CAPACITY_TYPE RCT
-        ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
-        where TTTR.RESULT_TIME_TYPE = 3  AND   TTTR.RESULT_VALUE IS NOT NULL
+    select RC.CAPACITY_NUMBER "capacityNumber",
+           OO.ORDER_ID "orderId",
+    OO.ORDER_NUMBER "orderNumber",
+    CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME)  AS "resultTime",
+    RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+    TTTR.INSERT_TIME "insertTime",
+    (
+    SELECT TTTR2.RESULT_TIME
+    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+    AND TTTR2.RESULT_TIME_TYPE = 1
+    ) "startTime",
+    (
+    SELECT TTTR2.RESULT_TIME
+    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+    AND TTTR2.RESULT_TIME_TYPE = 3
+    ) "endTime",
+    (
+    SELECT count(TTTR2.RESULT_VALUE)
+    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+    AND TTTR2.RESULT_TIME_TYPE = 7
+    ) "pauseTime",
+    RM.MATERIAL_NAME "materialName",
+    RS.SHIPPER_NAME "shipperName",
+    RW.WAREHOUSE_NAME "unloadPointName",
+    RW2.WAREHOUSE_NAME "loadPointName"
+    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 AMSTRUCK_REQUIREMENT_MATERIAL ARM
+    ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+    LEFT JOIN RMS_WAREHOUSE RW
+    ON ARM.REQUIREMENT_UNLOAD_UNIT_ID =RW.WAREHOUSE_ID
+    LEFT JOIN RMS_WAREHOUSE RW2
+    ON RW2.WAREHOUSE_ID=ARM.REQUIREMENT_PLATFORM_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+    LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON TTR.ORDER_ID=OO.ORDER_ID
+    LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+    ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+    LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+    ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
+    LEFT JOIN  RMS_CAPACITY RC
+    ON RC.CAPACITY_ID=OO.CAPACITY_ID
+    LEFT JOIN RMS_CAPACITY_TYPE RCT
+    ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
+    where TTTR.RESULT_TIME_TYPE = 3  AND   TTTR.RESULT_VALUE IS NOT NULL
     <if test="con!=null">
       AND RC.CAPACITY_NUMBER LIKE #{con} or  RM.MATERIAL_NAME LIKE  #{con}
       or  RS.SHIPPER_NAME LIKE #{con}
     </if>
-    <if test="orgCode!=null">
-      AND oo.INSERT_USERNAME LIKE #{orgCode}
+    <if test="userId!=null">
+      AND oo.INSERT_USERNAME LIKE #{userId}
     </if>
     <where>
       <if test="orderNumber != null">

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

@@ -353,31 +353,42 @@
                       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_CAPACITY_TYPE RCT
-                                  ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
-                        LEFT JOIN RMS_SHIPPER RS
-                                  ON AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
-               WHERE AIR.REQUIREMENT_TYPE = '计次'
+                      AIR.INSERT_TIME           "insertTime",
+                      (
+                          select TWR.RESULT_NET_WEIGHT
+                          from  TMSTRUCK_WEIGHT_RESULT TWR
+                          where TWR.RESULT_TOTAL_ID=TWR2.RESULT_TOTAL_ID
+                          and   TWR.RESULT_NET_WEIGHT is not null
+                      )
+                    "netweight"
+                   FROM AMSTRUCK_INWARD_PLAN AIP
+                   LEFT JOIN OMSTRUCK_ORDER OO
+                   ON OO.ORDER_PLAN_ID = AIP.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 OMSTRUCK_ORDER_MATERIAL OOM
+                   ON OO.ORDER_ID = OOM.ORDER_ID
+                   LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                   ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_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_WEIGHT_RESULT TWR2
+                   ON TTR.RESULT_TOTAL_ID = TWR2.RESULT_TOTAL_ID
+                   LEFT JOIN RMS_WAREHOUSE RW1
+                   ON ARM.REQUIREMENT_PLATFORM_ID = RW1.WAREHOUSE_ID
+                   LEFT JOIN RMS_WAREHOUSE RW2
+                   ON ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW2.WAREHOUSE_ID
+                   LEFT JOIN RMS_CAPACITY RC
+                   ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                   LEFT JOIN RMS_CAPACITY_TYPE RCT
+                   ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+                   LEFT JOIN RMS_SHIPPER RS
+                   ON AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
+                   WHERE AIR.REQUIREMENT_TYPE = '计次' and OO.ORDER_STATUS = 2
            )
     <where>
         <if test="materialName != null">

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

@@ -255,7 +255,7 @@
         order by "insertTime" desc
      </if>
     </select>
-<!-- 根据运输订单id查找两次计时作业id-->
+<!-- 根据运输订单id查找计时结束时间-->
     <select id="FristTimeTask" resultType="java.util.Map" parameterType="java.util.Map">
         select   TTTR.RESULT_TIME "resultTime",
                  TTTR.TIME_TASK_RESULT_ID "timeResultId"
@@ -273,7 +273,7 @@
         ON TTR.ORDER_ID=OO.ORDER_ID
         left join TMSTRUCK_TIME_TASK_RESULT TTTR
         on  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
-        WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE=1
+        WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE  = 1
     </select>
 <!-- 根据运输订单id查找总实绩id-->
     <select id="getTotalIdByOrderId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
@@ -283,4 +283,41 @@
         ON OO.ORDER_ID=TTR.ORDER_ID
        WHERE  OO.ORDER_ID=#{orderId}
     </select>
+    <select id="getInwardType" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        select TTTR.RESULT_TIME_TYPE "resultType"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID=TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE  OO.ORDER_ID=#{orderId}
+    </select>
+    <select id="TimeTaskPause" resultType="java.util.Map" parameterType="java.util.Map">
+        select sum(TTTR.RESULT_VALUE) "resultPauseTime"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE= #{type}
+    </select>
+    <select id="getInwardStartTime" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        select COUNT(TTTR.TIME_TASK_RESULT_ID)
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        left join TMSTRUCK_TIME_TASK_RESULT TTTR
+        on  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE  = 5
+    </select>
+
+    <select id="getInwardEndTime" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        select COUNT(TTTR.TIME_TASK_RESULT_ID)
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        left join TMSTRUCK_TIME_TASK_RESULT TTTR
+        on  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE  = 7
+    </select>
 </mapper>