Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

2026-02-04 17:27:41 +08:00
parent 6b799fe8ce a3548c3d69
commit 01fa475c38
9 changed files with 70 additions and 67 deletions
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrDto.java
@ -105,9 +105,5 @@ public class AddLngPngSettleHdrDto extends com.xjrsoft.common.model.base.BaseMod
    */
    @ApiModelProperty("lngPngSettleSales子表")
    private List<AddLngPngSettleSalesDto> lngPngSettleSalesList;
-    /**
-    * lngPngSettleSalesDtl
-    */
-    @ApiModelProperty("lngPngSettleSalesDtl子表")
-    private List<AddLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
+  
 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleSalesDto.java
@ -145,4 +145,10 @@ public class AddLngPngSettleSalesDto extends com.xjrsoft.common.model.base.BaseM
    @ApiModelProperty("租户id")
    private Long tenantId;
    
+    /**
+    * lngPngSettleSalesDtl
+    */
+    @ApiModelProperty("lngPngSettleSalesDtl子表")
+    private List<AddLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
+
 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrDto.java
@ -61,35 +61,35 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
    /**
    * 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
    */
-    @LogField(name="结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)",index=4)
+    @LogField(name="结算类型",index=4)
    @ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
    private String settleTypeCode;
    
    /**
    * 供应商/客户(根据结算类型关联供应商/客户)
    */
-    @LogField(name="供应商/客户(根据结算类型关联供应商/客户)",index=5)
+    @LogField(name="供应商/客户",index=5)
    @ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
    private String cpCode;
    
    /**
    * 交易主体(天然气公司/惠贸)
    */
-    @LogField(name="交易主体(天然气公司/惠贸)",index=6)
+    @LogField(name="交易主体",index=6)
    @ApiModelProperty("交易主体(天然气公司/惠贸)")
    private Long comId;
    
    /**
    * 结算总数量(吉焦)(不包含二次结算的数量)
    */
-    @LogField(name="结算总数量(吉焦)(不包含二次结算的数量)",index=7)
+    @LogField(name="结算总数量",index=7)
    @ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
    private BigDecimal qtySettleGj;
    
    /**
    * 结算总数量(方)(不包含二次结算的数量)
    */
-    @LogField(name="结算总数量(方)(不包含二次结算的数量)",index=8)
+    @LogField(name="结算总数量",index=8)
    @ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
    private BigDecimal qtySettleM3;
    
@ -103,14 +103,14 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
    /**
    * 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
    */
-    @LogField(name="账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)",index=10)
+    @LogField(name="账期内含预收付款",index=10)
    @ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
    private String rpSign;
    
    /**
    * 对账单(不显示，挂对账单附件用)
    */
-    @LogField(name="对账单(不显示，挂对账单附件用)",index=11)
+    @LogField(name="对账单",index=11)
    @ApiModelProperty("对账单(不显示，挂对账单附件用)")
    private String billAccount;
    
@ -153,14 +153,5 @@ public class UpdateLngPngSettleHdrDto implements Serializable {
    }, 
    caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDto.class, type = JoinType.MANY)
    private List<UpdateLngPngSettleSalesDto> lngPngSettleSalesList;
-    /**
-    * lngPngSettleSalesDtl
-    */
-    @ApiModelProperty("lngPngSettleSalesDtl子表")
-    @LogJoin(name = "lngPngSettleSalesDtl子表",
-    columns = {
-    	@LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
-    }, 
-    caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY)
-    private List<UpdateLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
+
 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleSalesDto.java
@ -1,23 +1,21 @@
 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.time.LocalDateTime;
 import java.util.List;

-import com.pictc.annotations.datalog.LogTable;
+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.JoinCaseType;
-import com.pictc.annotations.datalog.JoinType;
+import com.pictc.annotations.datalog.LogTable;
 import com.pictc.annotations.datalog.ValueDirectionType;

+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+



@ -43,98 +41,98 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
    /**
    * 结算-管道气-销售-主表主键(lng_png_settle_hdr.id)
    */
-    @LogField(name="结算-管道气-销售-主表主键(lng_png_settle_hdr.id)",index=1)
+    @LogField(name="结算-管道气-销售-主表主键",index=1)
    @ApiModelProperty("结算-管道气-销售-主表主键(lng_png_settle_hdr.id)")
    private Long settleHdrId;
    
    /**
    * 日计划-管道气-销售主键(lng_png_sales_pur.sales_id)
    */
