机车表修改

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -94,14 +94,14 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
 
     @Override
     public AjaxResult vehicleAdd(BaseVehicle baseVehicle, String userId) {
-        LambdaQueryWrapper<BaseVehicle> wrapper = new LambdaQueryWrapper<BaseVehicle>();
-        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
-            wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
-        }
-        List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
-        if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车号已存在！");
-        }
+//        LambdaQueryWrapper<BaseVehicle> wrapper = new LambdaQueryWrapper<BaseVehicle>();
+//        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+//            wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+//        }
+//        List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
+//        if (baseVehicles.size() > 0) {
+//            return AjaxResult.error("机车号已存在！");
+//        }
         Date date = new Date();
         baseVehicle.setCreateBy(userId);
         baseVehicle.setUpdateBy(userId);
@@ -117,17 +117,17 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
 
     @Override
     public AjaxResult vehicleUpdate(BaseVehicle baseVehicle, String userId) {
-        LambdaQueryWrapper<BaseVehicle> wrapper = new LambdaQueryWrapper<>();
-        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
-            wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
-        }
-        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getId())) {
-            wrapper.ne(BaseVehicle::getId, baseVehicle.getId());
-        }
-        List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
-        if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车号已存在！");
-        }
+//        LambdaQueryWrapper<BaseVehicle> wrapper = new LambdaQueryWrapper<>();
+//        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+//            wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+//        }
+//        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getId())) {
+//            wrapper.ne(BaseVehicle::getId, baseVehicle.getId());
+//        }
+//        List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
+//        if (baseVehicles.size() > 0) {
+//            return AjaxResult.error("机车号已存在！");
+//        }
         baseVehicle.setUpdateBy(userId);
         baseVehicle.setUpdateTime(new Date());
         int update = baseVehicleMapper.updateById(baseVehicle);
@@ -149,12 +149,12 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 BaseVehicle baseVehicle = new BaseVehicle();
                 BeanUtils.copyProperties(baseVehicle2, baseVehicle);
                 // 判断机车号是否存在
-                LambdaQueryWrapper<BaseVehicle> lw = new LambdaQueryWrapper<BaseVehicle>();
-                if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
-                    lw.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
-                }
-                BaseVehicle baseVehicle1 = baseVehicleMapper.selectOne(lw);
-                if (ObjectUtils.isEmpty(baseVehicle1)) {
+//                LambdaQueryWrapper<BaseVehicle> lw = new LambdaQueryWrapper<BaseVehicle>();
+//                if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+//                    lw.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+//                }
+//                BaseVehicle baseVehicle1 = baseVehicleMapper.selectOne(lw);
+//                if (ObjectUtils.isEmpty(baseVehicle1)) {
                     BeanValidators.validateWithException(validator, baseVehicle);
                     baseVehicle.setUpdateBy(userId);
                     baseVehicle.setCreateBy(userId);
@@ -178,10 +178,10 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
 //                        baseVehicleMapper.updateById(baseVehicle);
 //                        successNum++;
 //                        successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 更新成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "已存在");
-                }
+//                } else {
+//                    failureNum++;
+//                    failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "已存在");
+//                }
             } catch (Exception e) {
                 String msg = null;
                 failureNum++;