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

重新生成

Browse Source
This commit is contained in:
t-shunyi.kuang
2025-10-22 14:26:32 +08:00
parent 83625ace78
commit 71b4e5419c
4 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java
View File

@ -31,5 +31,25 @@ public class LngBPriceTermPageDto extends PageInput {
*/
@ApiModelProperty("有效标志(Y-有效，N-无效)")
private String valid;
/**
* 助记码(FOB/DES/……)
*/
@ApiModelProperty("助记码(FOB/DES/……)")
private String code;
/**
* 是否承担运费(Y-是，N-否)
*/
@ApiModelProperty("是否承担运费(Y-是，N-否)")
private String freightSign;
/**
* 是否承担保险(Y-是，N-否)
*/
@ApiModelProperty("是否承担保险(Y-是，N-否)")
private String insuranceSign;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

45
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java
View File

@ -1,41 +1,40 @@
package com.xjrsoft.module.mdm.controller;
import java.util.ArrayList;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.xjrsoft.common.constant.GlobalConstant;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
import com.xjrsoft.module.datalog.entity.DataChangeLog;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.mdm.dto.LngBBankPageDto;
import com.xjrsoft.module.mdm.dto.AddLngBBankDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.xjrsoft.module.mdm.dto.LngBBankPageDto;
import com.xjrsoft.module.mdm.entity.LngBBank;
import com.xjrsoft.module.mdm.service.IBankService;
import com.xjrsoft.module.mdm.vo.LngBBankPageVo;
import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
import java.util.stream.Collectors;
import java.util.ArrayList;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.datalog.entity.DataChangeLog;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.mdm.vo.LngBBankVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @title: 银行

30
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -24,7 +24,6 @@ import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto;
import com.xjrsoft.module.mdm.entity.LngBRegion;
import com.xjrsoft.module.mdm.enums.CountryRegionEnum;
import com.xjrsoft.module.mdm.service.ICountryRegionService;
import com.xjrsoft.module.mdm.vo.LngBRegionPageVo;
import com.xjrsoft.module.mdm.vo.LngBRegionVo;
@ -98,16 +97,6 @@ public class CountryRegionController {
@ApiOperation(value = "新增LngBRegion")
@SaCheckPermission("countryRegion:add")
public R add(@Valid @RequestBody UpdateLngBRegionDto dto){
if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) {
if(dto.getPid() != null && dto.getPid() != 0) {
LngBRegion parentRegion = countryRegionService.getById(dto.getPid());
if(parentRegion != null) {
dto.setFullPath(parentRegion.getFullPath()+dto.getFullName());
}
}
}else {
dto.setFullPath(dto.getFullName());
}
UpdateLngBRegionDto res = dataService.insert(dto);
return R.ok(res.getId());
}
@ -116,16 +105,6 @@ public class CountryRegionController {
@ApiOperation(value = "修改LngBRegion")
@SaCheckPermission("countryRegion:edit")
public R update(@Valid @RequestBody UpdateLngBRegionDto dto){
if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) {
if(dto.getPid() != null && dto.getPid() != 0) {
LngBRegion parentRegion = countryRegionService.getById(dto.getPid());
if(parentRegion != null) {
dto.setFullPath(parentRegion.getFullPath()+dto.getFullName());
}
}
}else {
dto.setFullPath(dto.getFullName());
}
return R.ok(dataService.updateById(dto));
}
@ -133,9 +112,16 @@ public class CountryRegionController {
@ApiOperation(value = "删除")
@SaCheckPermission("countryRegion:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids));
return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids));
}
@GetMapping(value = "/tree")
@ApiOperation(value = "LngBRegion树形结构")
//@SaCheckPermission("countryRegion:edit")
public R tree(@Valid @RequestBody UpdateLngBRegionDto dto){
return R.ok(null);
}
}

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java
View File

@ -58,6 +58,10 @@ public class PriceTermsController {
queryWrapper
.like(StrUtil.isNotBlank(dto.getFullName()),LngBPriceTerm::getFullName,dto.getFullName())
.like(StrUtil.isNotBlank(dto.getValid()),LngBPriceTerm::getValid,dto.getValid())
.like(StrUtil.isNotBlank(dto.getCode()),LngBPriceTerm::getCode,dto.getCode())
.like(StrUtil.isNotBlank(dto.getFreightSign()),LngBPriceTerm::getFreightSign,dto.getFreightSign())
.like(StrUtil.isNotBlank(dto.getInsuranceSign()),LngBPriceTerm::getInsuranceSign,dto.getInsuranceSign())
.like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote())
.orderByDesc(LngBPriceTerm::getId)
.select(LngBPriceTerm.class,x -> VoToColumnUtil.fieldsToColumns(LngBPriceTermPageVo.class).contains(x.getProperty()));
IPage<LngBPriceTerm> page = priceTermsService.page(ConventPage.getPage(dto), queryWrapper);