修改

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

@@ -273,7 +273,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
     }
 
     @PostMapping(value = "/addTmstruckReceiptResult" )
-    public synchronized RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  value , Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
+    public synchronized RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  value, String orderNumber, String resultArrivalAddress) throws Exception {
         Map<String,Object> map = new HashMap<String,Object>();
         map.put("orderNumber",orderNumber);
         map.put("resultArrivalAddress",resultArrivalAddress);

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.model.TmstruckInTransitWarn;
 import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.service.ITmstruckReceiptResultService;
 import com.steerinfo.dil.service.OffSiteTransportationService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.route.mapper.TmstruckArrivalResultMapper;
 import com.steerinfo.route.model.TmstruckReceiptResultChild;
 import com.steerinfo.route.service.ITmstruckReceiptResultChildService;
@@ -252,6 +253,12 @@ public class OffSiteTransportationServiceImpl implements OffSiteTransportationSe
             String resultEmptyContainerPhoto = (String) map.get("url");
             tmstruckReceiptResult.setResultArrivalAddress(resultArrivalAddress);
             tmstruckReceiptResult.setResultEmptyContainerPhoto(resultEmptyContainerPhoto);
+            if(map.get("receiptTime")!=null){
+                tmstruckReceiptResult.setInsertTime(new Date((Long)map.get("receiptTime")));
+                tmstruckReceiptResult.setUpdateTime(new Date());
+            }else{
+                tmstruckReceiptResult.setInsertTime(new Date());
+            }
             //新增收货实绩主表
             BigDecimal receiptResultId = tmstruckReceiptResultService.addTmstruckReceiptResult(orderNumber, tmstruckReceiptResult);
             return 0;

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

@@ -66,7 +66,9 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
         tmstruckReceiptResult.setResultTotalId(truckTotalId);
         //常规字段
         tmstruckReceiptResult.setInsertUsername("admin");
-        tmstruckReceiptResult.setInsertTime(new Date());
+        if(tmstruckReceiptResult.getInsertTime()==null){
+            tmstruckReceiptResult.setInsertTime(new Date());
+        }
         tmstruckReceiptResult.setUpdateUsername("admin");
         tmstruckReceiptResult.setUpdateTime(new Date());
         tmstruckReceiptResult.setInsertUpdateRemark("无");

src/main/java/com/steerinfo/route/controller/TmstruckArrivalResultController.java

@@ -65,15 +65,23 @@ public class TmstruckArrivalResultController extends BaseRESTfulController {
         TmstruckArrivalResult tmstruckArrivalResult = new TmstruckArrivalResult();
         tmstruckArrivalResult.setResultArrivalAddress(resultArrivalAddress);
         tmstruckArrivalResult.setResultFullContainerPhoto(resultFullContainerPhoto);
+        if(map.get("arrivalTime")!=null){
+            tmstruckArrivalResult.setInsertTime(new Date((Long)map.get("arrivalTime")));
+            tmstruckArrivalResult.setUpdateTime(new Date());
+        }
         int i = tmstruckArrivalResultService.addtmstruckArrivalResult(orderNumber,tmstruckArrivalResult);
         return success(i);
     }
 
     @PostMapping(value = "/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(String orderNumber, String resultArrivalAddress, String file) throws Exception {
+    public RESTfulResult addtmstruckArrivalResult(@RequestBody(required=false)Map<String,Object>  map ,String orderNumber, String resultArrivalAddress, String file) throws Exception {
         TmstruckArrivalResult tmstruckArrivalResult = new TmstruckArrivalResult();
         tmstruckArrivalResult.setResultArrivalAddress(resultArrivalAddress);
         tmstruckArrivalResult.setResultFullContainerPhoto(file);
+        if(map.get("arrivalTime")!=null){
+            tmstruckArrivalResult.setInsertTime(new Date((Long)map.get("arrivalTime")));
+            tmstruckArrivalResult.setUpdateTime(new Date());
+        }
         int i = tmstruckArrivalResultService.addtmstruckArrivalResult(orderNumber,tmstruckArrivalResult);
         return success(i);
 

src/main/java/com/steerinfo/route/service/impl/TmstruckArrivalResultServiceImpl.java

@@ -73,7 +73,9 @@ public class TmstruckArrivalResultServiceImpl implements ITmstruckArrivalResultS
         tmstruckArrivalResult.setResultTotalId(truckTotalId);
         //常规字段
         tmstruckArrivalResult.setInsertUsername("admin");
-        tmstruckArrivalResult.setInsertTime(new Date());
+        if(tmstruckArrivalResult.getInsertTime()==null){
+            tmstruckArrivalResult.setInsertTime(new Date());
+        }
         tmstruckArrivalResult.setUpdateUsername("admin");
         tmstruckArrivalResult.setUpdateTime(new Date());
         tmstruckArrivalResult.setInsertUpdateRemark("无");