geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
张秉卓
2026-02-04 17:27:41 +08:00
parent 6b799fe8ce a3548c3d69
commit 01fa475c38
9 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrController.java
View File

@ -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 {

8
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdr.java
View File

@ -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;
}

10
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleSales.java
View File

@ -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;
}