geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source
This commit is contained in:
张秉卓
2026-01-12 17:57:06 +08:00
parent 1956179c08 d118b1db45
commit a02370dd6f
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java
View File

@ -81,7 +81,7 @@ public class CustomerController {
.like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode())
.eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode())
.orderByAsc(LngCustomer::getCuCode); .orderByDesc(LngCustomer::getCuCode);
IPage<LngCustomer> page = customerService.page(ConventPage.getPage(dto), queryWrapper); IPage<LngCustomer> page = customerService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngCustomerPageVo> pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); PageOutput<LngCustomerPageVo> pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class);
return R.ok(pageOutput); return R.ok(pageOutput);

13
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java
View File

@ -133,7 +133,18 @@ public class CustomerScoreController {
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
@SaCheckPermission("scoreCustomer:delete") @SaCheckPermission("scoreCustomer:delete")
public R delete(@Valid @RequestBody List<Long> ids){ public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids, new DataOperationListener<UpdateLngScoreDto>() {
@Override
public UpdateLngScoreDto before(DataOperationContent<UpdateLngScoreDto> content) {
return null;
}
@Override
public UpdateLngScoreDto after(DataOperationContent<UpdateLngScoreDto> content) {
//execAfter(content.getTableName(), content.getIdValue(), "I");
return content.getObj();
}
}));
} }

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java
View File

@ -106,8 +106,7 @@ public class SupplierController {
@SaCheckPermission("supplier:add") @SaCheckPermission("supplier:add")
public R add(@Valid @RequestBody UpdateLngSupplierDto dto){ public R add(@Valid @RequestBody UpdateLngSupplierDto dto){
String code = codeRuleClient.genEncode(SUPPLIER_CODE); String code = codeRuleClient.genEncode(SUPPLIER_CODE);
dto.setSuCode("S"+code); dto.setSuCode("GEG-S"+code);
//UpdateLngSupplierDto res = dataService.insert(dto);
return R.ok(dataService.insert(dto,new DataOperationListener<UpdateLngSupplierDto>() { return R.ok(dataService.insert(dto,new DataOperationListener<UpdateLngSupplierDto>() {

12
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java
View File

@ -130,7 +130,17 @@ public class SupplierScoreController {
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
@SaCheckPermission("scoreSupplier:delete") @SaCheckPermission("scoreSupplier:delete")
public R delete(@Valid @RequestBody List<Long> ids){ public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids, new DataOperationListener<UpdateLngScoreDto>() {
@Override
public UpdateLngScoreDto before(DataOperationContent<UpdateLngScoreDto> content) {
return null;
}
@Override
public UpdateLngScoreDto after(DataOperationContent<UpdateLngScoreDto> content) {
return content.getObj();
}
}));
} }