|
@@ -66,7 +66,7 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
|
|
|
case "UserId":
|
|
case "UserId":
|
|
|
int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
|
KxsUser user = kxsUserMapper.selectById(userId);
|
|
KxsUser user = kxsUserMapper.selectById(userId);
|
|
|
- if (user != null){
|
|
|
|
|
|
|
+ if (user != null) {
|
|
|
machineRecycle.setUsername(user.getUsername());
|
|
machineRecycle.setUsername(user.getUsername());
|
|
|
machineRecycle.setPhone(user.getPhone());
|
|
machineRecycle.setPhone(user.getPhone());
|
|
|
machineRecycle.setUserCode(user.getUserCode());
|
|
machineRecycle.setUserCode(user.getUserCode());
|
|
@@ -76,16 +76,16 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
|
|
|
case "RecycStoreId":
|
|
case "RecycStoreId":
|
|
|
int storeId = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
int storeId = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
|
KxsWarehouse warehouse = kxsWarehouseMapper.selectById(storeId);
|
|
KxsWarehouse warehouse = kxsWarehouseMapper.selectById(storeId);
|
|
|
- if(warehouse != null){
|
|
|
|
|
|
|
+ if (warehouse != null) {
|
|
|
machineRecycle.setWarehouseUserId(warehouse.getUserId());
|
|
machineRecycle.setWarehouseUserId(warehouse.getUserId());
|
|
|
}
|
|
}
|
|
|
machineRecycle.setWarehouseId(storeId);
|
|
machineRecycle.setWarehouseId(storeId);
|
|
|
break;
|
|
break;
|
|
|
case "PostType":
|
|
case "PostType":
|
|
|
int posType = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
int posType = Integer.parseInt(validFieldDataMap.get(field).toString());
|
|
|
- if(posType == 2){
|
|
|
|
|
|
|
+ if (posType == 2) {
|
|
|
machineRecycle.setGetMode(0);
|
|
machineRecycle.setGetMode(0);
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
machineRecycle.setGetMode(1);
|
|
machineRecycle.setGetMode(1);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
@@ -98,7 +98,7 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
|
|
|
case "BrandId":
|
|
case "BrandId":
|
|
|
Integer brandId = Integer.valueOf(validFieldDataMap.get(field).toString());
|
|
Integer brandId = Integer.valueOf(validFieldDataMap.get(field).toString());
|
|
|
KxsBrand brand = kxsBrandMapper.selectById(brandId);
|
|
KxsBrand brand = kxsBrandMapper.selectById(brandId);
|
|
|
- if(brand != null){
|
|
|
|
|
|
|
+ if (brand != null) {
|
|
|
machineRecycle.setBrandName(brand.getName());
|
|
machineRecycle.setBrandName(brand.getName());
|
|
|
}
|
|
}
|
|
|
machineRecycle.setBrandId(brandId);
|
|
machineRecycle.setBrandId(brandId);
|
|
@@ -110,18 +110,20 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
|
|
|
machineRecycle.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
machineRecycle.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
- KxsMachineRecycle kxsMachineRecycle = baseMapper.selectById(machineRecycle.getId());
|
|
|
|
|
- if(operation.equals(OperationType.INSERT)){
|
|
|
|
|
- if(kxsMachineRecycle == null){
|
|
|
|
|
- baseMapper.insert(machineRecycle);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ KxsMachineRecycle kxsMachineRecycle = baseMapper.selectById(machineRecycle.getId());
|
|
|
|
|
+ if(operation.equals(OperationType.INSERT)){
|
|
|
|
|
+ if(kxsMachineRecycle == null){
|
|
|
|
|
+ baseMapper.insert(machineRecycle);
|
|
|
}
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- if(operation.equals(OperationType.UPDATE)){
|
|
|
|
|
|
|
+ if(operation.equals(OperationType.UPDATE)){
|
|
|
|
|
|
|
|
- baseMapper.updateById(machineRecycle);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ baseMapper.updateById(machineRecycle);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|