From 4953cfa2836b62d71750a28b98ef0e8ec3a4e1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Wed, 14 Jan 2026 17:43:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?--=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E6=9C=89id=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pictc/utils/DataLogTools.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index 475d69a..dff5a6b 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -131,22 +131,32 @@ public class DataLogTools { public static T insert(T entity,DataOperationListener listener) { Class klazz = entity.getClass(); List logs = CollectionUtils.newArrayList(); - DataChangeLog datalog = createLog(klazz,OperationType.INSERT); LogTableInfo tabInfo = getAnnotation(klazz); initJoinValue(entity,tabInfo,null); Long idValue = tabInfo.getIdValue(entity); BaseMapper mapper = MybatisTools.getMapper(tabInfo.getEntityType()); + T old = findById(klazz, idValue); + DataChangeLog datalog = old!=null ? createLog(klazz,OperationType.UPDATE) : createLog(klazz,OperationType.INSERT); DataOperationContent content = null; if(listener!=null) { - content = DataOperationContent.of(tabInfo,OperationType.INSERT,entity,null); + if(old!=null) { + content = DataOperationContent.of(tabInfo,OperationType.UPDATE,entity,old); + }else { + content = DataOperationContent.of(tabInfo,OperationType.INSERT,entity,null); + } listener.before(content); } try { - mapper.insert(BeanUtil.toBean(entity,tabInfo.getEntityType())); - saveAttrs(tabInfo,entity); datalog.setEntityId(idValue); - buildFields(datalog,tabInfo,entity,null); + if(old!=null) { + buildFields(datalog,tabInfo,entity,old); + mapper.updateById(tabInfo.toEntity(entity)); + }else { + buildFields(datalog,tabInfo,entity,null); + mapper.insert(tabInfo.toEntity(entity)); + } + saveAttrs(tabInfo,entity); logs.add(datalog); List joins = tabInfo.getJoins(); if(CollectionUtils.isNotEmpty(joins)) { @@ -647,7 +657,6 @@ public class DataLogTools { if(CollectionUtils.isNotEmpty(listValue)) { if(type==OperationType.INSERT || type==OperationType.DELETE) { if(type==OperationType.INSERT) { - for (Object item : listValue) { Long idValue = joinTable.getIdValue(item); DataChangeLog datalog = createLog(join.getTargetClass(),type,parent); From 249f0378438fb6d096a6fe2ac7e02bf7dd598b5f Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 15 Jan 2026 16:58:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/dto/AddLngPngDemandDto.java | 188 ++++++++++ .../dayPlan/dto/AddLngPngDemandPurDto.java | 108 ++++++ .../dayPlan/dto/LngPngDemandPageDto.java | 98 +++++ .../dayPlan/dto/UpdateLngPngDemandDto.java | 268 ++++++++++++++ .../dayPlan/dto/UpdateLngPngDemandPurDto.java | 149 ++++++++ .../dto/UpdateLngPngMeasureSalesPurDto.java | 56 +-- .../module/dayPlan/vo/LngPngDemandPageVo.java | 117 ++++++ .../module/dayPlan/vo/LngPngDemandPurVo.java | 181 +++++++++ .../module/dayPlan/vo/LngPngDemandVo.java | 297 +++++++++++++++ .../dayPlan/vo/LngPngMeasureSalesPurVo.java | 8 +- .../dayPlan/controller/DemandController.java | 130 +++++++ .../PngMeasureSalesPurController.java | 31 +- .../module/dayPlan/entity/LngPngDemand.java | 343 ++++++++++++++++++ .../dayPlan/entity/LngPngDemandPur.java | 213 +++++++++++ .../dayPlan/mapper/LngPngDemandMapper.java | 40 ++ .../dayPlan/mapper/LngPngDemandPurMapper.java | 17 + .../dayPlan/service/IDemandService.java | 25 ++ .../service/IPngMeasureSalesPurService.java | 8 +- .../service/impl/DemandServiceImpl.java | 52 +++ .../impl/PngMeasureSalesPurServiceImpl.java | 23 ++ .../service/impl/CustomerServiceImpl.java | 4 +- 21 files changed, 2301 insertions(+), 55 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandPurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngDemandPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPurVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/DemandController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemand.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemandPur.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandPurMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IDemandService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandDto.java new file mode 100644 index 0000000..dff6e37 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandDto.java @@ -0,0 +1,188 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + + + +/** +* @title: 日计划-客户需求 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +public class AddLngPngDemandDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + private Long orgId; + /** + * 版本号(初始为1，变更时+1) + */ + @ApiModelProperty("版本号(初始为1，变更时+1)") + private Byte verNo; + /** + * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N) + */ + @ApiModelProperty("最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)") + private String lastVerSign; + /** + * 变更标识(I/U/D对原始计划的增改删) + */ + @ApiModelProperty("变更标识(I/U/D对原始计划的增改删)") + private String alterSign; + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + private LocalDateTime datePlan; + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 交易主体编码(天然气公司/惠贸；只读从合同带) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸；只读从合同带)") + private Long comId; + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point)") + private Long ksppId; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 电厂开机方式-连运机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-连运机组数(电厂用户填报开机方式)") + private Short powerCont; + /** + * 电厂开机方式-调峰机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-调峰机组数(电厂用户填报开机方式)") + private Short powerPeak; + /** + * 电厂开机方式-停机机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-停机机组数(电厂用户填报开机方式)") + private Short powerStop; + /** + * 电厂开机方式-其他机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-其他机组数(电厂用户填报开机方式)") + private Short powerOther; + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + /** + * 日合同量(吉焦)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(吉焦)(只读，从合同带过来)") + private BigDecimal qtyContractGj; + /** + * 日合同量(方)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(方)(只读，从合同带过来)") + private BigDecimal qtyContractM3; + /** + * 日计划量(吉焦)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(吉焦)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanGj; + /** + * 日计划量(方)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(方)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanM3; + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandGj; + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandM3; + /** + * 日批复量(吉焦)(只读) + */ + @ApiModelProperty("日批复量(吉焦)(只读)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方)(只读) + */ + @ApiModelProperty("日批复量(方)(只读)") + private BigDecimal qtySalesM3; + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + private BigDecimal priceSalesGj; + /** + * 销售价格(元/方)(提交时获取) + */ + @ApiModelProperty("销售价格(元/方)(提交时获取)") + private BigDecimal priceSalesM3; + /** + * 销售金额(自动计算，扣减预付款用) + */ + @ApiModelProperty("销售金额(自动计算，扣减预付款用)") + private BigDecimal amountSales; + /** + * 审批状态(待提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)") + private String approCode; + /** + * 提交时间 + */ + @ApiModelProperty("提交时间") + private LocalDateTime timeSubmit; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPngDemandPur + */ + @ApiModelProperty("lngPngDemandPur子表") + private List lngPngDemandPurList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandPurDto.java new file mode 100644 index 0000000..22419e3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngDemandPurDto.java @@ -0,0 +1,108 @@ +package com.xjrsoft.module.dayPlan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 日计划-客户需求 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +public class AddLngPngDemandPurDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 日计划-管道气-客户需求主键 + */ + @ApiModelProperty("日计划-管道气-客户需求主键") + private Long demandId; + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 日指定量(吉焦)(客户填报) + */ + @ApiModelProperty("日指定量(吉焦)(客户填报)") + private BigDecimal qtyDemandGj; + /** + * 日指定量(方)(客户填报) + */ + @ApiModelProperty("日指定量(方)(客户填报)") + private BigDecimal qtyDemandM3; + /** + * 日批复量(吉焦)(销售批复回写) + */ + @ApiModelProperty("日批复量(吉焦)(销售批复回写)") + private BigDecimal qtySalesGj; + /** + * 日批复量(方)(销售批复回写) + */ + @ApiModelProperty("日批复量(方)(销售批复回写)") + private BigDecimal qtySalesM3; + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + /** + * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段) + */ + @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)") + private String addSign; + /** + * 备注 + */ + @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/LngPngDemandPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngDemandPageDto.java new file mode 100644 index 0000000..a0be35e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngDemandPageDto.java @@ -0,0 +1,98 @@ +package com.xjrsoft.module.dayPlan.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPngDemandPageDto extends PageInput { + + /** + * 版本号(初始为1，变更时+1) + */ + @ApiModelProperty("版本号(初始为1，变更时+1)") + private Byte verNo; + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime datePlan; + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 交割点名称 + */ + @ApiModelProperty("交割点名称") + private String pointDelyName; + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandGj; + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandM3; + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + private BigDecimal priceSalesGj; + /** + * 销售价格(元/方)(提交时获取) + */ + @ApiModelProperty("销售价格(元/方)(提交时获取)") + private BigDecimal priceSalesM3; + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息名称主键（销售）(lng_contract)") + private String kName; + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + private Long orgId; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandDto.java new file mode 100644 index 0000000..ae3125d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandDto.java @@ -0,0 +1,268 @@ +package com.xjrsoft.module.dayPlan.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +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 test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_demand",name="日计划-客户需求") +public class UpdateLngPngDemandDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @LogField(name="版本1主键",index=1) + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + private Long orgId; + + /** + * 版本号(初始为1，变更时+1) + */ + @LogField(name="版本号",index=2) + @ApiModelProperty("版本号(初始为1，变更时+1)") + private Byte verNo; + + /** + * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N) + */ + @LogField(name="最新版本标识",index=3) + @ApiModelProperty("最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)") + private String lastVerSign; + + /** + * 变更标识(I/U/D对原始计划的增改删) + */ + @LogField(name="变更标识",index=4) + @ApiModelProperty("变更标识(I/U/D对原始计划的增改删)") + private String alterSign; + + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @LogField(name="计划日期",index=5) + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + private LocalDateTime datePlan; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=6) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸；只读从合同带) + */ + @LogField(name="交易主体编码",index=7) + @ApiModelProperty("交易主体编码(天然气公司/惠贸；只读从合同带)") + private Long comId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @LogField(name="合同-主信息主键",index=8) + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point) + */ + @LogField(name="合同-国内销售-管道气-交割点主键",index=9) + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point)") + private Long ksppId; + + /** + * 交割点编码 + */ + @LogField(name="交割点编码",index=10) + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 电厂开机方式-连运机组数(电厂用户填报开机方式) + */ + @LogField(name="电厂开机方式-连运机组数",index=11) + @ApiModelProperty("电厂开机方式-连运机组数(电厂用户填报开机方式)") + private Short powerCont; + + /** + * 电厂开机方式-调峰机组数(电厂用户填报开机方式) + */ + @LogField(name="电厂开机方式-调峰机组数",index=12) + @ApiModelProperty("电厂开机方式-调峰机组数(电厂用户填报开机方式)") + private Short powerPeak; + + /** + * 电厂开机方式-停机机组数(电厂用户填报开机方式) + */ + @LogField(name="电厂开机方式-停机机组数",index=13) + @ApiModelProperty("电厂开机方式-停机机组数(电厂用户填报开机方式)") + private Short powerStop; + + /** + * 电厂开机方式-其他机组数(电厂用户填报开机方式) + */ + @LogField(name="电厂开机方式-其他机组数",index=14) + @ApiModelProperty("电厂开机方式-其他机组数(电厂用户填报开机方式)") + private Short powerOther; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @LogField(name="比值",index=15) + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + /** + * 日合同量(吉焦)(只读，从合同带过来) + */ + @LogField(name="日合同量",index=16) + @ApiModelProperty("日合同量(吉焦)(只读，从合同带过来)") + private BigDecimal qtyContractGj; + + /** + * 日合同量(方)(只读，从合同带过来) + */ + @LogField(name="日合同量",index=17) + @ApiModelProperty("日合同量(方)(只读，从合同带过来)") + private BigDecimal qtyContractM3; + + /** + * 日计划量(吉焦)(只读，从月度分日计划带过来) + */ + @LogField(name="日计划量",index=18) + @ApiModelProperty("日计划量(吉焦)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanGj; + + /** + * 日计划量(方)(只读，从月度分日计划带过来) + */ + @LogField(name="日计划量",index=19) + @ApiModelProperty("日计划量(方)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanM3; + + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @LogField(name="日指定量",index=20) + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandGj; + + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @LogField(name="日指定量",index=21) + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandM3; + + /** + * 日批复量(吉焦)(只读) + */ + @LogField(name="日批复量",index=22) + @ApiModelProperty("日批复量(吉焦)(只读)") + private BigDecimal qtySalesGj; + + /** + * 日批复量(方)(只读) + */ + @LogField(name="日批复量",index=23) + @ApiModelProperty("日批复量(方)(只读)") + private BigDecimal qtySalesM3; + + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @LogField(name="销售价格",index=24) + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + private BigDecimal priceSalesGj; + + /** + * 销售价格(元/方)(提交时获取) + */ + @LogField(name="销售价格",index=25) + @ApiModelProperty("销售价格(元/方)(提交时获取)") + private BigDecimal priceSalesM3; + + /** + * 销售金额(自动计算，扣减预付款用) + */ + @LogField(name="销售金额",index=26) + @ApiModelProperty("销售金额(自动计算，扣减预付款用)") + private BigDecimal amountSales; + + /** + * 审批状态(待提交/审批中/已审批/已驳回) + */ + @LogField(name="审批状态",index=27) + @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 提交时间 + */ + @LogField(name="提交时间",index=28) + @ApiModelProperty("提交时间") + private LocalDateTime timeSubmit; + + /** + * 批复意见 + */ + @LogField(name="批复意见",index=29) + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @LogField(name="备注",index=30) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=31) + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * lngPngDemandPur + */ + @ApiModelProperty("lngPngDemandPur子表") + @LogJoin(name = "lngPngDemandPur子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "demandId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPngDemandPurDto.class, type = JoinType.MANY) + private List lngPngDemandPurList; +} 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 new file mode 100644 index 0000000..f84ac7e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngDemandPurDto.java @@ -0,0 +1,149 @@ +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 test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_png_demand_pur",name="日计划-客户需求") +public class UpdateLngPngDemandPurDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 日计划-管道气-客户需求主键 + */ + @LogField(name="日计划-管道气-客户需求主键",index=1) + @ApiModelProperty("日计划-管道气-客户需求主键") + private Long demandId; + + /** + * 供应商 + */ + @LogField(name="供应商",index=2) + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同-主信息主键 + */ + @LogField(name="采购合同-主信息主键",index=3) + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @LogField(name="合同-国内采购-管道气-上载点主键",index=4) + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + /** + * 上载点 + */ + @LogField(name="上载点",index=5) + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @LogField(name="自主托运(Y-是，N-否)",index=6) + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=7) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 日指定量(吉焦)(客户填报) + */ + @LogField(name="日指定量(吉焦)(客户填报)",index=8) + @ApiModelProperty("日指定量(吉焦)(客户填报)") + private BigDecimal qtyDemandGj; + + /** + * 日指定量(方)(客户填报) + */ + @LogField(name="日指定量(方)(客户填报)",index=9) + @ApiModelProperty("日指定量(方)(客户填报)") + private BigDecimal qtyDemandM3; + + /** + * 日批复量(吉焦)(销售批复回写) + */ + @LogField(name="日批复量(吉焦)(销售批复回写)",index=10) + @ApiModelProperty("日批复量(吉焦)(销售批复回写)") + private BigDecimal qtySalesGj; + + /** + * 日批复量(方)(销售批复回写) + */ + @LogField(name="日批复量(方)(销售批复回写)",index=11) + @ApiModelProperty("日批复量(方)(销售批复回写)") + private BigDecimal qtySalesM3; + + /** + * 顺序 + */ + @LogField(name="顺序",index=12) + @ApiModelProperty("顺序") + private Short sort; + + /** + * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段) + */ + @LogField(name="批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)",index=13) + @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)") + private String addSign; + + /** + * 备注 + */ + @LogField(name="备注",index=14) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=15) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java index eff11e5..753ccb3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngMeasureSalesPurDto.java @@ -1,22 +1,17 @@ package com.xjrsoft.module.dayPlan.dto; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + 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; @@ -43,14 +38,14 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { /** * 日计划-管道气-销售主键(lng_png_sales.id) */ - @LogField(name="日计划-管道气-销售主键(lng_png_sales.id)",index=1) + @LogField(name="日计划-管道气-销售主键",index=1) @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales.id)") private Long salesId; /** * 日计划-管道气-销售-采购主键(lng_png_sales_pur.id) */ - @LogField(name="日计划-管道气-销售-采购主键(lng_png_sales_pur.id)",index=2) + @LogField(name="日计划-管道气-销售-采购主键",index=2) @ApiModelProperty("日计划-管道气-销售-采购主键(lng_png_sales_pur.id)") private Long salesPurId; @@ -64,7 +59,7 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { /** * 计量日期(缺省=计划日期+1) */ - @LogField(name="计量日期(缺省=计划日期+1)",index=4) + @LogField(name="计量日期",index=4) @ApiModelProperty("计量日期(缺省=计划日期+1)") private LocalDateTime dateMea; @@ -78,21 +73,21 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { /** * 交易主体编码(天然气公司/惠贸) */ - @LogField(name="交易主体编码(天然气公司/惠贸)",index=6) + @LogField(name="交易主体编码",index=6) @ApiModelProperty("交易主体编码(天然气公司/惠贸)") private Long comId; /** * 合同-主信息主键（销售）(lng_contract) */ - @LogField(name="合同-主信息主键（销售）(lng_contract)",index=7) + @LogField(name="合同-主信息主键",index=7) @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") private Long ksId; /** * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) */ - @LogField(name="合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)",index=8) + @LogField(name="合同-国内销售-管道气-交割点主键",index=8) @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)") private Long ksppId; @@ -134,42 +129,42 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { /** * 自主托运(Y-是，N-否) */ - @LogField(name="自主托运(Y-是，N-否)",index=14) + @LogField(name="自主托运",index=14) @ApiModelProperty("自主托运(Y-是，N-否)") private String transSign; /** * 比值(方/吉焦) */ - @LogField(name="比值(方/吉焦)",index=15) + @LogField(name="比值",index=15) @ApiModelProperty("比值(方/吉焦)") private BigDecimal rateM3Gj; /** * 日批复量(吉焦) */ - @LogField(name="日批复量(吉焦)",index=16) + @LogField(name="日批复量",index=16) @ApiModelProperty("日批复量(吉焦)") private BigDecimal qtySalesGj; /** * 日批复量(方) */ - @LogField(name="日批复量(方)",index=17) + @LogField(name="日批复量",index=17) @ApiModelProperty("日批复量(方)") private BigDecimal qtySalesM3; /** * 日完成量(吉焦) */ - @LogField(name="日完成量(吉焦)",index=18) + @LogField(name="日完成量",index=18) @ApiModelProperty("日完成量(吉焦)") private BigDecimal qtyMeaGj; /** * 日完成量(方) */ - @LogField(name="日完成量(方)",index=19) + @LogField(name="日完成量",index=19) @ApiModelProperty("日完成量(方)") private BigDecimal qtyMeaM3; @@ -215,5 +210,10 @@ public class UpdateLngPngMeasureSalesPurDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; - + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPageVo.java new file mode 100644 index 0000000..33bf0ff --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPageVo.java @@ -0,0 +1,117 @@ +package com.xjrsoft.module.dayPlan.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +public class LngPngDemandPageVo { + + /** + * 主键 + */ + @ExcelIgnore + @ApiModelProperty("主键") + private String id; + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("orgId") + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + private Long orgId; + /** + * 版本号(初始为1，变更时+1) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("版本号") + @ApiModelProperty("版本号(初始为1，变更时+1)") + private Byte verNo; + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("计划日期") + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + private LocalDateTime datePlan; + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("合同") + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("合同") + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private String kName; + /** + * 交割点编码 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("下载点") + @ApiModelProperty("交割点编码") + private String pointDelyCode; + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("指定量 (吉焦)") + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandGj; + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("指定量 (万方)") + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandM3; + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复量 (吉焦)") + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + private BigDecimal priceSalesGj; + /** + * 销售价格(元/方)(提交时获取) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复量 (万方)") + @ApiModelProperty("销售价格(元/方)(提交时获取)") + private BigDecimal priceSalesM3; + /** + * 批复意见 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复意见") + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("备注") + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPurVo.java new file mode 100644 index 0000000..050f18a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandPurVo.java @@ -0,0 +1,181 @@ +package com.xjrsoft.module.dayPlan.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +public class LngPngDemandPurVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 日计划-管道气-客户需求主键 + */ + @ApiModelProperty("日计划-管道气-客户需求主键") + private Long demandId; + + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + private Long kpId; + + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + private Long kpppId; + + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 日指定量(吉焦)(客户填报) + */ + @ApiModelProperty("日指定量(吉焦)(客户填报)") + private BigDecimal qtyDemandGj; + + + /** + * 日指定量(方)(客户填报) + */ + @ApiModelProperty("日指定量(方)(客户填报)") + private BigDecimal qtyDemandM3; + + + /** + * 日批复量(吉焦)(销售批复回写) + */ + @ApiModelProperty("日批复量(吉焦)(销售批复回写)") + private BigDecimal qtySalesGj; + + + /** + * 日批复量(方)(销售批复回写) + */ + @ApiModelProperty("日批复量(方)(销售批复回写)") + private BigDecimal qtySalesM3; + + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + private Short sort; + + + /** + * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段) + */ + @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)") + private String addSign; + + + /** + * 备注 + */ + @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/LngPngDemandVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java new file mode 100644 index 0000000..87a70ed --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngDemandVo.java @@ -0,0 +1,297 @@ +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; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** +* @title: 表单出参 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +public class LngPngDemandVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + private Long orgId; + + + /** + * 版本号(初始为1，变更时+1) + */ + @ApiModelProperty("版本号(初始为1，变更时+1)") + private Byte verNo; + + + /** + * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N) + */ + @ApiModelProperty("最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)") + private String lastVerSign; + + + /** + * 变更标识(I/U/D对原始计划的增改删) + */ + @ApiModelProperty("变更标识(I/U/D对原始计划的增改删)") + private String alterSign; + + + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + private LocalDateTime datePlan; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 交易主体编码(天然气公司/惠贸；只读从合同带) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸；只读从合同带)") + private Long comId; + + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + private Long ksId; + + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point)") + private Long ksppId; + + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + + /** + * 电厂开机方式-连运机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-连运机组数(电厂用户填报开机方式)") + private Short powerCont; + + + /** + * 电厂开机方式-调峰机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-调峰机组数(电厂用户填报开机方式)") + private Short powerPeak; + + + /** + * 电厂开机方式-停机机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-停机机组数(电厂用户填报开机方式)") + private Short powerStop; + + + /** + * 电厂开机方式-其他机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-其他机组数(电厂用户填报开机方式)") + private Short powerOther; + + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + private BigDecimal rateM3Gj; + + + /** + * 日合同量(吉焦)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(吉焦)(只读，从合同带过来)") + private BigDecimal qtyContractGj; + + + /** + * 日合同量(方)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(方)(只读，从合同带过来)") + private BigDecimal qtyContractM3; + + + /** + * 日计划量(吉焦)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(吉焦)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanGj; + + + /** + * 日计划量(方)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(方)(只读，从月度分日计划带过来)") + private BigDecimal qtyPlanM3; + + + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandGj; + + + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + private BigDecimal qtyDemandM3; + + + /** + * 日批复量(吉焦)(只读) + */ + @ApiModelProperty("日批复量(吉焦)(只读)") + private BigDecimal qtySalesGj; + + + /** + * 日批复量(方)(只读) + */ + @ApiModelProperty("日批复量(方)(只读)") + private BigDecimal qtySalesM3; + + + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + private BigDecimal priceSalesGj; + + + /** + * 销售价格(元/方)(提交时获取) + */ + @ApiModelProperty("销售价格(元/方)(提交时获取)") + private BigDecimal priceSalesM3; + + + /** + * 销售金额(自动计算，扣减预付款用) + */ + @ApiModelProperty("销售金额(自动计算，扣减预付款用)") + private BigDecimal amountSales; + + + /** + * 审批状态(待提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)") + private String approCode; + + + /** + * 提交时间 + */ + @ApiModelProperty("提交时间") + private LocalDateTime timeSubmit; + + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + + /** + * 备注 + */ + @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; + + + + + /** + * lngPngDemandPur + */ + @ApiModelProperty("lngPngDemandPur子表") + private List lngPngDemandPurList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java index dce1319..54ef5db 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java @@ -12,6 +12,8 @@ import java.time.LocalDateTime; import java.math.BigDecimal; import java.util.List; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + /** * @title: 表单出参 * @Author test01 @@ -245,7 +247,11 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM private Long ruleUserId; - + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/DemandController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/DemandController.java new file mode 100644 index 0000000..1eda5fd --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/DemandController.java @@ -0,0 +1,130 @@ +package com.xjrsoft.module.dayPlan.controller; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.http.ResponseEntity; +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 org.springframework.web.multipart.MultipartFile; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.ExcelUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.dayPlan.dto.LngPngDemandPageDto; +import com.xjrsoft.module.dayPlan.dto.UpdateLngPngDemandDto; +import com.xjrsoft.module.dayPlan.entity.LngPngDemand; +import com.xjrsoft.module.dayPlan.service.IDemandService; +import com.xjrsoft.module.dayPlan.vo.LngPngDemandPageVo; +import com.xjrsoft.module.dayPlan.vo.LngPngDemandVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 日计划-客户需求 +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/dayPlan/demand") +@Api(value = "/dayPlan" + "/demand",tags = "日计划-客户需求代码") +@AllArgsConstructor +public class DemandController { + + + private final IDemandService demandService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPngDemand列表(分页)") + @SaCheckPermission("demand:list") + public R page(@Valid LngPngDemandPageDto dto){ + + return R.ok(demandService.queryPage(dto)); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPngDemand信息") + @SaCheckPermission("demand:detail") + public R info(@RequestParam Long id){ + LngPngDemand lngPngDemand = demandService.getByIdDeep(id); + if (lngPngDemand == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPngDemand, LngPngDemandVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPngDemand数据详细日志") + @SaCheckPermission("demand:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPngDemandDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPngDemand") + @SaCheckPermission("demand:add") + public R add(@Valid @RequestBody UpdateLngPngDemandDto dto){ + UpdateLngPngDemandDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngPngDemand") + @SaCheckPermission("demand:edit") + public R update(@Valid @RequestBody UpdateLngPngDemandDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("demand:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPngDemandDto.class, ids)); + + } + + @PostMapping("/import") + @ApiOperation(value = "导入") + @SaCheckPermission("demand:import") + public R importData(@RequestParam MultipartFile file) throws IOException { + List savedDataList = EasyExcel.read(file.getInputStream()).head(LngPngDemandPageVo.class).sheet().doReadSync(); + ExcelUtil.transExcelData(savedDataList, true); + dataService.insertBatch(BeanUtil.copyToList(savedDataList,UpdateLngPngDemandDto.class)); + return R.ok(); + } + + @GetMapping("/export") + @ApiOperation(value = "导出") + @SaCheckPermission("demand:export") + public ResponseEntity exportData(@Valid LngPngDemandPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) { + List customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput) page(dto).getData()).getList(); + ExcelUtil.transExcelData(customerList, false); + ByteArrayOutputStream bot = new ByteArrayOutputStream(); + EasyExcel.write(bot, LngPngDemandPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList); + ByteArrayOutputStream resultBot = ExcelUtil.renderExportRequiredHead(bot); + + return R.fileStream(resultBot.toByteArray(), "Demand" + ExcelTypeEnum.XLSX.getValue()); + } +} \ No newline at end of file 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 8ffdd84..db7ab08 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 @@ -73,11 +73,6 @@ public class PngMeasureSalesPurController { .like(StrUtil.isNotBlank(dto.getSuCode()),LngPngMeasureSalesPur::getSuCode,dto.getSuCode()) .like(StrUtil.isNotBlank(dto.getPointUpCode()),LngPngMeasureSalesPur::getPointUpCode,dto.getPointUpCode()) .like(StrUtil.isNotBlank(dto.getPointDelyCode()),LngPngMeasureSalesPur::getPointDelyCode,dto.getPointDelyCode()) - .eq(ObjectUtil.isNotNull(dto.getQtySalesGj()),LngPngMeasureSalesPur::getQtySalesGj,dto.getQtySalesGj()) - .eq(ObjectUtil.isNotNull(dto.getQtySalesM3()),LngPngMeasureSalesPur::getQtySalesM3,dto.getQtySalesM3()) - .eq(ObjectUtil.isNotNull(dto.getQtyMeaGj()),LngPngMeasureSalesPur::getQtyMeaGj,dto.getQtyMeaGj()) - .eq(ObjectUtil.isNotNull(dto.getQtyMeaM3()),LngPngMeasureSalesPur::getQtyMeaM3,dto.getQtyMeaM3()) - .eq(ObjectUtil.isNotNull(dto.getRateM3Gj()),LngPngMeasureSalesPur::getRateM3Gj,dto.getRateM3Gj()) .eq(ObjectUtil.isNotNull(dto.getCfmCuUserId()),LngPngMeasureSalesPur::getCfmCuUserId,dto.getCfmCuUserId()) //.like(StrUtil.isNotBlank(dto.getCfmCuUserTime()),LngPngMeasureSalesPur::getCfmCuUserTime,dto.getCfmCuUserTime()) .eq(ObjectUtil.isNotNull(dto.getCfmEmpId()),LngPngMeasureSalesPur::getCfmEmpId,dto.getCfmEmpId()) @@ -85,8 +80,7 @@ public class PngMeasureSalesPurController { .eq(ObjectUtil.isNotNull(dto.getKpId()),LngPngMeasureSalesPur::getKpId,dto.getKpId()) .like(StrUtil.isNotBlank(dto.getTransSign()),LngPngMeasureSalesPur::getTransSign,dto.getTransSign()) //.between(ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd()),LngPngMeasureSalesPur::getCreateDate,dto.getCreateDateStart(),dto.getCreateDateEnd()) - .like(StrUtil.isNotBlank(dto.getNote()),LngPngMeasureSalesPur::getNote,dto.getNote()) - .orderByDesc(LngPngMeasureSalesPur::getId) + .orderByDesc(LngPngMeasureSalesPur::getId) .select(LngPngMeasureSalesPur.class,x -> VoToColumnUtil.fieldsToColumns(LngPngMeasureSalesPurPageVo.class).contains(x.getProperty())); IPage page = pngMeasureSalesPurService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngMeasureSalesPurPageVo.class); @@ -97,11 +91,8 @@ public class PngMeasureSalesPurController { @ApiOperation(value="根据id查询LngPngMeasureSalesPur信息") @SaCheckPermission("pngMeasureSalesPur:detail") public R info(@RequestParam Long id){ - LngPngMeasureSalesPur lngPngMeasureSalesPur = pngMeasureSalesPurService.getById(id); - if (lngPngMeasureSalesPur == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class)); + LngPngMeasureSalesPurVo lngPngMeasureSalesPur = pngMeasureSalesPurService.getInfoById(id); + return R.ok(lngPngMeasureSalesPur); } @GetMapping(value = "/datalog") @@ -114,19 +105,19 @@ public class PngMeasureSalesPurController { @PostMapping - @ApiOperation(value = "新增LngPngMeasureSalesPur") + @ApiOperation(value = "保存LngPngMeasureSalesPur") @SaCheckPermission("pngMeasureSalesPur:add") public R add(@Valid @RequestBody UpdateLngPngMeasureSalesPurDto dto){ - UpdateLngPngMeasureSalesPurDto res = dataService.insert(dto); + UpdateLngPngMeasureSalesPurDto res = null; + if(dto.getId() == null) { + res = dataService.insert(dto); + }else { + dataService.updateById(dto); + res = dto; + } return R.ok(res.getId()); } - @PutMapping - @ApiOperation(value = "修改LngPngMeasureSalesPur") - @SaCheckPermission("pngMeasureSalesPur:edit") - public R update(@Valid @RequestBody UpdateLngPngMeasureSalesPurDto dto){ - return R.ok(dataService.updateById(dto)); - } @DeleteMapping @ApiOperation(value = "删除") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemand.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemand.java new file mode 100644 index 0000000..f3c95da --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemand.java @@ -0,0 +1,343 @@ +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 test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_demand") +@ApiModel(value = "日计划-客户需求对象", description = "日计划-客户需求") +public class LngPngDemand implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键) + */ + @ApiModelProperty("版本1主键(版本号为1的原始计划主键，新计划为自身主键，变更时复制原记录的版本1主键)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long orgId; + + /** + * 版本号(初始为1，变更时+1) + */ + @ApiModelProperty("版本号(初始为1，变更时+1)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte verNo; + + /** + * 最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N) + */ + @ApiModelProperty("最新版本标识(Y-是，N-否；版本1主键相同的记录中只有一个Y；版本变更时将版本1主键相同的其他记录置为N)") + private String lastVerSign; + + /** + * 变更标识(I/U/D对原始计划的增改删) + */ + @ApiModelProperty("变更标识(I/U/D对原始计划的增改删)") + private String alterSign; + + /** + * 计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）) + */ + @ApiModelProperty("计划日期(次日计划为次日；当日计划为当日；同日、同客户、同销售合同交割点、同上载点、同供应商不能重复（仅检查最新版并去掉变更标识为删除的）)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 交易主体编码(天然气公司/惠贸；只读从合同带) + */ + @ApiModelProperty("交易主体编码(天然气公司/惠贸；只读从合同带)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 合同-主信息主键（销售）(lng_contract) + */ + @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksId; + + /** + * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point) + */ + @ApiModelProperty("合同-国内销售-管道气-交割点主键(lng_contract_sales_png_point)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long ksppId; + + /** + * 交割点编码 + */ + @ApiModelProperty("交割点编码") + private String pointDelyCode; + + /** + * 电厂开机方式-连运机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-连运机组数(电厂用户填报开机方式)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short powerCont; + + /** + * 电厂开机方式-调峰机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-调峰机组数(电厂用户填报开机方式)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short powerPeak; + + /** + * 电厂开机方式-停机机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-停机机组数(电厂用户填报开机方式)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short powerStop; + + /** + * 电厂开机方式-其他机组数(电厂用户填报开机方式) + */ + @ApiModelProperty("电厂开机方式-其他机组数(电厂用户填报开机方式)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short powerOther; + + /** + * 比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；) + */ + @ApiModelProperty("比值(方/吉焦)(只读，从参数设置带过来；1立方=37.3兆焦；)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 日合同量(吉焦)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(吉焦)(只读，从合同带过来)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyContractGj; + + /** + * 日合同量(方)(只读，从合同带过来) + */ + @ApiModelProperty("日合同量(方)(只读，从合同带过来)") + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyContractM3; + + /** + * 日计划量(吉焦)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(吉焦)(只读，从月度分日计划带过来)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyPlanGj; + + /** + * 日计划量(方)(只读，从月度分日计划带过来) + */ + @ApiModelProperty("日计划量(方)(只读，从月度分日计划带过来)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyPlanM3; + + /** + * 日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(吉焦)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyDemandGj; + + /** + * 日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计) + */ + @ApiModelProperty("日指定量(方)(只读；>0，<预付款范围内的量；等于lng_png_demand_pur合计)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyDemandM3; + + /** + * 日批复量(吉焦)(只读) + */ + @ApiModelProperty("日批复量(吉焦)(只读)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesGj; + + /** + * 日批复量(方)(只读) + */ + @ApiModelProperty("日批复量(方)(只读)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesM3; + + /** + * 销售价格(元/吉焦)(提交时获取) + */ + @ApiModelProperty("销售价格(元/吉焦)(提交时获取)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceSalesGj; + + /** + * 销售价格(元/方)(提交时获取) + */ + @ApiModelProperty("销售价格(元/方)(提交时获取)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceSalesM3; + + /** + * 销售金额(自动计算，扣减预付款用) + */ + @ApiModelProperty("销售金额(自动计算，扣减预付款用)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amountSales; + + /** + * 审批状态(待提交/审批中/已审批/已驳回) + */ + @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回)") + private String approCode; + + /** + * 提交时间 + */ + @ApiModelProperty("提交时间") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime timeSubmit; + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @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; + + + /** + * lngPngDemandPur + */ + @ApiModelProperty("lngPngDemandPur子表") + @TableField(exist = false) + @EntityMapping(thisField = "id", joinField = "demandId") + private List lngPngDemandPurList; + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemandPur.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemandPur.java new file mode 100644 index 0000000..45ee907 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngDemandPur.java @@ -0,0 +1,213 @@ +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 test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Data +@TableName("lng_png_demand_pur") +@ApiModel(value = "日计划-客户需求对象", description = "日计划-客户需求") +public class LngPngDemandPur implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + @TableId + private Long id; + + /** + * 日计划-管道气-客户需求主键 + */ + @ApiModelProperty("日计划-管道气-客户需求主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long demandId; + + /** + * 供应商 + */ + @ApiModelProperty("供应商") + private String suCode; + + /** + * 采购合同-主信息主键 + */ + @ApiModelProperty("采购合同-主信息主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpId; + + /** + * 合同-国内采购-管道气-上载点主键 + */ + @ApiModelProperty("合同-国内采购-管道气-上载点主键") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kpppId; + + /** + * 上载点 + */ + @ApiModelProperty("上载点") + private String pointUpCode; + + /** + * 自主托运(Y-是，N-否) + */ + @ApiModelProperty("自主托运(Y-是，N-否)") + private String transSign; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 日指定量(吉焦)(客户填报) + */ + @ApiModelProperty("日指定量(吉焦)(客户填报)") + + + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyDemandGj; + + /** + * 日指定量(方)(客户填报) + */ + @ApiModelProperty("日指定量(方)(客户填报)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyDemandM3; + + /** + * 日批复量(吉焦)(销售批复回写) + */ + @ApiModelProperty("日批复量(吉焦)(销售批复回写)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesGj; + + /** + * 日批复量(方)(销售批复回写) + */ + @ApiModelProperty("日批复量(方)(销售批复回写)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySalesM3; + + /** + * 顺序 + */ + @ApiModelProperty("顺序") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short sort; + + /** + * 批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段) + */ + @ApiModelProperty("批复添加标识(Y-批复时增加的记录，N-客户填报记录；缺省N；系统字段)") + private String addSign; + + /** + * 备注 + */ + @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/LngPngDemandMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandMapper.java new file mode 100644 index 0000000..6ad8697 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandMapper.java @@ -0,0 +1,40 @@ +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.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.dto.LngPngDemandPageDto; +import com.xjrsoft.module.dayPlan.entity.LngPngDemand; +import com.xjrsoft.module.dayPlan.vo.LngPngDemandPageVo; + +/** +* @title: mapper +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Mapper +public interface LngPngDemandMapper extends MPJBaseMapper,BaseMapper { + + @Select("SELECT d.id, d.rule_user_id, d.cu_code, d.org_id, d.ver_no, k.date_from,d.last_ver_sign,d.date_plan," + + " (CASE d.date_plan - SYSDATE WHEN 0 THEN '当日' WHEN 1 THEN '次日' ELSE IF(d.date_plan - SYSDATE < 0,'',d.date_plan - SYSDATE || '日后') END) days_sign," + + " sp.full_name AS point_dely_name, d.qty_demand_gj, d.qty_demand_m3,d.qty_sales_gj,d.qty_sales_m3,d.qty_sales_gj," + + " d.qty_sales_m3, k.k_name, d.alter_sign,dd_iud.name as alter_name,d.reply,d.appro_code,dd_a.name as appro_name" + + " FROM lng_png_demand d " + + " LEFT JOIN lng_contract k ON k.id=d.ks_id " + + " LEFT JOIN xjr_dictionary_item di_iud on di_iud.code='LNG_ALTER' " + + " LEFT JOIN xjr_dictionary_detail dd_iud on dd_iud.item_id=di_iud.id AND dd_iud.code=d.alter_sign " + + " LEFT JOIN xjr_dictionary_item di_a on di_a.code='LNG_APPRO' " + + " LEFT JOIN xjr_dictionary_detail dd_a on dd_a.item_id=di_a.id AND dd_a.code=d.appro_code " + + " LEFT JOIN lng_b_station_png sp ON sp.code=d.point_dely_code " + + " ${ew.customSqlSegment}" + + " ORDER BY d.date_plan DESC, (CASE d.appro_code WHEN 'WTJ' THEN 1 WHEN 'YBH' THEN 2 WHEN 'SPZ' THEN 3 WHEN 'YSP' THEN 4 ELSE 5 END) " ) + IPage queryPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandPurMapper.java new file mode 100644 index 0000000..1902e7f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngDemandPurMapper.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.LngPngDemandPur; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Mapper +public interface LngPngDemandPurMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IDemandService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IDemandService.java new file mode 100644 index 0000000..40003fb --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IDemandService.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.dayPlan.service; + +import java.util.List; + +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.common.page.PageOutput; +import com.xjrsoft.module.dayPlan.dto.LngPngDemandPageDto; +import com.xjrsoft.module.dayPlan.entity.LngPngDemand; +import com.xjrsoft.module.dayPlan.vo.LngPngDemandPageVo; + +/** +* @title: service +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ + +public interface IDemandService extends MPJBaseService, MPJDeepService, MPJRelationService { + + PageOutput queryPage(LngPngDemandPageDto dto); + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java index 6db3e99..eb536b9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngMeasureSalesPurService.java @@ -1,12 +1,8 @@ package com.xjrsoft.module.dayPlan.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; /** * @title: service @@ -16,4 +12,6 @@ import java.util.List; */ public interface IPngMeasureSalesPurService extends IService { + + LngPngMeasureSalesPurVo 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 new file mode 100644 index 0000000..92813a9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/DemandServiceImpl.java @@ -0,0 +1,52 @@ +package com.xjrsoft.module.dayPlan.service.impl; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.module.dayPlan.dto.LngPngDemandPageDto; +import com.xjrsoft.module.dayPlan.entity.LngPngDemand; +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.LngPngDemandPageVo; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author test01 +* @Date: 2026-01-15 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class DemandServiceImpl extends MPJBaseServiceImpl implements IDemandService { + + private final LngPngDemandMapper demandLngPngDemandMapper; + + private final LngPngDemandPurMapper demandLngPngDemandPurMapper; + + @Override + public PageOutput queryPage(LngPngDemandPageDto dto) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper + .and(StringUtils.isNotBlank(dto.getKName()), r -> + r.like("k.k_no", dto.getKName()) + .or() + .like("k.k_name", dto.getKName()) + ) + .like(StringUtils.isNotBlank(dto.getPointDelyName()), "sp.full_name", dto.getPointDelyName()) + .eq("d.last_ver_sign", "Y"); + IPage page = this.baseMapper.queryPage(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPngDemandPageVo.class); + return pageOutput; + } + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java index 4a16d13..61a4f34 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java @@ -1,12 +1,20 @@ package com.xjrsoft.module.dayPlan.service.impl; +import java.util.List; + import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; +import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; /** @@ -18,4 +26,19 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class PngMeasureSalesPurServiceImpl extends ServiceImpl implements IPngMeasureSalesPurService { + + + private final IFileClient fileClient; + + @Override + public LngPngMeasureSalesPurVo getInfoById(Long id) { + LngPngMeasureSalesPur lngPngMeasureSalesPur = this.getById(id); + if(lngPngMeasureSalesPur == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngPngMeasureSalesPurVo vo = BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class); + List fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "fileList", vo.getId()); + vo.setFileList(fileList); + return vo; + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 8478670..3d6393f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.mdm.client.ILngBankClient; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.sales.entity.LngCustomer; @@ -77,7 +79,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl