“xiugai1”

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

@@ -1495,16 +1495,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
                 BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
                 BigDecimal materialId = DataChange.dataToBigDecimal(orderMaterial.get("materialId"));
-                BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMaterial.get("materialWeight"));
-                BigDecimal materialCount = DataChange.dataToBigDecimal(orderMaterial.get("materialCount"));
                 omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
                 omstruckOrderMaterial.setOrderId(orderId);
                 omstruckOrderMaterial.setMaterialId(materialId);
-                omstruckOrderMaterial.setOrderMaterialNumber(materialCount);
+                if (orderMaterial.get("materialCount")!=null) {
+                    omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(orderMaterial.get("materialCount")));
+                }
                 omstruckOrderMaterial.setInsertTime(new Date());
                 omstruckOrderMaterial.setInsertUsername(userId);
                 omstruckOrderMaterial.setUpdateTime(new Date());
-                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+                if (orderMaterial.get("materialWeight")!=null) {
+                    omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterial.get("materialWeight")));
+                }
                 result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
         }

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}
 

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

@@ -3401,13 +3401,36 @@
         </if>
     </select>
     <select id="getPauseTimeTaskDetail" resultType="java.util.Map" parameterType="java.lang.Integer">
-        select sum(TTTR.RESULT_VALUE) "TotalValue"
+        select  (
+                     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 TTTR2.RESULT_VALUE
+                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                       AND TTTR2.RESULT_TIME_TYPE = 3
+                 ) "totalTime",
+                (
+                    SELECT 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",
         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 TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
-        WHERE  OO.ORDER_ID = #{orderId}  AND TTTR.RESULT_TIME_TYPE =7
+        WHERE  OO.ORDER_ID = #{orderId}
     </select>
 
     <select id="getInwardOrderMessage" resultType="java.util.Map" parameterType="java.util.Map">