-    @LogField(name="日计划-管道气-销售主键(lng_png_sales_pur.sales_id)",index=2)
+    @LogField(name="日计划-管道气-销售主键",index=2)
    @ApiModelProperty("日计划-管道气-销售主键(lng_png_sales_pur.sales_id)")
    private Long salesId;
    
    /**
    * 结算月(从主表带)
    */
-    @LogField(name="结算月(从主表带)",index=3)
+    @LogField(name="结算月",index=3)
    @ApiModelProperty("结算月(从主表带)")
    private LocalDateTime settleMonth;
    
    /**
    * 结算类型(I-气费收入)
    */
-    @LogField(name="结算类型(I-气费收入)",index=4)
+    @LogField(name="结算类型",index=4)
    @ApiModelProperty("结算类型(I-气费收入)")
    private String settleTypeCode;
    
    /**
    * 计划日期(从lng_png_sales带)
    */
-    @LogField(name="计划日期(从lng_png_sales带)",index=5)
+    @LogField(name="计划日期",index=5)
    @ApiModelProperty("计划日期(从lng_png_sales带)")
    private LocalDateTime datePlan;
    
    /**
    * 计量日期(从lng_png_sales带)
    */
-    @LogField(name="计量日期(从lng_png_sales带)",index=6)
+    @LogField(name="计量日期",index=6)
    @ApiModelProperty("计量日期(从lng_png_sales带)")
    private LocalDateTime dateMea;
    
    /**
    * 客户(从lng_png_sales带)
    */
-    @LogField(name="客户(从lng_png_sales带)",index=7)
+    @LogField(name="客户",index=7)
    @ApiModelProperty("客户(从lng_png_sales带)")
    private String cuCode;
    
    /**
    * 合同主键(从lng_png_sales带)
    */
-    @LogField(name="合同主键(从lng_png_sales带)",index=8)
+    @LogField(name="合同主键",index=8)
    @ApiModelProperty("合同主键(从lng_png_sales带)")
    private Long ksId;
    
    /**
    * 合同-国内销售-管道气-交割点主键(从lng_png_sales带)
    */
-    @LogField(name="合同-国内销售-管道气-交割点主键(从lng_png_sales带)",index=9)
+    @LogField(name="合同-国内销售-管道气-交割点主键",index=9)
    @ApiModelProperty("合同-国内销售-管道气-交割点主键(从lng_png_sales带)")
    private Long ksppId;
    
    /**
    * 交割点(从lng_png_sales带)
    */
-    @LogField(name="交割点(从lng_png_sales带)",index=10)
+    @LogField(name="交割点",index=10)
    @ApiModelProperty("交割点(从lng_png_sales带)")
    private String pointDelyCode;
    
    /**
    * 主计量单位(从lng_png_sales带)
    */
-    @LogField(name="主计量单位(从lng_png_sales带)",index=11)
+    @LogField(name="主计量单位",index=11)
    @ApiModelProperty("主计量单位(从lng_png_sales带)")
    private String uomCode;
    
    /**
    * 比值(方/吉焦)
    */
-    @LogField(name="比值(方/吉焦)",index=12)
+    @LogField(name="比值",index=12)
    @ApiModelProperty("比值(方/吉焦)")
    private BigDecimal rateM3Gj;
    
    /**
    * 完成量(吉焦)
    */
-    @LogField(name="完成量(吉焦)",index=13)
+    @LogField(name="完成量",index=13)
    @ApiModelProperty("完成量(吉焦)")
    private BigDecimal qtyMeaGj;
    
    /**
    * 完成量(方)
    */
-    @LogField(name="完成量(方)",index=14)
+    @LogField(name="完成量",index=14)
    @ApiModelProperty("完成量(方)")
    private BigDecimal qtyMeaM3;
    
@ -148,42 +146,42 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
    /**
    * 结算量(方)
    */
-    @LogField(name="结算量(方)",index=16)
+    @LogField(name="结算量",index=16)
    @ApiModelProperty("结算量(方)")
    private BigDecimal qtySettleM3;
    
    /**
    * 结算价格(元/吉焦)(金额/总量)
    */
-    @LogField(name="结算价格(元/吉焦)(金额/总量)",index=17)
+    @LogField(name="结算价格",index=17)
    @ApiModelProperty("结算价格(元/吉焦)(金额/总量)")
    private BigDecimal priceGj;
    
    /**
    * 结算价格(元/方)(金额/总量)
    */
-    @LogField(name="结算价格(元/方)(金额/总量)",index=18)
+    @LogField(name="结算价格",index=18)
    @ApiModelProperty("结算价格(元/方)(金额/总量)")
    private BigDecimal priceM3;
    
    /**
    * 结算金额(自动计算，子表合计)
    */
-    @LogField(name="结算金额(自动计算，子表合计)",index=19)
+    @LogField(name="结算金额",index=19)
    @ApiModelProperty("结算金额(自动计算，子表合计)")
    private BigDecimal amount;
    
    /**
    * 价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)
    */
-    @LogField(name="价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)",index=20)
+    @LogField(name="价格组成说明",index=20)
    @ApiModelProperty("价格组成说明(子表记录合并字符串“价格类型：数量*价格=金额(换行)居民：10000*2.85=28500”)")
    private String priceDesc;
    
    /**
    * 结算次数(第一次结算1，第二次结算2……)
    */
-    @LogField(name="结算次数(第一次结算1，第二次结算2……)",index=21)
+    @LogField(name="结算次数",index=21)
    @ApiModelProperty("结算次数(第一次结算1，第二次结算2……)")
    private Byte settleTimes;
    
@ -201,5 +199,14 @@ public class UpdateLngPngSettleSalesDto implements Serializable {
    @ApiModelProperty("租户id")
    private Long tenantId;
    
-
+    /**
+    * lngPngSettleSalesDtl
+    */
+    @ApiModelProperty("lngPngSettleSalesDtl子子表")
+    @LogJoin(name = "lngPngSettleSalesDtl子子表",
+    columns = {
+    	@LogJoinColumn(field = "settleId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
+    }, 
+    caseType = JoinCaseType.FULL, target = UpdateLngPngSettleSalesDtlDto.class, type = JoinType.MANY)
+    private List<UpdateLngPngSettleSalesDtlDto> lngPngSettleSalesDtlList;
 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrVo.java
@ -177,10 +177,6 @@ public class LngPngSettleHdrVo extends com.xjrsoft.common.model.base.BaseModel{
    */
    @ApiModelProperty("lngPngSettleSales子表")
    private List<LngPngSettleSalesVo> lngPngSettleSalesList;
-    /**
-    * lngPngSettleSalesDtl
-    */
-    @ApiModelProperty("lngPngSettleSalesDtl子表")
-    private List<LngPngSettleSalesDtlVo> lngPngSettleSalesDtlList;
+ 

 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleSalesVo.java
@ -2,6 +2,7 @@ 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;
@ -225,7 +226,11 @@ public class LngPngSettleSalesVo extends com.xjrsoft.common.model.base.BaseModel
    private Long ruleUserId;
    
    
-
+    /**
+     * lngPngSettleSalesDtl
+     */
+     @ApiModelProperty("lngPngSettleSalesDtl子表")
+     private List<LngPngSettleSalesDtlVo> lngPngSettleSalesDtlList;


 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java
@ -43,7 +43,7 @@ import lombok.AllArgsConstructor;
 * @Version 1.0
 */
@RestController
-@RequestMapping("/dayPlan" + "/pngSettleHdr")
+@RequestMapping("/dayPlan/pngSettleHdr")
@Api(value = "/dayPlan"  + "/pngSettleHdr",tags = "管道气销售结算代码")
@AllArgsConstructor
 public class PngSettleHdrController {
--- 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
@ -186,12 +186,6 @@ public class LngPngSettleHdr implements Serializable {
    @TableField(exist = false)
    @EntityMapping(thisField = "id", joinField = "settleHdrId")
    private List<LngPngSettleSales> lngPngSettleSalesList;
-    /**
-    * lngPngSettleSalesDtl
-    */
-    @ApiModelProperty("lngPngSettleSalesDtl子表")
-    @TableField(exist = false)
-    @EntityMapping(thisField = "id", joinField = "settleId")
-    private List<LngPngSettleSalesDtl> lngPngSettleSalesDtlList;
+   

 }
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java
@ -3,12 +3,14 @@ package com.xjrsoft.module.dayPlan.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;

 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.yulichang.annotation.EntityMapping;

 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@ -233,6 +235,12 @@ public class LngPngSettleSales implements Serializable {
    @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
    private Long ruleUserId;
    
-
+    /**
+     * lngPngSettleSalesDtl
+     */
+     @ApiModelProperty("lngPngSettleSalesDtl子表")
+     @TableField(exist = false)
+     @EntityMapping(thisField = "id", joinField = "settleId")
+     private List<LngPngSettleSalesDtl> lngPngSettleSalesDtlList;

 }