From 8fdbf8debaffea8d58774f602f2d06ffde7272c7 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 12 Feb 2026 16:27:34 +0800 Subject: [PATCH 1/4] =?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 --- .../dto/UpdateLngPngSettleHdrPurDto.java | 14 ++++++++++- .../dto/UpdateLngPngSettlePurDtlDto.java | 7 ++++++ .../dayPlan/dto/UpdateLngPngSettlePurDto.java | 2 +- .../dayPlan/vo/LngPngSettlePurDtlVo.java | 7 ++++++ .../module/dayPlan/vo/LngPngSettlePurVo.java | 16 +++++++----- .../controller/PngSettleHdrPurController.java | 25 ++++++++++--------- .../dayPlan/entity/LngPngSettlePurDtl.java | 9 +++++++ 7 files changed, 60 insertions(+), 20 deletions(-) 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 index 0928a9d..acfd89e 100644 --- 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 @@ -8,11 +8,13 @@ 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; @@ -153,9 +155,19 @@ public class UpdateLngPngSettleHdrPurDto implements Serializable { @ApiModelProperty("lngPngSettlePur子表") @LogJoin(name = "lngPngSettlePur子表", columns = { - @LogJoinColumn(field = "settleHdrId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleHdrId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngPngSettlePurDto.class, type = JoinType.MANY) private List lngPngSettlePurList; + + //附件 + @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/UpdateLngPngSettlePurDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettlePurDtlDto.java index 067aead..12958de 100644 --- 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 @@ -101,6 +101,13 @@ public class UpdateLngPngSettlePurDtlDto implements Serializable { @ApiModelProperty("价格(元/方)") private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @LogField(name="价格",index=10) + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + /** * 金额(自动计算) */ 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 index ebcd1ad..b33b793 100644 --- 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 @@ -252,7 +252,7 @@ public class UpdateLngPngSettlePurDto implements Serializable { @ApiModelProperty("lngPngSettlePurDtl子表") @LogJoin(name = "lngPngSettlePurDtl子表", columns = { - @LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "settleId", 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/LngPngSettlePurDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurDtlVo.java index 1fe00bc..3b1a74a 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,7 @@ package com.xjrsoft.module.dayPlan.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.pictc.annotations.datalog.LogField; import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; @@ -100,6 +101,12 @@ public class LngPngSettlePurDtlVo extends com.xjrsoft.common.model.base.BaseMode @ApiModelProperty("价格(元/方)") private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + private BigDecimal priceGj; + /** * 金额(自动计算) 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 85372c9..3ebcb94 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 @@ -5,6 +5,8 @@ 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; @@ -109,8 +111,9 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 上载点(从lng_png_sales_pur带) */ @ApiModelProperty("上载点(从lng_png_sales_pur带)") + @Trans(type = TransType.LNG_STATION, transToFieldName = "pointDelyName") private String pointUpCode; - + private String pointDelyName; /** * 主计量单位(从lng_png_sales_pur带) @@ -118,12 +121,13 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ @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带)") + @Trans(type = TransType.CUSTOMER, transToFieldName = "cuName") + private String cuCode; + private String cuName; /** 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 81fdf8c..88b2605 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 @@ -114,19 +114,20 @@ public class PngSettleHdrPurController { @SaCheckPermission("pngSettleHdrPur:edit") public R update(@Valid @RequestBody UpdateLngPngSettleHdrPurDto dto){ //return R.ok(dataService.updateById(dto)); - return R.ok(dataService.updateById(dto,new DataOperationListener() { + dto.setSettleTypeCode("C"); + return R.ok(dataService.updateById(dto,new DataOperationListener() { - @Override - public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { - return null; - } - - @Override - public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { - - return null; - } - })); + @Override + public UpdateLngPngSettleHdrPurDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPngSettleHdrPurDto after(DataOperationContent content) { + + return null; + } + })); } @DeleteMapping 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 index 4260d7f..8dccf38 100644 --- 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 @@ -8,6 +8,8 @@ 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 com.pictc.annotations.datalog.LogField; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -107,6 +109,13 @@ public class LngPngSettlePurDtl implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal priceM3; + /** + * 价格(元/吉焦) + */ + @ApiModelProperty("价格(元/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal priceGj; + /** * 金额(自动计算) */ From 8464a41be5b0351c8d895a03bb0d7f482e16a923 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 12 Feb 2026 17:10:59 +0800 Subject: [PATCH 2/4] =?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 --- .../module/dayPlan/vo/LngPngSettlePurVo.java | 12 ++++++----- .../dayPlan/mapper/LngPngSettlePurMapper.java | 21 ++++++++++++++----- .../impl/PngSettleHdrPurServiceImpl.java | 9 ++++---- 3 files changed, 28 insertions(+), 14 deletions(-) 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 3ebcb94..cb99cb0 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 @@ -91,7 +91,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ */ @ApiModelProperty("供应商(从lng_png_sales_pur带)") private String suCode; - + private String suName; /** * 合同主键(从lng_png_sales_pur带) @@ -99,6 +99,8 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("合同主键(从lng_png_sales_pur带)") private Long kpId; + private String kpName; + /** * 合同-国内采购-管道气-上载点主键(从lng_png_sales_pur带) @@ -111,9 +113,9 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 上载点(从lng_png_sales_pur带) */ @ApiModelProperty("上载点(从lng_png_sales_pur带)") - @Trans(type = TransType.LNG_STATION, transToFieldName = "pointDelyName") + //@Trans(type = TransType.LNG_STATION, transToFieldName = "pointUpName") private String pointUpCode; - private String pointDelyName; + private String pointUpName; /** * 主计量单位(从lng_png_sales_pur带) @@ -125,9 +127,9 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ * 客户(从lng_png_sales带) */ @ApiModelProperty("客户(从lng_png_sales带)") - @Trans(type = TransType.CUSTOMER, transToFieldName = "cuName") + //@Trans(type = TransType.CUSTOMER, transToFieldName = "cuName") private String cuCode; - private String cuName; + private String cuSname; /** 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 66336cf..edd77bb 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 @@ -1,11 +1,15 @@ package com.xjrsoft.module.dayPlan.mapper; +import java.util.List; + +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.LngPngSettlePur; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import com.xjrsoft.module.dayPlan.vo.LngPngSettlePurVo; /** * @title: mapper @@ -16,6 +20,13 @@ import org.apache.ibatis.annotations.Select; @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); + + @Select("SELECT a.*, cu.cu_sname, sp.full_name AS point_up_name,k.k_name as kp_name" + + " FROM lng_png_settle_pur a" + + " LEFT JOIN lng_contract k ON k.id=a.kp_id" + + " LEFT JOIN lng_customer cu ON cu.cu_code=a.cu_code" + + " LEFT JOIN lng_b_station_png sp ON sp.code=a.point_up_code" + + " WHERE a.settle_hdr_id = #{id}" + + " ORDER BY a.sort") + List queryLngPngSettlePurList(@Param("id")Long id); } 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 6a3d48e..f14fde5 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 @@ -60,14 +60,15 @@ public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl lngPngSettlePurList = lngPngSettlePurMapper.queryLngPngSettlePurList(vo.getId()); + vo.setLngPngSettlePurList(lngPngSettlePurList); + if(CollectionUtils.isNotEmpty(lngPngSettlePurList)) { + for(LngPngSettlePurVo sp:lngPngSettlePurList) { List list = lngPngSettlePurDtlMapper.queryDtlList(sp.getId()); sp.setLngPngSettlePurDtlList(list); } From 77a2dd66d5b35161291ffbbb3fa88dfdf51eda7d Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 12 Feb 2026 17:35:57 +0800 Subject: [PATCH 3/4] =?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 --- .../com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java | 1 + .../module/dayPlan/mapper/LngPngSettlePurMapper.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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 cb99cb0..398b266 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 @@ -152,6 +152,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("交割点编码(从lng_png_sales带)") private String pointDelyCode; + private String pointDelyName; /** * 比值(方/吉焦) 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 edd77bb..77cdaf0 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 @@ -21,12 +21,12 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettlePurVo; public interface LngPngSettlePurMapper extends MPJBaseMapper ,BaseMapper{ - @Select("SELECT a.*, cu.cu_sname, sp.full_name AS point_up_name,k.k_name as kp_name" + + @Select("SELECT a.*, cu.cu_sname, sp.full_name AS point_up_name,su.full_name AS point_dely_name,k.k_name as kp_name" + " FROM lng_png_settle_pur a" + " LEFT JOIN lng_contract k ON k.id=a.kp_id" + " LEFT JOIN lng_customer cu ON cu.cu_code=a.cu_code" + " LEFT JOIN lng_b_station_png sp ON sp.code=a.point_up_code" + - " WHERE a.settle_hdr_id = #{id}" + - " ORDER BY a.sort") + " LEFT JOIN lng_b_station_png su ON su.code=a.point_dely_code" + + " WHERE a.settle_hdr_id = #{id}") List queryLngPngSettlePurList(@Param("id")Long id); } From 1202d0380b0abd9a2f60f3990740bf1a8cede8af Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 13 Feb 2026 15:32:11 +0800 Subject: [PATCH 4/4] =?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/entity/LngPngSettleHdr.java | 217 ++++++++++-------- .../dayPlan/entity/LngPngSettleHdrPur.java | 23 +- 2 files changed, 139 insertions(+), 101 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java index ef0413c..82aac6a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java @@ -11,6 +11,8 @@ 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 com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,6 +26,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@LogTable(source="lng_png_settle_hdr",name="管道气采购结算") @TableName("lng_png_settle_hdr") @ApiModel(value = "管道气销售结算对象", description = "管道气销售结算") public class LngPngSettleHdr implements Serializable { @@ -31,116 +34,132 @@ public class LngPngSettleHdr 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; + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @LogField(name="主键",index=0) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 结算月 + */ + @ApiModelProperty("结算月") + @LogField(name="结算月",index=1) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime settleMonth; + + /** + * 结算月开始日期 + */ + @ApiModelProperty("结算月开始日期") + @LogField(name="结算月开始日期",index=2) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateFrom; + + /** + * 结算月结束日期 + */ + @ApiModelProperty("结算月结束日期") + @LogField(name="结算月结束日期",index=3) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateTo; + + /** + * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) + */ + @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + @LogField(name="结算类型",index=4) + private String settleTypeCode; + + /** + * 供应商/客户(根据结算类型关联供应商/客户) + */ + @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + @LogField(name="供应商/客户",index=5) + private String cpCode; + + /** + * 交易主体(天然气公司/惠贸) + */ + @ApiModelProperty("交易主体(天然气公司/惠贸)") + @LogField(name="交易主体",index=6) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long comId; + + /** + * 结算总数量(吉焦)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + @LogField(name="结算总数量",index=7) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleGj; + + /** + * 结算总数量(方)(不包含二次结算的数量) + */ + @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + @LogField(name="结算总数量",index=8) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtySettleM3; + + /** + * 结算总金额 + */ + @ApiModelProperty("结算总金额") + @LogField(name="结算总金额",index=9) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal amount; + + /** + * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) + */ + @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + @LogField(name="账期内含预收付款",index=10) + private String rpSign; + + /** + * 对账单(不显示，挂对账单附件用) + */ + @ApiModelProperty("对账单(不显示，挂对账单附件用)") + @LogField(name="对账单",index=11) + private String billAccount; + + /** + * 审批状态 + */ + @ApiModelProperty("审批状态") + @LogField(name="审批状态",index=12) + private String approCode; + + /** + * 结算说明 + */ + @ApiModelProperty("结算说明") + @LogField(name="结算说明",index=13) + private String settleDesc; + + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=14) + private String note; + /** * 创建人id */ @ApiModelProperty("创建人id") - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + @TableField(fill = FieldFill.INSERT) private Long createUserId; /** * 创建时间 */ @ApiModelProperty("创建时间") - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + @TableField(fill = FieldFill.INSERT) private LocalDateTime createDate; /** 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 d924cc3..bc75a3d 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 @@ -11,6 +11,8 @@ 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 com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,6 +27,7 @@ import lombok.Data; */ @Data @TableName("lng_png_settle_hdr") +@LogTable(source="lng_png_settle_hdr",name="管道气采购结算") @ApiModel(value = "管道气采购结算对象", description = "管道气采购结算") public class LngPngSettleHdrPur implements Serializable { @@ -35,6 +38,7 @@ public class LngPngSettleHdrPur implements Serializable { */ @ApiModelProperty("主键") @TableId + @LogField(name="主键",index=0) @TableField(updateStrategy = FieldStrategy.IGNORED) private Long id; @@ -42,6 +46,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算月 */ @ApiModelProperty("结算月") + @LogField(name="结算月",index=1) @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime settleMonth; @@ -49,6 +54,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算月开始日期 */ @ApiModelProperty("结算月开始日期") + @LogField(name="结算月开始日期",index=2) @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateFrom; @@ -56,6 +62,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算月结束日期 */ @ApiModelProperty("结算月结束日期") + @LogField(name="结算月结束日期",index=3) @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime dateTo; @@ -63,18 +70,21 @@ public class LngPngSettleHdrPur implements Serializable { * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费) */ @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)") + @LogField(name="结算类型",index=4) private String settleTypeCode; /** * 供应商/客户(根据结算类型关联供应商/客户) */ @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)") + @LogField(name="供应商/客户",index=5) private String cpCode; /** * 交易主体(天然气公司/惠贸) */ @ApiModelProperty("交易主体(天然气公司/惠贸)") + @LogField(name="交易主体",index=6) @TableField(updateStrategy = FieldStrategy.IGNORED) private Long comId; @@ -82,6 +92,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算总数量(吉焦)(不包含二次结算的数量) */ @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)") + @LogField(name="结算总数量",index=7) @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal qtySettleGj; @@ -89,6 +100,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算总数量(方)(不包含二次结算的数量) */ @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)") + @LogField(name="结算总数量",index=8) @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal qtySettleM3; @@ -96,6 +108,7 @@ public class LngPngSettleHdrPur implements Serializable { * 结算总金额 */ @ApiModelProperty("结算总金额") + @LogField(name="结算总金额",index=9) @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal amount; @@ -103,44 +116,49 @@ public class LngPngSettleHdrPur implements Serializable { * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N) */ @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)") + @LogField(name="账期内含预收付款",index=10) private String rpSign; /** * 对账单(不显示，挂对账单附件用) */ @ApiModelProperty("对账单(不显示，挂对账单附件用)") + @LogField(name="对账单",index=11) private String billAccount; /** * 审批状态 */ @ApiModelProperty("审批状态") + @LogField(name="审批状态",index=12) private String approCode; /** * 结算说明 */ @ApiModelProperty("结算说明") + @LogField(name="结算说明",index=13) private String settleDesc; /** * 备注 */ @ApiModelProperty("备注") + @LogField(name="备注",index=14) private String note; /** * 创建人id */ @ApiModelProperty("创建人id") - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + @TableField(fill = FieldFill.INSERT) private Long createUserId; /** * 创建时间 */ @ApiModelProperty("创建时间") - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + @TableField(fill = FieldFill.INSERT) private LocalDateTime createDate; /** @@ -161,6 +179,7 @@ public class LngPngSettleHdrPur implements Serializable { * 租户id */ @ApiModelProperty("租户id") + @LogField(name="租户id",index=15) @TableField(updateStrategy = FieldStrategy.IGNORED) private Long tenantId;