diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java new file mode 100644 index 0000000..bb2b18e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java @@ -0,0 +1,60 @@ +package com.xjrsoft.module.mdm.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBCurrencyPageDto extends PageInput { + + /** + * 助记码(USD/CNY) + */ + @ApiModelProperty("助记码(USD/CNY)") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 符号 + */ + @ApiModelProperty("符号") + private String currSymbol; + /** + * 是否本币(Y-是，N-否；只能有一个有效的Y) + */ + @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") + private String localSign; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java new file mode 100644 index 0000000..c8973a0 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java @@ -0,0 +1,100 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 币种管理 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_currency",name="币种管理") +public class UpdateLngBCurrencyDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 助记码(USD/CNY) + */ + @LogField(name="助记码(USD/CNY)",index=1) + @ApiModelProperty("助记码(USD/CNY)") + private String code; + + /** + * 名称(不能重复) + */ + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 符号 + */ + @LogField(name="符号",index=3) + @ApiModelProperty("符号") + private String currSymbol; + + /** + * 是否本币(Y-是，N-否；只能有一个有效的Y) + */ + @LogField(name="是否本币(Y-是，N-否；只能有一个有效的Y)",index=4) + @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") + private String localSign; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=5) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @LogField(name="有效标志(Y-有效，N-无效)",index=6) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java new file mode 100644 index 0000000..8828189 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java @@ -0,0 +1,65 @@ +package com.xjrsoft.module.mdm.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Data +public class LngBCurrencyPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 助记码(USD/CNY) + */ + @ApiModelProperty("助记码(USD/CNY)") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 符号 + */ + @ApiModelProperty("符号") + private String currSymbol; + /** + * 是否本币(Y-是，N-否；只能有一个有效的Y) + */ + @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") + @Trans(type = TransType.DIC, id = "1978056598125330433") + private String localSign; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.java new file mode 100644 index 0000000..ed4093b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.java @@ -0,0 +1,128 @@ +package com.xjrsoft.module.mdm.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Data +public class LngBCurrencyVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 助记码(USD/CNY) + */ + @ApiModelProperty("助记码(USD/CNY)") + private String code; + + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + + /** + * 符号 + */ + @ApiModelProperty("符号") + private String currSymbol; + + + /** + * 是否本币(Y-是，N-否；只能有一个有效的Y) + */ + @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") + private String localSign; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java new file mode 100644 index 0000000..524f2ad --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java @@ -0,0 +1,107 @@ +package com.xjrsoft.module.mdm.controller; + +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.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.mdm.dto.AddLngBCurrencyDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBCurrencyDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBCurrencyPageDto; +import com.xjrsoft.module.mdm.entity.LngBCurrency; +import com.xjrsoft.module.mdm.service.ICurrencyService; +import com.xjrsoft.module.mdm.vo.LngBCurrencyPageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBCurrencyVo; +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: 币种管理 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/currency") +@Api(value = "/mdm" + "/currency",tags = "币种管理代码") +@AllArgsConstructor +public class CurrencyController { + + + private final ICurrencyService currencyService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBCurrency列表(分页)") + @SaCheckPermission("currency:list") + public R page(@Valid LngBCurrencyPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getCode()),LngBCurrency::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getFullName()),LngBCurrency::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getCurrSymbol()),LngBCurrency::getCurrSymbol,dto.getCurrSymbol()) + .like(StrUtil.isNotBlank(dto.getLocalSign()),LngBCurrency::getLocalSign,dto.getLocalSign()) + .like(StrUtil.isNotBlank(dto.getSort()),LngBCurrency::getSort,dto.getSort()) + .like(StrUtil.isNotBlank(dto.getValid()),LngBCurrency::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBCurrency::getNote,dto.getNote()) + .orderByDesc(LngBCurrency::getId) + .select(LngBCurrency.class,x -> VoToColumnUtil.fieldsToColumns(LngBCurrencyPageVo.class).contains(x.getProperty())); + IPage page = currencyService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBCurrencyPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBCurrency信息") + @SaCheckPermission("currency:detail") + public R info(@RequestParam Long id){ + LngBCurrency lngBCurrency = currencyService.getById(id); + if (lngBCurrency == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBCurrency, LngBCurrencyVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBCurrency") + @SaCheckPermission("currency:add") + public R add(@Valid @RequestBody UpdateLngBCurrencyDto dto){ + UpdateLngBCurrencyDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBCurrency") + @SaCheckPermission("currency:edit") + public R update(@Valid @RequestBody UpdateLngBCurrencyDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("currency:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); + + } + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 6451f75..199b8ad 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -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) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java new file mode 100644 index 0000000..467c416 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java @@ -0,0 +1,140 @@ +package com.xjrsoft.module.mdm.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 币种管理 +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_currency") +@ApiModel(value = "币种管理对象", description = "币种管理") +public class LngBCurrency implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 助记码(USD/CNY) + */ + @ApiModelProperty("助记码(USD/CNY)") + private String code; + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 符号 + */ + @ApiModelProperty("符号") + private String currSymbol; + + /** + * 是否本币(Y-是，N-否；只能有一个有效的Y) + */ + @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") + private String localSign; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 逻辑删除 + */ + @ApiModelProperty("逻辑删除") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java new file mode 100644 index 0000000..d6a6a55 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.mdm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.mdm.entity.LngBCurrency; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Mapper +public interface LngBCurrencyMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.java new file mode 100644 index 0000000..70b42a5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.mdm.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.mdm.entity.LngBCurrency; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ + +public interface ICurrencyService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java new file mode 100644 index 0000000..f1b92c2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.mdm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.mdm.entity.LngBCurrency; +import com.xjrsoft.module.mdm.mapper.LngBCurrencyMapper; +import com.xjrsoft.module.mdm.service.ICurrencyService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-21 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class CurrencyServiceImpl extends ServiceImpl implements ICurrencyService { +}