From 9c7d1fdb7a049b5039ce9688db4f76b95ae2b8a6 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 5 Feb 2026 17:56:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/dayPlan/vo/LngPngSettleHdrVo.java | 8 +++ .../controller/PngSettleHdrController.java | 7 +- .../dayPlan/mapper/LngPngSettleHdrMapper.java | 2 +- .../mapper/LngPngSettleSalesDtlMapper.java | 2 +- .../mapper/LngPngSettleSalesMapper.java | 2 +- .../dayPlan/service/IPngSettleHdrService.java | 3 + .../service/impl/DemandServiceImpl.java | 2 - .../service/impl/PngSettleHdrServiceImpl.java | 65 ++++++++++++++----- 8 files changed, 63 insertions(+), 28 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java index f54c08e..f75a104 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -177,6 +179,12 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("lngPngSettleSales子表") private List lngPngSettleSalesList; + + + + + private List lngFileUploadList; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java index a309cdd..b78512c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java @@ -82,11 +82,8 @@ public class PngSettleHdrController { @ApiOperation(value="根据id查询LngPngSettleHdr信息") @SaCheckPermission("pngSettleHdr:detail") public R info(@RequestParam Long id){ - LngPngSettleHdr lngPngSettleHdr = pngSettleHdrService.getByIdDeep(id); - if (lngPngSettleHdr == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class)); + LngPngSettleHdrVo lngPngSettleHdrVo = pngSettleHdrService.getInfoById(id); + return R.ok(lngPngSettleHdrVo); } @GetMapping(value = "/datalog") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java index c624584..6e6212b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngPngSettleHdrMapper extends MPJBaseMapper { +public interface LngPngSettleHdrMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java index f1e68f5..c38625b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper { +public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java index 9b1587b..4d6d548 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngPngSettleSalesMapper extends MPJBaseMapper { +public interface LngPngSettleSalesMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java index e821310..8803232 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java @@ -4,6 +4,7 @@ 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.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; /** * @title: service @@ -13,5 +14,7 @@ import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; */ public interface IPngSettleHdrService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngPngSettleHdrVo getInfoById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java index 07fc0a8..fe40423 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java @@ -22,7 +22,6 @@ import com.pictc.utils.DataLogTools; import com.pictc.utils.ObjectDiffUtils; import com.pictc.utils.StringUtils; import com.xjrsoft.common.exception.BusinessException; -import com.xjrsoft.common.model.result.R; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.CompareResultVo; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngApproDto; @@ -32,7 +31,6 @@ import com.xjrsoft.module.dayPlan.entity.LngPngAppro; import com.xjrsoft.module.dayPlan.entity.LngPngDemand; import com.xjrsoft.module.dayPlan.mapper.LngPngApproMapper; import com.xjrsoft.module.dayPlan.mapper.LngPngDemandMapper; -import com.xjrsoft.module.dayPlan.mapper.LngPngDemandPurMapper; import com.xjrsoft.module.dayPlan.service.IDemandService; import com.xjrsoft.module.dayPlan.vo.LngPngDemandPurVo; import com.xjrsoft.module.dayPlan.vo.LngPngDemandVo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java index 8c361d3..8ee7195 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -1,21 +1,26 @@ package com.xjrsoft.module.dayPlan.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; -import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.utils.CollectionUtils; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import lombok.AllArgsConstructor; /** * @title: service @@ -26,10 +31,34 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrService { - private final LngPngSettleHdrMapper pngSettleHdrLngPngSettleHdrMapper; + private final LngPngSettleHdrMapper lngPngSettleHdrMapper; - private final LngPngSettleSalesMapper pngSettleHdrLngPngSettleSalesMapper; - private final LngPngSettleSalesDtlMapper pngSettleHdrLngPngSettleSalesDtlMapper; + private final LngPngSettleSalesMapper lngPngSettleSalesMapper; + + private final LngPngSettleSalesDtlMapper lngPngSettleSalesDtlMapper; + + private final IFileClient fileClient; + + + @Override + public LngPngSettleHdrVo getInfoById(Long id) { + LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id); + if(lngPngSettleHdr == null) { + return null; + } + + if(CollectionUtils.isNotEmpty(lngPngSettleHdr.getLngPngSettleSalesList())) { + for(LngPngSettleSales ss:lngPngSettleHdr.getLngPngSettleSalesList()) { + List list = lngPngSettleSalesDtlMapper.selectList(new LambdaQueryWrapper() + .eq(LngPngSettleSalesDtl::getSettleId, ss.getId())); + ss.setLngPngSettleSalesDtlList(list); + } + } + LngPngSettleHdrVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class); + List fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } } From e26b5e3d40609e42595355e1fe89e7d4cf6b145b Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 6 Feb 2026 17:43:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/dto/UpdateLngPngDemandPurDto.java | 8 +-- .../dayPlan/dto/UpdateLngPngSettleHdrDto.java | 17 ++++++- .../dto/UpdateLngPngSettleSalesDtlDto.java | 21 +++----- .../dto/UpdateLngPngSettleSalesDto.java | 6 ++- .../module/dayPlan/vo/LngPngSettleHdrVo.java | 5 +- .../PngMeasureSalesPurController.java | 2 - .../controller/PngSettleHdrController.java | 51 +++++++++++++++++-- 7 files changed, 81 insertions(+), 29 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java index 35e493e..f63b8c0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java @@ -90,21 +90,21 @@ public class UpdateLngPngDemandPurDto implements Serializable { /** * 日指定量(方)(客户填报) */ - @LogField(name="日指定量(方)(客户填报)",index=9) + @LogField(name="日指定量",index=9) @ApiModelProperty("日指定量(方)(客户填报)") private BigDecimal qtyDemandM3; /** * 日批复量(吉焦)(销售批复回写) */ - @LogField(name="日批复量(吉焦)(销售批复回写)",index=10) + @LogField(name="日批复量",index=10) @ApiModelProperty("日批复量(吉焦)(销售批复回写)") private BigDecimal qtySalesGj; /** * 日批复量(方)(销售批复回写) */ - @LogField(name="日批复量(方)(销售批复回写)",index=11) + @LogField(name="日批复量",index=11) @ApiModelProperty("日批复量(方)(销售批复回写)") private BigDecimal qtySalesM3; @@ -118,7 +118,7 @@ public class UpdateLngPngDemandPurDto implements Serializable { /** * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段) */ - @LogField(name="批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)",index=13) + @LogField(name="批复添加标识",index=13) @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)") private String addSign; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java index aa2aa51..392a667 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java @@ -5,13 +5,16 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,6 +45,7 @@ public class UpdateLngPngSettleHdrDto implements Serializable { */ @LogField(name="结算月",index=1) @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime settleMonth; /** @@ -49,12 +53,14 @@ public class UpdateLngPngSettleHdrDto implements Serializable { */ @LogField(name="结算月开始日期",index=2) @ApiModelProperty("结算月开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; /** * 结算月结束日期 */ @LogField(name="结算月结束日期",index=3) + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("结算月结束日期") private LocalDateTime dateTo; @@ -149,9 +155,18 @@ public class UpdateLngPngSettleHdrDto implements Serializable { @ApiModelProperty("lngPngSettleSales子表") @LogJoin(name = "lngPngSettleSales子表", columns = { - @LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleHdrId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY) private List lngPngSettleSalesList; + + + //附件 + @LogAttrField + private List lngFileUploadList; + + //对账单 + @LogAttrField + private List billList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java index 8721fc2..43c3896 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java @@ -1,22 +1,13 @@ package com.xjrsoft.module.dayPlan.dto; +import java.io.Serializable; +import java.math.BigDecimal; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + 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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java index e739805..294a037 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java @@ -5,6 +5,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; import com.pictc.annotations.datalog.LogField; @@ -57,6 +58,7 @@ public class UpdateLngPngSettleSalesDto implements Serializable { */ @LogField(name="结算月",index=3) @ApiModelProperty("结算月(从主表带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime settleMonth; /** @@ -71,12 +73,14 @@ public class UpdateLngPngSettleSalesDto implements Serializable { */ @LogField(name="计划日期",index=5) @ApiModelProperty("计划日期(从lng_png_sales带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime datePlan; /** * 计量日期(从lng_png_sales带) */ @LogField(name="计量日期",index=6) + @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("计量日期(从lng_png_sales带)") private LocalDateTime dateMea; @@ -205,7 +209,7 @@ public class UpdateLngPngSettleSalesDto implements Serializable { @ApiModelProperty("lngPngSettleSalesDtl子子表") @LogJoin(name = "lngPngSettleSalesDtl子子表", columns = { - @LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY) private List lngPngSettleSalesDtlList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java index f75a104..739c513 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java @@ -182,8 +182,11 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ - + //附件 private List lngFileUploadList; + + //对账单 + private List billList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java index 45b217d..f519692 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java @@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; -import com.pictc.datalog.DefaultDataOperationListener; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -35,7 +34,6 @@ import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dayPlan.dto.LngPngMeasureSalesPurPageDto; -import com.xjrsoft.module.dayPlan.dto.UpdateLngPngDemandDto; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngMeasureSalesPurDto; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java index b78512c..d25c857 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -29,7 +31,6 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; @@ -99,22 +100,62 @@ public class PngSettleHdrController { @ApiOperation(value = "新增LngPngSettleHdr") @SaCheckPermission("pngSettleHdr:add") public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ - UpdateLngPngSettleHdrDto res = dataService.insert(dto); - return R.ok(res.getId()); + + + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + + return null; + } + })); + } @PutMapping @ApiOperation(value = "修改LngPngSettleHdr") @SaCheckPermission("pngSettleHdr:edit") public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ - return R.ok(dataService.updateById(dto)); + + return R.ok(dataService.updateById(dto,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + + return null; + } + })); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("pngSettleHdr:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids)); + + return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + + return null; + } + })); } From e1dca546d74318e2f0552255be2e95b5c15965ad Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Mon, 9 Feb 2026 17:28:07 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=87=87=E8=B4=AD=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/dto/AddLngPngSettlePurDtlDto.java | 89 ++++++ .../dayPlan/dto/AddLngPngSettlePurDto.java | 170 +++++++++++ .../dto/UpdateLngPngSettleHdrPurDto.java | 161 ++++++++++ .../dto/UpdateLngPngSettlePurDtlDto.java | 126 ++++++++ .../dayPlan/dto/UpdateLngPngSettlePurDto.java | 260 ++++++++++++++++ .../dayPlan/vo/LngPngSettleHdrPurVo.java | 182 ++++++++++++ .../dayPlan/vo/LngPngSettlePurDtlVo.java | 161 ++++++++++ .../module/dayPlan/vo/LngPngSettlePurVo.java | 278 +++++++++++++++++ .../controller/PngSettleHdrPurController.java | 120 ++++++++ .../dayPlan/entity/LngPngSettleHdrPur.java | 197 ++++++++++++ .../dayPlan/entity/LngPngSettlePur.java | 281 ++++++++++++++++++ .../dayPlan/entity/LngPngSettlePurDtl.java | 174 +++++++++++ .../mapper/LngPngSettleHdrPurMapper.java | 17 ++ .../mapper/LngPngSettlePurDtlMapper.java | 17 ++ .../dayPlan/mapper/LngPngSettlePurMapper.java | 17 ++ .../service/IPngSettleHdrPurService.java | 17 ++ .../impl/PngSettleHdrPurServiceImpl.java | 35 +++ 17 files changed, 2302 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDtlDto.java new file mode 100644 index 0000000..ab793e8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDtlDto.java @@ -0,0 +1,89 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +public class AddLngPngSettlePurDtlDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 结算-管道气-采购主键 + */ + @ApiModelProperty("结算-管道气-采购主键") + private Long settleId; + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + /** + * 优先级 + */ + @ApiModelProperty("优先级") + private Byte sort; + /** + * 主计量单位(从lng_png_settle_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_pur带)") + private String uomCode; + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDto.java new file mode 100644 index 0000000..5ff20f9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettlePurDto.java @@ -0,0 +1,170 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +public class AddLngPngSettlePurDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 结算-管道气-销售-主表主键 + */ + @ApiModelProperty("结算-管道气-销售-主表主键") + private Long settleHdrId; + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + /** + * 计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id) + */ + @ApiModelProperty("计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id)") + private Long meaId; + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + /** + * 结算类型(C-气费成本) + */ + @ApiModelProperty("结算类型(C-气费成本)") + private String settleTypeCode; + /** + * 计划日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计划日期(从lng_png_sales_pur带)") + private LocalDateTime datePlan; + /** + * 计量日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计量日期(从lng_png_sales_pur带)") + private LocalDateTime dateMea; + /** + * 供应商(从lng_png_sales_pur带) + */ + @ApiModelProperty("供应商(从lng_png_sales_pur带)") + private String suCode; + /** + * 合同主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同主键(从lng_png_sales_pur带)") + private Long kpId; + /** + * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带)") + private Long kpppId; + /** + * 上载点(从lng_png_sales_pur带) + */ + @ApiModelProperty("上载点(从lng_png_sales_pur带)") + private String pointUpCode; + /** + * 主计量单位(从lng_png_sales_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales_pur带)") + private String uomCode; + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + /** + * 合同-主信息主键（销售）(从lng_png_sales带) + */ + @ApiModelProperty("合同-主信息主键（销售）(从lng_png_sales带)") + private Long ksId; + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + /** + * 交割点编码(从lng_png_sales带) + */ + @ApiModelProperty("交割点编码(从lng_png_sales带)") + private String pointDelyCode; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + /** + * 结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceGj; + /** + * 结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceM3; + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + /** + * 价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500)") + private String priceDesc; + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java new file mode 100644 index 0000000..0928a9d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrPurDto.java @@ -0,0 +1,161 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.ValueDirectionType; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_hdr",name="管道气采购结算") +public class UpdateLngPngSettleHdrPurDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 结算月 + */ + @LogField(name="结算月",index=1) + @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime settleMonth; + + /** + * 结算月开始日期 + */ + @LogField(name="结算月开始日期",index=2) + @ApiModelProperty("结算月开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime dateFrom; + + /** + * 结算月结束日期 + */ + @LogField(name="结算月结束日期",index=3) + @ApiModelProperty("结算月结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime dateTo; + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @LogField(name="结算类型",index=4) + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @LogField(name="供应商/客户",index=5) + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + /** + * 交易主体(天然气公司/惠贸) + */ + @LogField(name="交易主体",index=6) + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @LogField(name="结算总数量",index=7) + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @LogField(name="结算总数量",index=8) + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + + /** + * 结算总金额 + */ + @LogField(name="结算总金额",index=9) + @ApiModelProperty("结算总金额") + private BigDecimal amount; + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @LogField(name="账期内含预收付款",index=10) + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + /** + * 对账单(不显示，挂对账单附件用) + */ + @LogField(name="对账单",index=11) + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + /** + * 审批状态 + */ + @LogField(name="审批状态",index=12) + @ApiModelProperty("审批状态") + private String approCode; + + /** + * 结算说明 + */ + @LogField(name="结算说明",index=13) + @ApiModelProperty("结算说明") + private String settleDesc; + + /** + * 备注 + */ + @LogField(name="备注",index=14) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=15) + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * lngPngSettlePur + */ + @ApiModelProperty("lngPngSettlePur子表") + @LogJoin(name = "lngPngSettlePur子表", + columns = { + @LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPngSettlePurDto.class, type = JoinType.MANY) + private List lngPngSettlePurList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java new file mode 100644 index 0000000..067aead --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java @@ -0,0 +1,126 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.io.Serializable; +import java.math.BigDecimal; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_pur_dtl",name="管道气采购结算") +public class UpdateLngPngSettlePurDtlDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 结算-管道气-采购主键 + */ + @LogField(name="结算-管道气-采购主键",index=1) + @ApiModelProperty("结算-管道气-采购主键") + private Long settleId; + + /** + * 价格类型(基础量/增量) + */ + @LogField(name="价格类型",index=2) + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + /** + * 优先级 + */ + @LogField(name="优先级",index=3) + @ApiModelProperty("优先级") + private Byte sort; + + /** + * 主计量单位(从lng_png_settle_pur带) + */ + @LogField(name="主计量单位",index=4) + @ApiModelProperty("主计量单位(从lng_png_settle_pur带)") + private String uomCode; + + /** + * 阶梯量（吉焦） + */ + @LogField(name="阶梯量",index=5) + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + + /** + * 阶梯量（方） + */ + @LogField(name="阶梯量",index=6) + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值",index=7) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 结算数量(吉焦) + */ + @LogField(name="结算数量",index=8) + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + + /** + * 结算数量(方) + */ + @LogField(name="结算数量",index=9) + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + + /** + * 价格(元/方) + */ + @LogField(name="价格",index=10) + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + + /** + * 金额(自动计算) + */ + @LogField(name="金额",index=11) + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + + /** + * 备注 + */ + @LogField(name="备注",index=12) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=13) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java new file mode 100644 index 0000000..ebcd1ad --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDto.java @@ -0,0 +1,260 @@ +package com.xjrsoft.module.dayPlan.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: 2026-02-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_settle_pur",name="管道气采购结算") +public class UpdateLngPngSettlePurDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 结算-管道气-销售-主表主键 + */ + @LogField(name="结算-管道气-销售-主表主键",index=1) + @ApiModelProperty("结算-管道气-销售-主表主键") + private Long settleHdrId; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @LogField(name="日计划-管道气-销售主键",index=2) + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @LogField(name="日计划-管道气-销售-采购主键",index=3) + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + + /** + * 计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id) + */ + @LogField(name="计量-管道气-销售-采购主键",index=4) + @ApiModelProperty("计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id)") + private Long meaId; + + /** + * 结算月 + */ + @LogField(name="结算月",index=5) + @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime settleMonth; + + /** + * 结算类型(C-气费成本) + */ + @LogField(name="结算类型",index=6) + @ApiModelProperty("结算类型(C-气费成本)") + private String settleTypeCode; + + /** + * 计划日期(从lng_png_sales_pur带) + */ + @LogField(name="计划日期",index=7) + @ApiModelProperty("计划日期(从lng_png_sales_pur带)") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime datePlan; + + /** + * 计量日期(从lng_png_sales_pur带) + */ + @LogField(name="计量日期",index=8) + @ApiModelProperty("计量日期(从lng_png_sales_pur带)") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime dateMea; + + /** + * 供应商(从lng_png_sales_pur带) + */ + @LogField(name="供应商",index=9) + @ApiModelProperty("供应商(从lng_png_sales_pur带)") + private String suCode; + + /** + * 合同主键(从lng_png_sales_pur带) + */ + @LogField(name="合同主键",index=10) + @ApiModelProperty("合同主键(从lng_png_sales_pur带)") + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) + */ + @LogField(name="合同-国内采购-管道气-上载点主键",index=11) + @ApiModelProperty("合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带)") + private Long kpppId; + + /** + * 上载点(从lng_png_sales_pur带) + */ + @LogField(name="上载点",index=12) + @ApiModelProperty("上载点(从lng_png_sales_pur带)") + private String pointUpCode; + + /** + * 主计量单位(从lng_png_sales_pur带) + */ + @LogField(name="主计量单位",index=13) + @ApiModelProperty("主计量单位(从lng_png_sales_pur带)") + private String uomCode; + + /** + * 客户(从lng_png_sales带) + */ + @LogField(name="客户",index=14) + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + /** + * 合同-主信息主键（销售）(从lng_png_sales带) + */ + @LogField(name="合同-主信息主键（销售）",index=15) + @ApiModelProperty("合同-主信息主键（销售）(从lng_png_sales带)") + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @LogField(name="合同-国内销售-管道气-交割点主键",index=16) + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + + /** + * 交割点编码(从lng_png_sales带) + */ + @LogField(name="交割点编码",index=17) + @ApiModelProperty("交割点编码(从lng_png_sales带)") + private String pointDelyCode; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值",index=18) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 完成量(吉焦) + */ + @LogField(name="完成量",index=19) + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + + /** + * 完成量(方) + */ + @LogField(name="完成量",index=20) + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + + /** + * 结算量(吉焦) + */ + @LogField(name="结算量",index=21) + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + + /** + * 结算量(方) + */ + @LogField(name="结算量",index=22) + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + + /** + * 结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @LogField(name="结算价格",index=23) + @ApiModelProperty("结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceGj; + + /** + * 结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @LogField(name="结算价格",index=24) + @ApiModelProperty("结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceM3; + + /** + * 结算金额(自动计算，子表合计) + */ + @LogField(name="结算金额",index=25) + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + + /** + * 价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500) + */ + @LogField(name="价格组成说明",index=26) + @ApiModelProperty("价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500)") + private String priceDesc; + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @LogField(name="结算次数",index=27) + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + + /** + * 备注 + */ + @LogField(name="备注",index=28) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=29) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPngSettlePurDtl + */ + @ApiModelProperty("lngPngSettlePurDtl子表") + @LogJoin(name = "lngPngSettlePurDtl子表", + columns = { + @LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPngSettlePurDtlDto.class, type = JoinType.MANY) + private List lngPngSettlePurDtlList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java new file mode 100644 index 0000000..abb859a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java @@ -0,0 +1,182 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + private LocalDateTime dateFrom; + + + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + private LocalDateTime dateTo; + + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + private Long comId; + + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + private BigDecimal qtySettleGj; + + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + private BigDecimal qtySettleM3; + + + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + private BigDecimal amount; + + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + + + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + + + /** + * 备注 + */ + @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; + + + + + /** + * lngPngSettlePur + */ + @ApiModelProperty("lngPngSettlePur子表") + private List lngPngSettlePurList; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java new file mode 100644 index 0000000..41eaaad --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java @@ -0,0 +1,161 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +public class LngPngSettlePurDtlVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 结算-管道气-采购主键 + */ + @ApiModelProperty("结算-管道气-采购主键") + private Long settleId; + + + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + + /** + * 优先级 + */ + @ApiModelProperty("优先级") + private Byte sort; + + + /** + * 主计量单位(从lng_png_settle_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_pur带)") + private String uomCode; + + + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + private BigDecimal rateQtyGj; + + + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + private BigDecimal rateQtyM3; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + private BigDecimal qtySettleGj; + + + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + private BigDecimal qtySettleM3; + + + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + private BigDecimal priceM3; + + + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + private BigDecimal amount; + + + /** + * 备注 + */ + @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-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java new file mode 100644 index 0000000..ba57c87 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java @@ -0,0 +1,278 @@ +package com.xjrsoft.module.dayPlan.vo; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 结算-管道气-销售-主表主键 + */ + @ApiModelProperty("结算-管道气-销售-主表主键") + private Long settleHdrId; + + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + private Long salesId; + + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + private Long salesPurId; + + + /** + * 计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id) + */ + @ApiModelProperty("计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id)") + private Long meaId; + + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + private LocalDateTime settleMonth; + + + /** + * 结算类型(C-气费成本) + */ + @ApiModelProperty("结算类型(C-气费成本)") + private String settleTypeCode; + + + /** + * 计划日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计划日期(从lng_png_sales_pur带)") + private LocalDateTime datePlan; + + + /** + * 计量日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计量日期(从lng_png_sales_pur带)") + private LocalDateTime dateMea; + + + /** + * 供应商(从lng_png_sales_pur带) + */ + @ApiModelProperty("供应商(从lng_png_sales_pur带)") + private String suCode; + + + /** + * 合同主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同主键(从lng_png_sales_pur带)") + private Long kpId; + + + /** + * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带)") + private Long kpppId; + + + /** + * 上载点(从lng_png_sales_pur带) + */ + @ApiModelProperty("上载点(从lng_png_sales_pur带)") + private String pointUpCode; + + + /** + * 主计量单位(从lng_png_sales_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales_pur带)") + private String uomCode; + + + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + + /** + * 合同-主信息主键（销售）(从lng_png_sales带) + */ + @ApiModelProperty("合同-主信息主键（销售）(从lng_png_sales带)") + private Long ksId; + + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + private Long ksppId; + + + /** + * 交割点编码(从lng_png_sales带) + */ + @ApiModelProperty("交割点编码(从lng_png_sales带)") + private String pointDelyCode; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + private BigDecimal qtyMeaGj; + + + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + private BigDecimal qtyMeaM3; + + + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + private BigDecimal qtySettleGj; + + + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + private BigDecimal qtySettleM3; + + + /** + * 结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceGj; + + + /** + * 结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + private BigDecimal priceM3; + + + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + private BigDecimal amount; + + + /** + * 价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500)") + private String priceDesc; + + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + private Byte settleTimes; + + + /** + * 备注 + */ + @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; + + + /** + * lngPngSettlePurDtl + */ + @ApiModelProperty("lngPngSettlePurDtl子表") + private List lngPngSettlePurDtlList; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java new file mode 100644 index 0000000..d29ba1d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java @@ -0,0 +1,120 @@ +package com.xjrsoft.module.dayPlan.controller; + +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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/pngSettleHdrPur") +@Api(value = "/dayPlan" + "/pngSettleHdrPur",tags = "管道气采购结算代码") +@AllArgsConstructor +public class PngSettleHdrPurController { + + + private final IPngSettleHdrPurService pngSettleHdrPurService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPngSettleHdr列表(分页)") + @SaCheckPermission("pngSettleHdrPur:list") + public R page(@Valid LngPngSettleHdrPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode()) + .like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc()) + .eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj()) + .eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3()) + .eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode()) + .orderByDesc(LngPngSettleHdr::getId) + .select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty())); + IPage page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngSettleHdr信息") + @SaCheckPermission("pngSettleHdrPur:detail") + public R info(@RequestParam Long id){ + LngPngSettleHdr lngPngSettleHdr = pngSettleHdrPurService.getByIdDeep(id); + if (lngPngSettleHdr == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngSettleHdr数据详细日志") + @SaCheckPermission("pngSettleHdrPur:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPngSettleHdrDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPngSettleHdr") + @SaCheckPermission("pngSettleHdrPur:add") + public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ + UpdateLngPngSettleHdrDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngPngSettleHdr") + @SaCheckPermission("pngSettleHdrPur:edit") + public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pngSettleHdrPur:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java new file mode 100644 index 0000000..e6c8e44 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java @@ -0,0 +1,197 @@ +package com.xjrsoft.module.dayPlan.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.yulichang.annotation.EntityMapping; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 管道气采购结算 +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_hdr") +@ApiModel(value = "管道气采购结算对象", description = "管道气采购结算") +public class LngPngSettleHdrPur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + private String settleTypeCode; + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + private String cpCode; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + private String rpSign; + + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + private String billAccount; + + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + private String approCode; + + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + private String settleDesc; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + /** + * lngPngSettlePur + */ + @ApiModelProperty("lngPngSettlePur子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleHdrId") + private List lngPngSettlePurList; + /** + * lngPngSettlePurDtl + */ + @ApiModelProperty("lngPngSettlePurDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleId") + private List lngPngSettlePurDtlList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java new file mode 100644 index 0000000..2943d59 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java @@ -0,0 +1,281 @@ +package com.xjrsoft.module.dayPlan.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +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: 2026-02-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_pur") +@ApiModel(value = "管道气采购结算对象", description = "管道气采购结算") +public class LngPngSettlePur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算-管道气-销售-主表主键 + */ + @ApiModelProperty("结算-管道气-销售-主表主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long settleHdrId; + + /** + * 日计划-管道气-销售主键(lng_png_sales.id) + */ + @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesId; + + /** + * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) + */ + @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long salesPurId; + + /** + * 计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id) + */ + @ApiModelProperty("计量-管道气-销售-采购主键(lng_png_measure_sales_pur.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long meaId; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 结算类型(C-气费成本) + */ + @ApiModelProperty("结算类型(C-气费成本)") + private String settleTypeCode; + + /** + * 计划日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计划日期(从lng_png_sales_pur带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期(从lng_png_sales_pur带) + */ + @ApiModelProperty("计量日期(从lng_png_sales_pur带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 供应商(从lng_png_sales_pur带) + */ + @ApiModelProperty("供应商(从lng_png_sales_pur带)") + private String suCode; + + /** + * 合同主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同主键(从lng_png_sales_pur带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点(从lng_png_sales_pur带) + */ + @ApiModelProperty("上载点(从lng_png_sales_pur带)") + private String pointUpCode; + + /** + * 主计量单位(从lng_png_sales_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_sales_pur带)") + private String uomCode; + + /** + * 客户(从lng_png_sales带) + */ + @ApiModelProperty("客户(从lng_png_sales带)") + private String cuCode; + + /** + * 合同-主信息主键（销售）(从lng_png_sales带) + */ + @ApiModelProperty("合同-主信息主键（销售）(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(从lng_png_sales带) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksppId; + + /** + * 交割点编码(从lng_png_sales带) + */ + @ApiModelProperty("交割点编码(从lng_png_sales带)") + private String pointDelyCode; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 完成量(吉焦) + */ + @ApiModelProperty("完成量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaGj; + + /** + * 完成量(方) + */ + @ApiModelProperty("完成量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyMeaM3; + + /** + * 结算量(吉焦) + */ + @ApiModelProperty("结算量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算量(方) + */ + @ApiModelProperty("结算量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/吉焦)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + + /** + * 结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位) + */ + @ApiModelProperty("结算价格(元/方)(气费收入/成本时，金额/总量；非气费收入/成本时，录入；管输费8位小数，其他4位)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 结算金额(自动计算，子表合计) + */ + @ApiModelProperty("结算金额(自动计算，子表合计)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500) + */ + @ApiModelProperty("价格组成说明(子表记录合并字符串；价格类型：数量*价格=金额；居民：10000*2.85=28500)") + private String priceDesc; + + /** + * 结算次数(第一次结算1，第二次结算2……) + */ + @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte settleTimes; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + 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/dayPlan/entity/LngPngSettlePurDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java new file mode 100644 index 0000000..4260d7f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePurDtl.java @@ -0,0 +1,174 @@ +package com.xjrsoft.module.dayPlan.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +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: 2026-02-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_settle_pur_dtl") +@ApiModel(value = "管道气采购结算对象", description = "管道气采购结算") +public class LngPngSettlePurDtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算-管道气-采购主键 + */ + @ApiModelProperty("结算-管道气-采购主键") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long settleId; + + /** + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + private String priceCode; + + /** + * 优先级 + */ + @ApiModelProperty("优先级") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte sort; + + /** + * 主计量单位(从lng_png_settle_pur带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_pur带)") + private String uomCode; + + /** + * 阶梯量（吉焦） + */ + @ApiModelProperty("阶梯量（吉焦）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyGj; + + /** + * 阶梯量（方） + */ + @ApiModelProperty("阶梯量（方）") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateQtyM3; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 结算数量(吉焦) + */ + @ApiModelProperty("结算数量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算数量(方) + */ + @ApiModelProperty("结算数量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 价格(元/方) + */ + @ApiModelProperty("价格(元/方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceM3; + + /** + * 金额(自动计算) + */ + @ApiModelProperty("金额(自动计算)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + 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/dayPlan/mapper/LngPngSettleHdrPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java new file mode 100644 index 0000000..52be863 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettleHdrPurMapper extends MPJBaseMapper,BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java new file mode 100644 index 0000000..21c0519 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettlePurDtlMapper extends MPJBaseMapper,BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java new file mode 100644 index 0000000..1f7cc3c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPngSettlePurMapper extends MPJBaseMapper ,BaseMapper{ + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java new file mode 100644 index 0000000..c862bea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.dayPlan.service; + +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.dayPlan.entity.LngPngSettleHdr; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-02-09 +* @Version 1.0 +*/ + +public interface IPngSettleHdrPurService extends MPJBaseService, MPJDeepService, MPJRelationService { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java new file mode 100644 index 0000000..4f306d5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java @@ -0,0 +1,35 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; +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: 2026-02-09 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrPurService { + private final LngPngSettleHdrMapper pngSettleHdrPurLngPngSettleHdrMapper; + + private final LngPngSettlePurMapper pngSettleHdrPurLngPngSettlePurMapper; + private final LngPngSettlePurDtlMapper pngSettleHdrPurLngPngSettlePurDtlMapper; + + +} From 4c90f45ab8dd0385f119fdfd2b7cac6d3e1dfe79 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 10 Feb 2026 11:04:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/vo/LngPngSettleHdrPurVo.java | 8 ++ .../PngMeasureSalesPurController.java | 2 +- .../controller/PngSettleHdrPurController.java | 34 ++--- ....java => PngSettleHdrSalesController.java} | 10 +- .../dayPlan/entity/LngPngSettleHdrPur.java | 8 +- .../dayPlan/entity/LngPngSettlePur.java | 8 +- .../mapper/LngPngSettleHdrPurMapper.java | 4 +- .../service/IPngSettleHdrPurService.java | 12 +- .../dayPlan/service/IPngSettleHdrService.java | 6 + .../impl/PngSettleHdrPurServiceImpl.java | 133 +++++++++++++++--- .../service/impl/PngSettleHdrServiceImpl.java | 66 ++++++++- 11 files changed, 242 insertions(+), 49 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/{PngSettleHdrController.java => PngSettleHdrSalesController.java} (95%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java index abb859a..e99dab7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -178,5 +180,11 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode @ApiModelProperty("lngPngSettlePur子表") private List lngPngSettlePurList; + //附件 + private List lngFileUploadList; + + //对账单 + private List billList; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java index f519692..b5e03bf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java @@ -202,7 +202,7 @@ public class PngMeasureSalesPurController { @DeleteMapping @ApiOperation(value = "删除") - //@SaCheckPermission("pngMeasureSalesPur:delete") + @SaCheckPermission("pngMeasureSalesPur:delete") public R delete(@Valid @RequestBody List ids){ return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids)); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java index d29ba1d..58c9ac7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java @@ -24,8 +24,10 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -57,18 +59,13 @@ public class PngSettleHdrPurController { @SaCheckPermission("pngSettleHdrPur:list") public R page(@Valid LngPngSettleHdrPageDto dto){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId()) - .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode()) - .like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc()) - .eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj()) - .eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3()) - .eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount()) - .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode()) - .orderByDesc(LngPngSettleHdr::getId) - .select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty())); - IPage page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper); + .eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdrPur::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdrPur::getCpCode,dto.getCpCode()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdrPur::getApproCode,dto.getApproCode()) + .orderByDesc(LngPngSettleHdrPur::getId); + IPage page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class); return R.ok(pageOutput); } @@ -77,11 +74,8 @@ public class PngSettleHdrPurController { @ApiOperation(value="根据id查询LngPngSettleHdr信息") @SaCheckPermission("pngSettleHdrPur:detail") public R info(@RequestParam Long id){ - LngPngSettleHdr lngPngSettleHdr = pngSettleHdrPurService.getByIdDeep(id); - if (lngPngSettleHdr == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class)); + LngPngSettleHdrPurVo lngPngSettleHdrVo = pngSettleHdrPurService.getInfoById(id); + return R.ok(lngPngSettleHdrVo); } @GetMapping(value = "/datalog") @@ -116,5 +110,11 @@ public class PngSettleHdrPurController { } - + @PostMapping(value="/cancel") + @ApiOperation(value = "取消结算") + @SaCheckPermission("pngSettleHdrPur:cancel") + public R cancel(@Valid @RequestBody List ids){ + pngSettleHdrPurService.cancel(ids); + return R.ok(); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java similarity index 95% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java index d25c857..198f831 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java @@ -47,7 +47,7 @@ import lombok.AllArgsConstructor; @RequestMapping("/dayPlan/pngSettleHdr") @Api(value = "/dayPlan" + "/pngSettleHdr",tags = "管道气销售结算代码") @AllArgsConstructor -public class PngSettleHdrController { +public class PngSettleHdrSalesController { private final IPngSettleHdrService pngSettleHdrService; @@ -159,5 +159,13 @@ public class PngSettleHdrController { } + @PostMapping(value="/cancel") + @ApiOperation(value = "取消结算") + @SaCheckPermission("pngSettleHdr:cancel") + public R cancel(@Valid @RequestBody List ids){ + pngSettleHdrService.cancel(ids); + return R.ok(); + } + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java index e6c8e44..d924cc3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrPur.java @@ -186,12 +186,6 @@ public class LngPngSettleHdrPur implements Serializable { @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "settleHdrId") private List lngPngSettlePurList; - /** - * lngPngSettlePurDtl - */ - @ApiModelProperty("lngPngSettlePurDtl子表") - @TableField(exist = false) - @EntityMapping(thisField = "id", joinField = "settleId") - private List lngPngSettlePurDtlList; + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java index 2943d59..2c0de67 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java @@ -276,6 +276,12 @@ public class LngPngSettlePur implements Serializable { @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) private Long ruleUserId; - + /** + * lngPngSettlePurDtl + */ + @ApiModelProperty("lngPngSettlePurDtl子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "settleId") + private List lngPngSettlePurDtlList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java index 52be863..2c246b4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrPurMapper.java @@ -3,6 +3,8 @@ package com.xjrsoft.module.dayPlan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; + import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngPngSettleHdrPurMapper extends MPJBaseMapper,BaseMapper { +public interface LngPngSettleHdrPurMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java index c862bea..6b84634 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrPurService.java @@ -1,9 +1,15 @@ package com.xjrsoft.module.dayPlan.service; +import java.util.List; + +import javax.validation.Valid; + 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.dayPlan.entity.LngPngSettleHdr; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; /** * @title: service @@ -12,6 +18,10 @@ import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; * @Version 1.0 */ -public interface IPngSettleHdrPurService extends MPJBaseService, MPJDeepService, MPJRelationService { +public interface IPngSettleHdrPurService extends MPJBaseService, MPJDeepService, MPJRelationService { + + LngPngSettleHdrPurVo getInfoById(Long id); + + void cancel(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java index 8803232..0a29aeb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java @@ -1,5 +1,9 @@ package com.xjrsoft.module.dayPlan.service; +import java.util.List; + +import javax.validation.Valid; + import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; @@ -16,5 +20,7 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; public interface IPngSettleHdrService extends MPJBaseService, MPJDeepService, MPJRelationService { LngPngSettleHdrVo getInfoById(Long id); + + void cancel(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java index 4f306d5..0272ad7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java @@ -1,21 +1,39 @@ package com.xjrsoft.module.dayPlan.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper; -import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; -import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper; -import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; -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; + +import javax.validation.Valid; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.ApproveCodeEnum; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.CollectionUtils; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto; +import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; +import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrPurMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper; +import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper; +import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: service @@ -25,11 +43,88 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; */ @Service @AllArgsConstructor -public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrPurService { - private final LngPngSettleHdrMapper pngSettleHdrPurLngPngSettleHdrMapper; +public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrPurService { + + private final LngPngSettleHdrPurMapper lngPngSettleHdrPurMapper; - private final LngPngSettlePurMapper pngSettleHdrPurLngPngSettlePurMapper; - private final LngPngSettlePurDtlMapper pngSettleHdrPurLngPngSettlePurDtlMapper; + private final LngPngSettlePurMapper lngPngSettlePurMapper; + + private final LngPngSettlePurDtlMapper lngPngSettlePurDtlMapper; + + private final IFileClient fileClient; + + private final DatalogService dataService; + + + @Override + public LngPngSettleHdrPurVo getInfoById(Long id) { + LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id); + if(lngPngSettleHdr == null) { + return null; + } + + if(CollectionUtils.isNotEmpty(lngPngSettleHdr.getLngPngSettlePurList())) { + for(LngPngSettlePur ss:lngPngSettleHdr.getLngPngSettlePurList()) { + List list = lngPngSettlePurDtlMapper.selectList(new LambdaQueryWrapper() + .eq(LngPngSettlePurDtl::getSettleId, ss.getId())); + ss.setLngPngSettlePurDtlList(list); + } + } + LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class); + List fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + + List billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); + vo.setLngFileUploadList(billFileList); + return vo; + } + + + @Override + public void cancel(@Valid List ids) { + List tempList = Lists.newArrayList(); + for(Long id:ids) { + LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id); + if (lngPngSettleHdr == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); + + } + /** + if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) && + !ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) { + throw new BusinessException(BusinessCode.of(10500,"审批状态变化，不能提交")); + } + **/ + lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode()); + + tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrPurDto.class)); + } + dataService.updateBatch(tempList,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + }); + + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java index 8ee7195..9e4d0d8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -1,13 +1,25 @@ package com.xjrsoft.module.dayPlan.service.impl; -import java.util.Collection; import java.util.List; +import javax.validation.Valid; + import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.ApproveCodeEnum; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; import com.pictc.utils.CollectionUtils; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; @@ -21,6 +33,7 @@ import com.xjrsoft.module.system.vo.LngFileUploadVo; import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: service @@ -39,6 +52,8 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); + + List billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); + vo.setLngFileUploadList(billFileList); return vo; } + + @Override + public void cancel(@Valid List ids) { + List tempList = Lists.newArrayList(); + for(Long id:ids) { + LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id); + if (lngPngSettleHdr == null) { + throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); + + } + /** + if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) && + !ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) { + throw new BusinessException(BusinessCode.of(10500,"审批状态变化，不能提交")); + } + **/ + lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode()); + + tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrDto.class)); + } + dataService.updateBatch(tempList,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + + String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + }); + + } } From a50834f302cecf7b967551bf6e3f2fcb001c052e Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 10 Feb 2026 15:54:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/UpdateLngPngSettleSalesDtlDto.java | 20 +++---- .../dayPlan/vo/LngPngSettleHdrPurVo.java | 16 ++++++ .../module/dayPlan/vo/LngPngSettleHdrVo.java | 12 +++++ .../module/dayPlan/vo/LngPngSettlePurVo.java | 5 ++ .../dayPlan/vo/LngPngSettleSalesVo.java | 13 ++++- .../controller/PngSettleHdrPurController.java | 52 ++++++++++++++++--- .../PngSettleHdrSalesController.java | 10 ++++ .../dayPlan/entity/LngPngSettlePur.java | 5 ++ .../dayPlan/entity/LngPngSettleSales.java | 4 ++ .../dayPlan/mapper/LngPngSettleHdrMapper.java | 7 ++- .../dayPlan/mapper/LngPngSettlePurMapper.java | 4 ++ .../mapper/LngPngSettleSalesMapper.java | 9 ++++ .../dayPlan/service/IPngSettleHdrService.java | 2 + .../impl/PngSettleHdrPurServiceImpl.java | 9 ++-- .../service/impl/PngSettleHdrServiceImpl.java | 16 +++--- 15 files changed, 155 insertions(+), 29 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java index 43c3896..81116d0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDtlDto.java @@ -55,63 +55,63 @@ public class UpdateLngPngSettleSalesDtlDto implements Serializable { /** * 主计量单位(从lng_png_settle_sales带) */ - @LogField(name="主计量单位(从lng_png_settle_sales带)",index=4) + @LogField(name="主计量单位",index=4) @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") private String uomCode; /** * 阶梯量（吉焦） */ - @LogField(name="阶梯量（吉焦）",index=5) + @LogField(name="阶梯量",index=5) @ApiModelProperty("阶梯量（吉焦）") private BigDecimal rateQtyGj; /** * 阶梯量（方） */ - @LogField(name="阶梯量（方）",index=6) + @LogField(name="阶梯量",index=6) @ApiModelProperty("阶梯量（方）") private BigDecimal rateQtyM3; /** * 比值(方/吉焦) */ - @LogField(name="比值(方/吉焦)",index=7) + @LogField(name="比值",index=7) @ApiModelProperty("比值(方/吉焦)") private BigDecimal rateM3Gj; /** * 结算数量(吉焦) */ - @LogField(name="结算数量(吉焦)",index=8) + @LogField(name="结算数量",index=8) @ApiModelProperty("结算数量(吉焦)") private BigDecimal qtySettleGj; /** * 结算数量(方) */ - @LogField(name="结算数量(方)",index=9) + @LogField(name="结算数量",index=9) @ApiModelProperty("结算数量(方)") private BigDecimal qtySettleM3; /** * 价格(元/吉焦) */ - @LogField(name="价格(元/吉焦)",index=10) + @LogField(name="价格",index=10) @ApiModelProperty("价格(元/吉焦)") private BigDecimal priceGj; /** * 价格(元/方) */ - @LogField(name="价格(元/方)",index=11) - @ApiModelProperty("价格(元/方)") + @LogField(name="价格",index=11) + @ApiModelProperty("价格") private BigDecimal priceM3; /** * 金额(自动计算) */ - @LogField(name="金额(自动计算)",index=12) + @LogField(name="金额",index=12) @ApiModelProperty("金额(自动计算)") private BigDecimal amount; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java index e99dab7..2c7639d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrPurVo.java @@ -4,6 +4,9 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -29,6 +32,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode * 结算月 */ @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM") private LocalDateTime settleMonth; @@ -36,6 +40,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode * 结算月开始日期 */ @ApiModelProperty("结算月开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; @@ -43,6 +48,7 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode * 结算月结束日期 */ @ApiModelProperty("结算月结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateTo; @@ -50,22 +56,30 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) */ @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + @Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "discTypeName") private String settleTypeCode; + private String settleTypeName; /** * 供应商/客户(根据结算类型关联供应商/客户) */ @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + @Trans(type = TransType.SUPPLIER, transToFieldName = "cpName") private String cpCode; + private String cpName; + /** * 交易主体(天然气公司/惠贸) */ @ApiModelProperty("交易主体(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") private Long comId; + private String comName; + /** * 结算总数量(吉焦)(不包含二次结算的数量) @@ -108,6 +122,8 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode @ApiModelProperty("审批状态") private String approCode; + private String approName; + /** * 结算说明 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java index 739c513..da05301 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java @@ -4,6 +4,9 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -29,6 +32,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ * 结算月 */ @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM") private LocalDateTime settleMonth; @@ -36,6 +40,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ * 结算月开始日期 */ @ApiModelProperty("结算月开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; @@ -43,6 +48,7 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ * 结算月结束日期 */ @ApiModelProperty("结算月结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateTo; @@ -57,15 +63,21 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{ * 供应商/客户(根据结算类型关联供应商/客户) */ @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + @Trans(type = TransType.CUSTOMER, transToFieldName = "cpName") private String cpCode; + private String cpName; + /** * 交易主体(天然气公司/惠贸) */ @ApiModelProperty("交易主体(天然气公司/惠贸)") + @Trans(type = TransType.DEPT, transToFieldName = "comName") private Long comId; + private String comName; + /** * 结算总数量(吉焦)(不包含二次结算的数量) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java index ba57c87..de8208a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,6 +57,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 结算月 */ @ApiModelProperty("结算月") + @JsonFormat(pattern = "yyyy-MM") private LocalDateTime settleMonth; @@ -69,6 +72,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 计划日期(从lng_png_sales_pur带) */ @ApiModelProperty("计划日期(从lng_png_sales_pur带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime datePlan; @@ -76,6 +80,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 计量日期(从lng_png_sales_pur带) */ @ApiModelProperty("计量日期(从lng_png_sales_pur带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateMea; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java index a77720c..d105cb1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java @@ -4,6 +4,10 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,6 +45,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel * 结算月(从主表带) */ @ApiModelProperty("结算月(从主表带)") + @JsonFormat(pattern = "yyyy-MM") private LocalDateTime settleMonth; @@ -55,6 +60,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel * 计划日期(从lng_png_sales带) */ @ApiModelProperty("计划日期(从lng_png_sales带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime datePlan; @@ -62,6 +68,7 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel * 计量日期(从lng_png_sales带) */ @ApiModelProperty("计量日期(从lng_png_sales带)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateMea; @@ -69,8 +76,9 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel * 客户(从lng_png_sales带) */ @ApiModelProperty("客户(从lng_png_sales带)") + @Trans(type = TransType.CUSTOMER, transToFieldName = "cuName") private String cuCode; - + private String cuName; /** * 合同主键(从lng_png_sales带) @@ -90,8 +98,11 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel * 交割点(从lng_png_sales带) */ @ApiModelProperty("交割点(从lng_png_sales带)") + @Trans(type = TransType.LNG_STATION, transToFieldName = "pointDelyName") private String pointDelyCode; + private String pointDelyName; + /** * 主计量单位(从lng_png_sales带) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java index 58c9ac7..81fdf8c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrPurController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -23,6 +25,7 @@ import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur; import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService; @@ -90,23 +93,60 @@ public class PngSettleHdrPurController { @PostMapping @ApiOperation(value = "新增LngPngSettleHdr") @SaCheckPermission("pngSettleHdrPur:add") - public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ - UpdateLngPngSettleHdrDto res = dataService.insert(dto); - return R.ok(res.getId()); + public R add(@Valid @RequestBody UpdateLngPngSettleHdrPurDto dto){ + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + return null; + } + })); } @PutMapping @ApiOperation(value = "修改LngPngSettleHdr") @SaCheckPermission("pngSettleHdrPur:edit") - public R update(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ - return R.ok(dataService.updateById(dto)); + public R update(@Valid @RequestBody UpdateLngPngSettleHdrPurDto dto){ + //return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + return null; + } + })); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("pngSettleHdrPur:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngPngSettleHdrPurDto.class, ids,new DataOperationListener() { + + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + return null; + } + })); + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java index 198f831..8765400 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrSalesController.java @@ -25,12 +25,14 @@ import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto; import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleSalesDto; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; @@ -101,6 +103,14 @@ public class PngSettleHdrSalesController { @SaCheckPermission("pngSettleHdr:add") public R add(@Valid @RequestBody UpdateLngPngSettleHdrDto dto){ + if(CollectionUtil.isNotEmpty(dto.getLngPngSettleSalesList())) { + for(UpdateLngPngSettleSalesDto temp: dto.getLngPngSettleSalesList()) { + if(temp != null) { + Long times = pngSettleHdrService.countSettleTimes(temp.getSalesId(),temp.getSettleTypeCode()); + temp.setSettleTimes((byte) (times+1)); + } + } + } return R.ok(dataService.insert(dto,new DataOperationListener() { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java index 2c0de67..7453faf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettlePur.java @@ -106,6 +106,7 @@ public class LngPngSettlePur implements Serializable { @ApiModelProperty("合同主键(从lng_png_sales_pur带)") @TableField(updateStrategy = FieldStrategy.IGNORED) private Long kpId; + /** * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) @@ -283,5 +284,9 @@ public class LngPngSettlePur implements Serializable { @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "settleId") private List lngPngSettlePurDtlList; + + + @TableField(exist = false) + private String ksName; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java index b021186..ae1b699 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java @@ -242,5 +242,9 @@ public class LngPngSettleSales implements Serializable { @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "settleId") private List lngPngSettleSalesDtlList; + + + @TableField(exist = false) + private String ksName; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java index 6e6212b..3c0b990 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrMapper.java @@ -1,9 +1,12 @@ package com.xjrsoft.module.dayPlan.mapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr; -import org.apache.ibatis.annotations.Mapper; /** * @title: mapper @@ -14,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngPngSettleHdrMapper extends MPJBaseMapper,BaseMapper { + + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java index 1f7cc3c..66336cf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngPngSettlePurMapper extends MPJBaseMapper ,BaseMapper{ + @Select("SELECT k.k_name FROM lng_contract k WHERE k.id = #{id}") + String getKsNameBygId(@Param("id") Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java index 4d6d548..fdd1fe7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngPngSettleSalesMapper extends MPJBaseMapper,BaseMapper { + @Select("SELECT k.k_name FROM lng_contract k WHERE k.id = #{id}") + String getKsNameBygId(@Param("id") Long id); + + @Select(" SELECT count(ss.id) "+ + " FROM lng_png_settle_sales ss "+ + " WHERE ss.sales_id = #{salesId} and ss.settle_type_code = #{settleTypeCode}") + Long countSettleTimes(@Param("salesId") Long salesId,@Param("settleTypeCode") String settleTypeCode); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java index 0a29aeb..09f55ee 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrService.java @@ -22,5 +22,7 @@ public interface IPngSettleHdrService extends MPJBaseService, M LngPngSettleHdrVo getInfoById(Long id); void cancel(@Valid List ids); + + Long countSettleTimes(Long salesId, String settleTypeCode); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java index 0272ad7..11b323f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java @@ -64,10 +64,11 @@ public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl list = lngPngSettlePurDtlMapper.selectList(new LambdaQueryWrapper() - .eq(LngPngSettlePurDtl::getSettleId, ss.getId())); - ss.setLngPngSettlePurDtlList(list); + .eq(LngPngSettlePurDtl::getSettleId, sp.getId())); + sp.setLngPngSettlePurDtlList(list); } } LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class); @@ -75,7 +76,7 @@ public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); - vo.setLngFileUploadList(billFileList); + vo.setBillList(billFileList); return vo; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java index 9e4d0d8..38586b2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -64,6 +64,7 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl list = lngPngSettleSalesDtlMapper.selectList(new LambdaQueryWrapper() .eq(LngPngSettleSalesDtl::getSettleId, ss.getId())); ss.setLngPngSettleSalesDtlList(list); @@ -74,7 +75,7 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId()); - vo.setLngFileUploadList(billFileList); + vo.setBillList(billFileList); return vo; } @@ -87,12 +88,7 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl Date: Tue, 10 Feb 2026 17:48:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E9=81=93=E6=B0=94=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/vo/LngPngSettlePurDtlVo.java | 45 +++++++++++-------- .../module/dayPlan/vo/LngPngSettlePurVo.java | 2 +- .../dayPlan/vo/LngPngSettleSalesDtlVo.java | 9 ++++ .../dayPlan/vo/LngPngSettleSalesVo.java | 2 + .../mapper/LngPngSettlePurDtlMapper.java | 16 +++++++ .../mapper/LngPngSettleSalesDtlMapper.java | 16 +++++++ .../service/impl/DemandServiceImpl.java | 4 +- .../impl/PngSettleHdrPurServiceImpl.java | 32 ++++++------- .../service/impl/PngSettleHdrServiceImpl.java | 28 ++++++------ 9 files changed, 102 insertions(+), 52 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java index 41eaaad..1fe00bc 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java @@ -3,6 +3,9 @@ package com.xjrsoft.module.dayPlan.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,24 +33,30 @@ public class LngPngSettlePurDtlVo extends com.xjrsoft.common.model.base.BaseMode /** - * 价格类型(基础量/增量) - */ - @ApiModelProperty("价格类型(基础量/增量)") - private String priceCode; - - - /** - * 优先级 - */ - @ApiModelProperty("优先级") - private Byte sort; - - - /** - * 主计量单位(从lng_png_settle_pur带) - */ - @ApiModelProperty("主计量单位(从lng_png_settle_pur带)") - private String uomCode; + * 价格类型(基础量/增量) + */ + @ApiModelProperty("价格类型(基础量/增量)") + //@Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "priceName") + private String priceCode; + + private String priceName; + + + /** + * 优先级 + */ + @ApiModelProperty("优先级") + private Byte sort; + + + /** + * 主计量单位(从lng_png_settle_sales带) + */ + @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + //@Trans(type = TransType.DIC, id = "2007987645607911425",transToFieldName = "uomName") + private String uomCode; + + private String uomName; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java index de8208a..85372c9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java @@ -279,5 +279,5 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("lngPngSettlePurDtl子表") private List lngPngSettlePurDtlList; - + private String ksName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java index 5434376..6b4c9a9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesDtlVo.java @@ -3,6 +3,9 @@ package com.xjrsoft.module.dayPlan.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,8 +36,11 @@ public class LngPngSettleSalesDtlVo extends com.xjrsoft.common.model.base.BaseMo * 价格类型(基础量/增量) */ @ApiModelProperty("价格类型(基础量/增量)") + // @Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "priceName") private String priceCode; + private String priceName; + /** * 优先级 @@ -47,8 +53,11 @@ public class LngPngSettleSalesDtlVo extends com.xjrsoft.common.model.base.BaseMo * 主计量单位(从lng_png_settle_sales带) */ @ApiModelProperty("主计量单位(从lng_png_settle_sales带)") + // @Trans(type = TransType.DIC, id = "2007987645607911425",transToFieldName = "uomName") private String uomCode; + private String uomName; + /** * 阶梯量（吉焦） diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java index d105cb1..f8a8301 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java @@ -242,6 +242,8 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel */ @ApiModelProperty("lngPngSettleSalesDtl子表") private List lngPngSettleSalesDtlList; + + private String ksName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java index 21c0519..b12def6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurDtlMapper.java @@ -3,7 +3,14 @@ package com.xjrsoft.module.dayPlan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl; +import com.xjrsoft.module.dayPlan.vo.LngPngSettlePurDtlVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleSalesDtlVo; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +21,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngPngSettlePurDtlMapper extends MPJBaseMapper,BaseMapper { + @Select("SELECT spd.*, dd_a.name AS uom_name,dd_b.name as price_name" + + " FROM lng_png_settle_pur_dtl spd" + + " LEFT JOIN xjr_dictionary_item di_a on di_a.code='LNG_UOM'" + + " LEFT JOIN xjr_dictionary_detail dd_a on dd_a.item_id=di_a.id AND dd_a.code=spd.uom_code" + + " LEFT JOIN xjr_dictionary_item di_b on di_b.code='LNG_BASE'" + + " LEFT JOIN xjr_dictionary_detail dd_b on dd_b.item_id=di_b.id AND dd_b.code=spd.price_code" + + " WHERE spd.settle_id = #{id}" + + " ORDER BY spd.sort") + List queryDtlList(@Param("id")Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java index c38625b..531ab25 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleSalesDtlMapper.java @@ -3,7 +3,14 @@ package com.xjrsoft.module.dayPlan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl; +import com.xjrsoft.module.dayPlan.vo.LngPngDemandPurVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleSalesDtlVo; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +21,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngPngSettleSalesDtlMapper extends MPJBaseMapper,BaseMapper { + @Select("SELECT ssd.*, dd_a.name AS uom_name,dd_b.name as price_name" + + " FROM lng_png_settle_sales_dtl ssd" + + " LEFT JOIN xjr_dictionary_item di_a on di_a.code='LNG_UOM'" + + " LEFT JOIN xjr_dictionary_detail dd_a on dd_a.item_id=di_a.id AND dd_a.code=ssd.uom_code" + + " LEFT JOIN xjr_dictionary_item di_b on di_b.code='LNG_BASE'" + + " LEFT JOIN xjr_dictionary_detail dd_b on dd_b.item_id=di_b.id AND dd_b.code=ssd.price_code" + + " WHERE ssd.settle_id = #{id}" + + " ORDER BY ssd.sort") + List queryDtlList(@Param("id")Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java index fe40423..286fc38 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java @@ -203,7 +203,7 @@ public class DemandServiceImpl extends MPJBaseServiceImpl ids) { List tempList = Lists.newArrayList(); for(Long id:ids) { - LngPngDemand lngPngDemand = this.getByIdDeep(id); + LngPngDemandVo lngPngDemand = this.getInfoById(id); if (lngPngDemand == null) { throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); @@ -358,7 +358,7 @@ public class DemandServiceImpl extends MPJBaseServiceImpl list = lngPngSettlePurDtlMapper.selectList(new LambdaQueryWrapper() - .eq(LngPngSettlePurDtl::getSettleId, sp.getId())); + List list = lngPngSettlePurDtlMapper.queryDtlList(sp.getId()); sp.setLngPngSettlePurDtlList(list); } } - LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class); + List fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); @@ -83,32 +84,27 @@ public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl ids) { - List tempList = Lists.newArrayList(); + List tempList = Lists.newArrayList(); for(Long id:ids) { - LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id); + LngPngSettleHdrPur lngPngSettleHdr = this.getById(id); if (lngPngSettleHdr == null) { throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); } - /** - if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) && - !ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) { - throw new BusinessException(BusinessCode.of(10500,"审批状态变化，不能提交")); - } - **/ + lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode()); - tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrPurDto.class)); + tempList.add(lngPngSettleHdr); } - dataService.updateBatch(tempList,new DataOperationListener() { + dataService.updateBatch(tempList,new DataOperationListener() { @Override - public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + public LngPngSettleHdrPur before(DataOperationContent content) { return null; } @Override - public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + public LngPngSettleHdrPur after(DataOperationContent content) { String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", content.getTableName()); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java index 38586b2..99f7461 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java @@ -28,6 +28,8 @@ import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper; import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper; import com.xjrsoft.module.dayPlan.service.IPngSettleHdrService; import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleSalesDtlVo; +import com.xjrsoft.module.dayPlan.vo.LngPngSettleSalesVo; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -44,7 +46,8 @@ import shade.powerjob.com.google.common.collect.Lists; @Service @AllArgsConstructor public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl implements IPngSettleHdrService { - private final LngPngSettleHdrMapper lngPngSettleHdrMapper; + + private final LngPngSettleHdrMapper lngPngSettleHdrMapper; private final LngPngSettleSalesMapper lngPngSettleSalesMapper; @@ -61,16 +64,15 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl list = lngPngSettleSalesDtlMapper.selectList(new LambdaQueryWrapper() - .eq(LngPngSettleSalesDtl::getSettleId, ss.getId())); + List list = lngPngSettleSalesDtlMapper.queryDtlList(ss.getId()); ss.setLngPngSettleSalesDtlList(list); } } - LngPngSettleHdrVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class); + List fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); @@ -81,9 +83,9 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl ids) { - List tempList = Lists.newArrayList(); + List tempList = Lists.newArrayList(); for(Long id:ids) { - LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id); + LngPngSettleHdr lngPngSettleHdr = this.getById(id); if (lngPngSettleHdr == null) { throw new BusinessException(BusinessCode.of(10500,"找不到此数据！")); @@ -91,17 +93,17 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl() { + dataService.updateBatch(tempList,new DataOperationListener() { @Override - public UpdateLngPngSettleHdrDto before(DataOperationContent content) { + public LngPngSettleHdr before(DataOperationContent content) { return null; } @Override - public UpdateLngPngSettleHdrDto after(DataOperationContent content) { + public LngPngSettleHdr after(DataOperationContent content) { String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}", content.getTableName());