Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.crypto.Data;
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
@@ -367,16 +368,20 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
      */
     @Override
     public int updateSporadicOrder(Map<String, Object> mapValue) {
-        BigDecimal sporadicOrderId = new BigDecimal((Integer) mapValue.get("sporadicOrderId"));
-        BigDecimal sendUnitId = new BigDecimal((Integer) mapValue.get("sendUnitId"));
-        BigDecimal receiveUnitId = new BigDecimal((Integer) mapValue.get("receiveUnitId"));
-
-        BigDecimal carrierId = new BigDecimal((Integer) mapValue.get("carrierId"));
-        String userId =(String) mapValue.get("userId");
-        AmstruckSporadicOrder amstruckSporadicOrder = amstruckSporadicOrderMapper.selectByPrimaryKey(sporadicOrderId);
-        amstruckSporadicOrder.setSendUnitId(sendUnitId);
-        amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
-        if (carrierId!=null) {
+        AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
+        BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(mapValue.get("sporadicOrderId"));
+        BigDecimal sendUnitId =DataChange.dataToBigDecimal(mapValue.get("sendUnitId"));
+        BigDecimal receiveUnitId = DataChange.dataToBigDecimal(mapValue.get("receiveUnitId"));
+        BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
+        String userId =""+mapValue.get("userId");
+        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
+        if(sendUnitId.compareTo(BigDecimal.ZERO)!=0){
+            amstruckSporadicOrder.setSendUnitId(sendUnitId);
+        }
+        if(receiveUnitId.compareTo(BigDecimal.ZERO)!=0){
+            amstruckSporadicOrder.setReceiveUnitId(receiveUnitId);
+        }
+        if(carrierId.compareTo(BigDecimal.ZERO)!=0){
             amstruckSporadicOrder.setCarrierId(carrierId);
         }
         amstruckSporadicOrder.setUpdateTime(new Date());