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 10:37:46 +08:00
parent 0519a62d09
commit 42124fd8db
23 changed files with 185 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
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.authority.dto.BatchSetDataAuthDto;
@ -89,6 +90,16 @@ 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());
}
@ -97,6 +108,16 @@ 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));
}

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

@ -35,7 +35,7 @@ import java.util.List;
/**
* @title: 币种管理
* @Author 管理员
* @Date: 2025-10-21
* @Date: 2025-10-22
* @Version 1.0
*/
@RestController

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

@ -35,7 +35,7 @@ import java.util.List;
/**
* @title: 价格条款管理
* @Author 管理员
* @Date: 2025-10-20
* @Date: 2025-10-22
* @Version 1.0
*/
@RestController
@ -59,7 +59,7 @@ public class PriceTermsController {
.like(StrUtil.isNotBlank(dto.getFullName()),LngBPriceTerm::getFullName,dto.getFullName())
.like(StrUtil.isNotBlank(dto.getFreightSign()),LngBPriceTerm::getFreightSign,dto.getFreightSign())
.like(StrUtil.isNotBlank(dto.getInsuranceSign()),LngBPriceTerm::getInsuranceSign,dto.getInsuranceSign())
//.like(StrUtil.isNotBlank(dto.getSort()),LngBPriceTerm::getSort,dto.getSort())
.like(StrUtil.isNotBlank(dto.getSort()),LngBPriceTerm::getSort,dto.getSort())
.like(StrUtil.isNotBlank(dto.getValid()),LngBPriceTerm::getValid,dto.getValid())
.like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote())
.orderByAsc(LngBPriceTerm::getCode)

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java
View File

@ -20,7 +20,7 @@ import java.util.List;
/**
* @title: 币种管理
* @Author 管理员
* @Date: 2025-10-21
* @Date: 2025-10-22
* @Version 1.0
*/
@Data

66
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.java
View File

@ -20,7 +20,7 @@ import java.util.List;
/**
* @title: 价格条款管理
* @Author 管理员
* @Date: 2025-10-20
* @Date: 2025-10-22
* @Version 1.0
*/
@Data
@ -31,107 +31,107 @@ public class LngBPriceTerm implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
* 主键
*/
@ApiModelProperty("")
@ApiModelProperty("主键")
@TableId
private Long id;
/**
*
* 助记码(FOB/DES/……)
*/
@ApiModelProperty("")
@ApiModelProperty("助记码(FOB/DES/……)")
private String code;
/**
*
* 名称(不能重复)
*/
@ApiModelProperty("")
@ApiModelProperty("名称(不能重复)")
private String fullName;
/**
*
* 是否承担运费(Y-是，N-否)
*/
@ApiModelProperty("")
@ApiModelProperty("是否承担运费(Y-是，N-否)")
private String freightSign;
/**
*
* 是否承担保险(Y-是，N-否)
*/
@ApiModelProperty("")
@ApiModelProperty("是否承担保险(Y-是，N-否)")
private String insuranceSign;
/**
*
* 显示顺序
*/
@ApiModelProperty("")
@ApiModelProperty("显示顺序")
private Short sort;
/**
*
* 有效标志(Y-有效，N-无效)
*/
@ApiModelProperty("")
@ApiModelProperty("有效标志(Y-有效，N-无效)")
private String valid;
/**
*
* 备注
*/
@ApiModelProperty("")
@ApiModelProperty("备注")
private String note;
/**
*
* 创建人id
*/
@ApiModelProperty("")
@ApiModelProperty("创建人id")
@TableField(fill = FieldFill.INSERT)
private Long createUserId;
/**
*
* 创建时间
*/
@ApiModelProperty("")
@ApiModelProperty("创建时间")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createDate;
/**
*
* 修改人id
*/
@ApiModelProperty("")
@ApiModelProperty("修改人id")
@TableField(fill = FieldFill.UPDATE)
private Long modifyUserId;
/**
*
* 修改时间
*/
@ApiModelProperty("")
@ApiModelProperty("修改时间")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime modifyDate;
/**
*
* 逻辑删除
*/
@ApiModelProperty("")
@ApiModelProperty("逻辑删除")
@TableField(fill = FieldFill.INSERT)
@TableLogic
private Integer deleteMark;
/**
*
* 租户id
*/
@ApiModelProperty("")
@ApiModelProperty("租户id")
private Long tenantId;
/**
*
* 部门id
*/
@ApiModelProperty("")
@ApiModelProperty("部门id")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
/**
*
* 数据权限id
*/
@ApiModelProperty("")
@ApiModelProperty("数据权限id")
@TableField(fill = FieldFill.INSERT)
private Long ruleUserId;

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2025-10-21
* @Date: 2025-10-22
* @Version 1.0
*/
@Mapper

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2025-10-20
* @Date: 2025-10-22
* @Version 1.0
*/
@Mapper

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

@ -11,7 +11,7 @@ import java.util.List;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-21
* @Date: 2025-10-22
* @Version 1.0
*/

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

@ -11,7 +11,7 @@ import java.util.List;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-20
* @Date: 2025-10-22
* @Version 1.0
*/

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-21
* @Date: 2025-10-22
* @Version 1.0
*/
@Service

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-20
* @Date: 2025-10-22
* @Version 1.0
*/
@Service