This commit is contained in:
2026-02-26 11:10:28 +08:00
11 changed files with 224 additions and 131 deletions

View File

@ -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<UpdateLngPngSettlePurDto> lngPngSettlePurList;
//附件
@LogAttrField
private List<LngFileUploadVo> lngFileUploadList;
//对账单
@LogAttrField
private List<LngFileUploadVo> billList;
}

View File

@ -101,6 +101,13 @@ public class UpdateLngPngSettlePurDtlDto implements Serializable {
@ApiModelProperty("价格(元/方)")
private BigDecimal priceM3;
/**
* 价格(元/吉焦)
*/
@LogField(name="价格",index=10)
@ApiModelProperty("价格(元/吉焦)")
private BigDecimal priceGj;
/**
* 金额(自动计算)
*/

View File

@ -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<UpdateLngPngSettlePurDtlDto> lngPngSettlePurDtlList;

View File

@ -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;
/**
* 金额(自动计算)

View File

@ -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;
@ -89,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带)
@ -97,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带)
@ -109,8 +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 = "pointUpName")
private String pointUpCode;
private String pointUpName;
/**
* 主计量单位(从lng_png_sales_pur带)
@ -118,12 +123,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 cuSname;
/**
@ -146,6 +152,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("交割点编码(从lng_png_sales带)")
private String pointDelyCode;
private String pointDelyName;
/**
* 比值(方/吉焦)

View File

@ -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<UpdateLngPngSettleHdrPurDto>() {
dto.setSettleTypeCode("C");
return R.ok(dataService.updateById(dto,new DataOperationListener<UpdateLngPngSettleHdrPurDto>() {
@Override
public UpdateLngPngSettleHdrPurDto before(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
return null;
}
@Override
public UpdateLngPngSettleHdrPurDto before(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
return null;
}
@Override
public UpdateLngPngSettleHdrPurDto after(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
@Override
public UpdateLngPngSettleHdrPurDto after(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
return null;
}
}));
return null;
}
}));
}
@DeleteMapping

View File

@ -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("主键")
@TableId
@LogField(name="主键",index=0)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@LogField(name="结算月",index=1)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@LogField(name="结算月开始日期",index=2)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@LogField(name="结算月结束日期",index=3)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
@LogField(name="结算类型",index=4)
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
@LogField(name="供应商/客户",index=5)
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
@LogField(name="交易主体",index=6)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=7)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
@LogField(name="结算总数量",index=8)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
@LogField(name="结算总金额",index=9)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
/**
* 账期内含预收付款(Y-是N-否正常结算Y特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是N-否正常结算Y特殊结算N)")
private String rpSign;
/**
* 账期内含预收付款(Y-是N-否正常结算Y特殊结算N)
*/
@ApiModelProperty("账期内含预收付款(Y-是N-否正常结算Y特殊结算N)")
@LogField(name="账期内含预收付款",index=10)
private String rpSign;
/**
* 对账单(不显示,挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示,挂对账单附件用)")
private String billAccount;
/**
* 对账单(不显示,挂对账单附件用)
*/
@ApiModelProperty("对账单(不显示,挂对账单附件用)")
@LogField(name="对账单",index=11)
private String billAccount;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
private String approCode;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
@LogField(name="审批状态",index=12)
private String approCode;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
@LogField(name="结算说明",index=13)
private String settleDesc;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=14)
private String note;
/**
* 备注
*/
@ApiModelProperty("备注")
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;
/**

View File

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

View File

@ -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;
/**
* 金额(自动计算)
*/

View File

@ -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<LngPngSettlePur> ,BaseMapper<LngPngSettlePur>{
@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,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" +
" LEFT JOIN lng_b_station_png su ON su.code=a.point_dely_code" +
" WHERE a.settle_hdr_id = #{id}")
List<LngPngSettlePurVo> queryLngPngSettlePurList(@Param("id")Long id);
}

View File

@ -60,14 +60,15 @@ public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl<LngPngSettleH
@Override
public LngPngSettleHdrPurVo getInfoById(Long id) {
LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id);
LngPngSettleHdrPur lngPngSettleHdr = this.getById(id);
if(lngPngSettleHdr == null) {
return null;
}
LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class);
if(CollectionUtils.isNotEmpty(vo.getLngPngSettlePurList())) {
for(LngPngSettlePurVo sp:vo.getLngPngSettlePurList()) {
sp.setKsName(lngPngSettlePurMapper.getKsNameBygId(sp.getKsId()));
List<LngPngSettlePurVo> lngPngSettlePurList = lngPngSettlePurMapper.queryLngPngSettlePurList(vo.getId());
vo.setLngPngSettlePurList(lngPngSettlePurList);
if(CollectionUtils.isNotEmpty(lngPngSettlePurList)) {
for(LngPngSettlePurVo sp:lngPngSettlePurList) {
List<LngPngSettlePurDtlVo> list = lngPngSettlePurDtlMapper.queryDtlList(sp.getId());
sp.setLngPngSettlePurDtlList(list);
}