diff --git a/.gitignore b/.gitignore index 57faaab..452d992 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ target **/target !**/target /logs +**/target/ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java new file mode 100644 index 0000000..17a39ec --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java @@ -0,0 +1,80 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 价格条款管理 +* @Author 管理员 +* @Date: 2025-10-20 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_price_term",name="价格条款管理") +public class AddLngBPriceTermDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String code; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String fullName; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String freightSign; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String insuranceSign; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Short sort; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String valid; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String note; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java new file mode 100644 index 0000000..d8a21ea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.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-20 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBPriceTermPageDto extends PageInput { + + /** + * + */ + @ApiModelProperty("") + private String code; + /** + * + */ + @ApiModelProperty("") + private String fullName; + /** + * + */ + @ApiModelProperty("") + private String freightSign; + /** + * + */ + @ApiModelProperty("") + private String insuranceSign; + /** + * + */ + @ApiModelProperty("") + private Short sort; + /** + * + */ + @ApiModelProperty("") + 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/UpdateLngBPriceTermDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPriceTermDto.java new file mode 100644 index 0000000..6253917 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPriceTermDto.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-20 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_price_term",name="价格条款管理") +public class UpdateLngBPriceTermDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @LogField(name="",index=0) + @ApiModelProperty("") + private Long id; + + /** + * + */ + @LogField(name="",index=1) + @ApiModelProperty("") + private String code; + + /** + * + */ + @LogField(name="",index=2) + @ApiModelProperty("") + private String fullName; + + /** + * + */ + @LogField(name="",index=3) + @ApiModelProperty("") + private String freightSign; + + /** + * + */ + @LogField(name="",index=4) + @ApiModelProperty("") + private String insuranceSign; + + /** + * + */ + @LogField(name="",index=5) + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @LogField(name="",index=6) + @ApiModelProperty("") + private String valid; + + /** + * + */ + @LogField(name="",index=7) + @ApiModelProperty("") + private String note; + + /** + * + */ + @LogField(name="",index=8) + @ApiModelProperty("") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java new file mode 100644 index 0000000..fecc794 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java @@ -0,0 +1,66 @@ +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-20 +* @Version 1.0 +*/ +@Data +public class LngBPriceTermPageVo { + + /** + * + */ + @ApiModelProperty("") + private String id; + /** + * + */ + @ApiModelProperty("") + private String code; + /** + * + */ + @ApiModelProperty("") + private String fullName; + /** + * + */ + @ApiModelProperty("") + @Trans(type = TransType.DIC, id = "1978056598125330433") + private String freightSign; + /** + * + */ + @ApiModelProperty("") + @Trans(type = TransType.DIC, id = "1978056598125330433") + private String insuranceSign; + /** + * + */ + @ApiModelProperty("") + private Short sort; + /** + * + */ + @ApiModelProperty("") + @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/LngBPriceTermVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.java new file mode 100644 index 0000000..d8aaec2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.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-20 +* @Version 1.0 +*/ +@Data +public class LngBPriceTermVo { + + /** + * + */ + @ApiModelProperty("") + private Long id; + + + /** + * + */ + @ApiModelProperty("") + private String code; + + + /** + * + */ + @ApiModelProperty("") + private String fullName; + + + /** + * + */ + @ApiModelProperty("") + private String freightSign; + + + /** + * + */ + @ApiModelProperty("") + private String insuranceSign; + + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + + /** + * + */ + @ApiModelProperty("") + private String valid; + + + /** + * + */ + @ApiModelProperty("") + private String note; + + + /** + * + */ + @ApiModelProperty("") + private Long createUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime createDate; + + + /** + * + */ + @ApiModelProperty("") + private Long modifyUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime modifyDate; + + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + + /** + * + */ + @ApiModelProperty("") + private Long deptId; + + + /** + * + */ + @ApiModelProperty("") + private Long ruleUserId; + + + + + +} 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 new file mode 100644 index 0000000..6451f75 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.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.AddLngBPriceTermDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBPriceTermDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBPriceTermPageDto; +import com.xjrsoft.module.mdm.entity.LngBPriceTerm; +import com.xjrsoft.module.mdm.service.IPriceTermsService; +import com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBPriceTermVo; +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-20 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/priceTerms") +@Api(value = "/mdm" + "/priceTerms",tags = "价格条款管理代码") +@AllArgsConstructor +public class PriceTermsController { + + + private final IPriceTermsService priceTermsService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBPriceTerm列表(分页)") + @SaCheckPermission("priceTerms:list") + public R page(@Valid LngBPriceTermPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getCode()),LngBPriceTerm::getCode,dto.getCode()) + .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.getValid()),LngBPriceTerm::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote()) + .orderByAsc(LngBPriceTerm::getCode) + .select(LngBPriceTerm.class,x -> VoToColumnUtil.fieldsToColumns(LngBPriceTermPageVo.class).contains(x.getProperty())); + IPage page = priceTermsService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPriceTermPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBPriceTerm信息") + @SaCheckPermission("priceTerms:detail") + public R info(@RequestParam Long id){ + LngBPriceTerm lngBPriceTerm = priceTermsService.getById(id); + if (lngBPriceTerm == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBPriceTerm, LngBPriceTermVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBPriceTerm") + @SaCheckPermission("priceTerms:add") + public R add(@Valid @RequestBody UpdateLngBPriceTermDto dto){ + UpdateLngBPriceTermDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBPriceTerm") + @SaCheckPermission("priceTerms:edit") + public R update(@Valid @RequestBody UpdateLngBPriceTermDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("priceTerms:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBPriceTermDto.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/entity/LngBPriceTerm.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.java new file mode 100644 index 0000000..8453cfd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.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-20 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_price_term") +@ApiModel(value = "价格条款管理对象", description = "价格条款管理") +public class LngBPriceTerm implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @TableId + private Long id; + + /** + * + */ + @ApiModelProperty("") + private String code; + + /** + * + */ + @ApiModelProperty("") + private String fullName; + + /** + * + */ + @ApiModelProperty("") + private String freightSign; + + /** + * + */ + @ApiModelProperty("") + private String insuranceSign; + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @ApiModelProperty("") + private String valid; + + /** + * + */ + @ApiModelProperty("") + private String note; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * + */ + @ApiModelProperty("") + @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/LngBPriceTermMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.java new file mode 100644 index 0000000..65ba9a5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.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.LngBPriceTerm; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-20 +* @Version 1.0 +*/ +@Mapper +public interface LngBPriceTermMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java new file mode 100644 index 0000000..a662068 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.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.LngBPriceTerm; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-20 +* @Version 1.0 +*/ + +public interface IPriceTermsService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java new file mode 100644 index 0000000..58cb560 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.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.LngBPriceTerm; +import com.xjrsoft.module.mdm.mapper.LngBPriceTermMapper; +import com.xjrsoft.module.mdm.service.IPriceTermsService; +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-20 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PriceTermsServiceImpl extends ServiceImpl implements IPriceTermsService { +}