diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java index 5e189fd..0e360fb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java @@ -346,7 +346,7 @@ public class PollingTaskServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public long updateTerminalAndStore(TerminalQuery query) { - /** - * 当前终端 - */ Terminal curTerminal = getById(query.getTerminalId()); AssertUtil.invalidate(ObjectUtil.isEmpty(curTerminal), "未找寻到对应的终端信息"); - Terminal terminal = BeanCopyUtils.copy(query, Terminal.class); - updateById(terminal); - Store store = BeanCopyUtils.copy(query, Store.class); + curTerminal.setTerminalNo(query.getTerminalNo()); + curTerminal.setTerminalSn(query.getTerminalSn()); + curTerminal.setTerminalAddress(query.getTerminalAddress()); + curTerminal.setTerminalModel(query.getTerminalModel()); + curTerminal.setTerminalType(query.getTerminalType()); + curTerminal.setTerminalSource(query.getTerminalSource()); + updateById(curTerminal); + Store store = new Store(); store.setStoreId(curTerminal.getStoreId()); + store.setStoreNo(query.getStoreNo()); + store.setStoreName(query.getStoreName()); + store.setState(query.getStoreState()); storeService.updateById(store); return query.getTerminalId(); }