diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index 2b10135..0fc9392 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -81,7 +81,7 @@ public class CustomerController { .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) .eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) - .orderByAsc(LngCustomer::getCuCode); + .orderByDesc(LngCustomer::getCuCode); IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); return R.ok(pageOutput); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java index d86faa9..edacea8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java @@ -133,7 +133,18 @@ public class CustomerScoreController { @ApiOperation(value = "删除") @SaCheckPermission("scoreCustomer:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + //execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index 73fb9e4..355316e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -106,8 +106,7 @@ public class SupplierController { @SaCheckPermission("supplier:add") public R add(@Valid @RequestBody UpdateLngSupplierDto dto){ String code = codeRuleClient.genEncode(SUPPLIER_CODE); - dto.setSuCode("S"+code); - //UpdateLngSupplierDto res = dataService.insert(dto); + dto.setSuCode("GEG-S"+code); return R.ok(dataService.insert(dto,new DataOperationListener() { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java index e1da27e..aaa8fd4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java @@ -130,7 +130,17 @@ public class SupplierScoreController { @ApiOperation(value = "删除") @SaCheckPermission("scoreSupplier:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + return content.getObj(); + } + })); }