问题修改

3 years ago · d2df9da3e9
2 changed files with 147 additions and 1 deletions
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@ -160,7 +160,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
            if (null == baseVehicle)
                baseVehicle = new BaseVehicle();

-            BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
+            baseVehicleService.copyToBean(baseVehicleDto,baseVehicle);
+            //BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
            //更新车辆台账数据
            if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
                baseVehicleService.updateVeh(baseVehicle);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -49,6 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@ -1854,4 +1855,148 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        return rb.setMsg("调车入库新增调入方车辆台账数据失败");

    }
+
+    public void copyToBean(BaseVehicleDto dto,BaseVehicle baseVehicle) {
+        if (StringUtils.isNotBlank(dto.getMaterialSid())){
+            baseVehicle.setMaterialSid(dto.getMaterialSid());
+        }
+        if (StringUtils.isNotBlank(dto.getModelSid())){
+            baseVehicle.setModelSid(dto.getModelSid());
+        }
+        if (StringUtils.isNotBlank(dto.getVehicleState())){
+            baseVehicle.setVehicleState(dto.getVehicleState());
+        }
+        if (StringUtils.isNotBlank(dto.getVehicleStateValue())){
+            baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
+        }
+        if (StringUtils.isNotBlank(dto.getModelName())){
+            baseVehicle.setModelName(dto.getModelName());
+        }
+        if (StringUtils.isNotBlank(dto.getConfigName())){
+            baseVehicle.setConfigName(dto.getConfigName());
+        }
+        if (StringUtils.isNotBlank(dto.getModelConfigSid())){
+            baseVehicle.setModelConfigSid(dto.getModelConfigSid());
+        }
+        if (StringUtils.isNotBlank(dto.getSpecialInstructions())){
+            baseVehicle.setSpecialInstructions(dto.getSpecialInstructions());
+        }
+        if (StringUtils.isNotBlank(dto.getVinNo())){
+            baseVehicle.setVinNo(dto.getVinNo());
+        }
+        if (StringUtils.isNotBlank(dto.getEngineNo())){
+            baseVehicle.setEngineNo(dto.getEngineNo());
+        }
+        if (StringUtils.isNotBlank(dto.getOrderingNo())){
+            baseVehicle.setOrderingNo(dto.getOrderingNo());
+        }
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeKey())){
+            baseVehicle.setManPurOrderTypeKey(dto.getManPurOrderTypeKey());
+        }
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeValue())){
+            baseVehicle.setManPurOrderTypeValue(dto.getManPurOrderTypeValue());
+        }
+        if (StringUtils.isNotBlank(dto.getPriceDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setPriceDate(simpleDateFormat.parse(dto.getPriceDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getDepartureDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setDepartureDate(simpleDateFormat.parse(dto.getDepartureDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getArrivalDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setArrivalDate(simpleDateFormat.parse(dto.getArrivalDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getSalesDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setSalesDate(simpleDateFormat.parse(dto.getSalesDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getSolidDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setSolidDate(simpleDateFormat.parse(dto.getSolidDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getSettlementStatus())){
+            baseVehicle.setSettlementStatus(dto.getSettlementStatus());
+        }
+        if (StringUtils.isNotBlank(dto.getSettlementStatusValue())){
+            baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
+        }
+        if (StringUtils.isNotBlank(dto.getReturnDate())){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                baseVehicle.setReturnDate(simpleDateFormat.parse(dto.getReturnDate()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getLocation())){
+            baseVehicle.setLocation(dto.getLocation());
+        }
+        if (StringUtils.isNotBlank(dto.getLocationName())){
+            baseVehicle.setLocationName(dto.getLocationName());
+        }
+        if (dto.getCostPrice() != null){
+            baseVehicle.setCostPrice(dto.getCostPrice());
+        }
+        if (dto.getContractPrice() != null){
+            baseVehicle.setContractPrice(dto.getContractPrice());
+        }
+        if (dto.getSalePrice() != null){
+            baseVehicle.setSalePrice(dto.getSalePrice());
+        }
+        if (StringUtils.isNotBlank(dto.getWarrantyCardNo())){
+            baseVehicle.setWarrantyCardNo(dto.getWarrantyCardNo());
+        }
+        if (StringUtils.isNotBlank(dto.getLockedState())){
+            baseVehicle.setLockedState(dto.getLockedState());
+        }
+        if (StringUtils.isNotBlank(dto.getLockedStateValue())){
+            baseVehicle.setLockedStateValue(dto.getLockedStateValue());
+        }
+        if (StringUtils.isNotBlank(dto.getCreateOrgSid())){
+            baseVehicle.setCreateOrgSid(dto.getCreateOrgSid());
+        }
+        if (StringUtils.isNotBlank(dto.getCreateOrgName())){
+            baseVehicle.setCreateOrgName(dto.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(dto.getUseOrgSid())){
+            baseVehicle.setUseOrgSid(dto.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(dto.getUseOrgName())){
+            baseVehicle.setUseOrgName(dto.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(dto.getInsideCode())){
+            baseVehicle.setInsideCode(dto.getInsideCode());
+        }
+        if (dto.getFreight() != null){
+            baseVehicle.setFreight(dto.getFreight());
+        }
+        if (StringUtils.isNotBlank(dto.getWitPinState())){
+            baseVehicle.setWitPinState(dto.getWitPinState());
+        }
+        if (StringUtils.isNotBlank(dto.getWitPinStateValue())){
+            baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
+        }
+    }
 }