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-04-08 17:37:50 +08:00
parent a7fb155920 3f736f74a2
commit 25fa0b2914
20 changed files with 1035 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/AddLngPngSettleHdrEcDto.java Normal file
View File

@ -0,0 +1,100 @@
package com.xjrsoft.module.dayPlan.dto;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 电商-管道气销售结算
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
public class AddLngPngSettleHdrEcDto extends com.xjrsoft.common.model.base.BaseModel {
private static final long serialVersionUID = 1L;
/**
* 结算月
*/
@ApiModelProperty("结算月")
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
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;
/**
* 租户id
*/
@ApiModelProperty("租户id")
private Long tenantId;
}

87
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/LngPngSettleHdrEcPageDto.java Normal file
View File

@ -0,0 +1,87 @@
package com.xjrsoft.module.dayPlan.dto;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import com.xjrsoft.common.page.PageInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 分页查询入参
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
public class LngPngSettleHdrEcPageDto extends PageInput {
/**
* 主键
*/
@ApiModelProperty("主键")
private Long id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dateTo;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
private BigDecimal amount;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
private Long comId;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
* 修改人id
*/
@ApiModelProperty("修改人id")
private Long modifyUserId;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
private String approCode;
}

146
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/dto/UpdateLngPngSettleHdrEcDto.java Normal file
View File

@ -0,0 +1,146 @@
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.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 电商-管道气销售结算
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
@LogTable(source="lng_png_settle_hdr",name="电商-管道气销售结算")
public class UpdateLngPngSettleHdrEcDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@LogField(name="主键",index=0)
@ApiModelProperty("主键")
private Long id;
/**
* 结算月
*/
@LogField(name="结算月",index=1)
@ApiModelProperty("结算月")
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@LogField(name="结算月开始日期",index=2)
@ApiModelProperty("结算月开始日期")
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@LogField(name="结算月结束日期",index=3)
@ApiModelProperty("结算月结束日期")
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@LogField(name="结算类型",index=4)
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@LogField(name="供应商/客户",index=5)
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@LogField(name="交易主体",index=6)
@ApiModelProperty("交易主体(天然气公司/惠贸)")
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@LogField(name="结算总数量",index=7)
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@LogField(name="结算总数量",index=8)
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@LogField(name="结算总金额",index=9)
@ApiModelProperty("结算总金额")
private BigDecimal amount;
/**
* 账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)
*/
@LogField(name="账期内含预收付款",index=10)
@ApiModelProperty("账期内含预收付款(Y-是，N-否；正常结算Y，特殊结算N)")
private String rpSign;
/**
* 对账单(不显示，挂对账单附件用)
*/
@LogField(name="对账单",index=11)
@ApiModelProperty("对账单(不显示，挂对账单附件用)")
private String billAccount;
/**
* 审批状态
*/
@LogField(name="审批状态",index=12)
@ApiModelProperty("审批状态")
private String approCode;
/**
* 结算说明
*/
@LogField(name="结算说明",index=13)
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 备注
*/
@LogField(name="备注",index=14)
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
@LogField(name="租户id",index=15)
@ApiModelProperty("租户id")
private Long tenantId;
//对账单
@LogAttrField
private List<LngFileUploadVo> billList;
}

79
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrEcPageVo.java Normal file
View File

@ -0,0 +1,79 @@
package com.xjrsoft.module.dayPlan.vo;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
public class LngPngSettleHdrEcPageVo {
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
private LocalDateTime dateTo;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
private BigDecimal amount;
/**
* 审批状态
*/
@ApiModelProperty("审批状态")
private String approCode;
/**
* 结算说明
*/
@ApiModelProperty("结算说明")
private String settleDesc;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
* 修改人id
*/
@ApiModelProperty("修改人id")
private Long modifyUserId;
}

181
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettleHdrEcVo.java Normal file
View File

@ -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 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
public class LngPngSettleHdrEcVo extends com.xjrsoft.common.model.base.BaseModel{
/**
* 主键
*/
@ApiModelProperty("主键")
private Long id;
/**
* 结算月
*/
@ApiModelProperty("结算月")
private LocalDateTime settleMonth;
/**
* 结算月开始日期
*/
@ApiModelProperty("结算月开始日期")
private LocalDateTime dateFrom;
/**
* 结算月结束日期
*/
@ApiModelProperty("结算月结束日期")
private LocalDateTime dateTo;
/**
* 结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)
*/
@ApiModelProperty("结算类型(I-气费收入/C-气费成本/T-管输费/P-加工费)")
private String settleTypeCode;
/**
* 供应商/客户(根据结算类型关联供应商/客户)
*/
@ApiModelProperty("供应商/客户(根据结算类型关联供应商/客户)")
private String cpCode;
/**
* 交易主体(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体(天然气公司/惠贸)")
private Long comId;
/**
* 结算总数量(吉焦)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(吉焦)(不包含二次结算的数量)")
private BigDecimal qtySettleGj;
/**
* 结算总数量(方)(不包含二次结算的数量)
*/
@ApiModelProperty("结算总数量(方)(不包含二次结算的数量)")
private BigDecimal qtySettleM3;
/**
* 结算总金额
*/
@ApiModelProperty("结算总金额")
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;
/**
* 创建人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;
}

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

@ -104,7 +104,7 @@ public class ContractPurPngController {
@ApiOperation(value = "修改LngContract")
@SaCheckPermission("contractPurPng:edit")
public R update(@Valid @RequestBody UpdateLngContractPurDto dto){
//return R.ok(dataService.updateById(dto));
boolean res = dataService.updateById(dto, new DataOperationListener<UpdateLngContractPurDto>() {
@Override
public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {

11
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesPngPointController.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import javax.validation.Valid;
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;
@ -43,7 +42,7 @@ import lombok.AllArgsConstructor;
* @Version 1.0
*/
@RestController
@RequestMapping("/contract" + "/contractSalesPngPur")
@RequestMapping("/contract/contractSalesPngPur")
@Api(value = "/contract" + "/contractSalesPngPur",tags = "采运销关联代码")
@AllArgsConstructor
public class ContractSalesPngPointController {
@ -121,13 +120,7 @@ public class ContractSalesPngPointController {
}));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("contractSalesPngPur:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngContractSalesPngPointDto.class, ids));
}
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointPurMapper.java
View File

@ -26,6 +26,6 @@ public interface LngContractSalesPngPointPurMapper extends MPJBaseMapper<LngCont
" LEFT JOIN lng_contract kp ON kp.id=ksppp.kp_id" +
" LEFT JOIN lng_supplier su ON su.su_code=ksppp.su_code"+
" LEFT JOIN lng_b_station_png bspu ON bspu.code=ksppp.point_up_code" +
" WHERE ksppp.kspp_id = #{ksppId}")
" WHERE ksppp.kspp_id = #{ksppId} order by ksppp.sort asc")
List<LngContractSalesPngPointPurVo> queryLngContractSalesPngPointPurList(@Param("ksppId") Long ksppId);
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointTransMapper.java
View File

@ -31,7 +31,7 @@ public interface LngContractSalesPngPointTransMapper extends MPJBaseMapper<LngCo
" LEFT JOIN lng_b_station_png bput ON bput.code=ksppt.point_up_trans_code"+
" LEFT JOIN lng_b_station_png bpdt ON bpdt.code=ksppt.point_dely_trans_code"+
" LEFT JOIN lng_supplier su_ys ON su_ys.su_code=ksppt.su_code" +
" WHERE ksppt.ksppp_id = #{kspppId}")
" WHERE ksppt.ksppp_id = #{kspppId} order by ksppt.sort asc ")
List<LngContractSalesPngPointTransVo> queryLngContractSalesPngPointTransList(@Param("kspppId") Long kspppId);
}

114
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngSettleHdrEcController.java Normal file
View File

@ -0,0 +1,114 @@
package com.xjrsoft.module.dayPlan.controller;
import java.util.List;
import javax.validation.Valid;
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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrEcPageDto;
import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrEcDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrEc;
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrEcService;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrEcPageVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrEcVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
/**
* @title: 电商-管道气销售结算
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@RestController
@RequestMapping("/dayPlan/pngSettleHdrEc")
@Api(value = "/dayPlan" + "/pngSettleHdrEc",tags = "电商-管道气销售结算代码")
@AllArgsConstructor
public class PngSettleHdrEcController {
private final IPngSettleHdrEcService pngSettleHdrEcService;
private final DatalogService dataService;
@GetMapping(value = "/page")
@ApiOperation(value="LngPngSettleHdr列表(分页)")
@SaCheckPermission("pngSettleHdrEc:list")
public R page(@Valid LngPngSettleHdrEcPageDto dto){
LambdaQueryWrapper<LngPngSettleHdrEc> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdrEc::getId,dto.getId())
//.between(ObjectUtil.isNotNull(dto.getSettleMonthStart()) && ObjectUtil.isNotNull(dto.getSettleMonthEnd()),LngPngSettleHdr::getSettleMonth,dto.getSettleMonthStart(),dto.getSettleMonthEnd())
//.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngPngSettleHdr::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd())
//.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngPngSettleHdr::getDateTo,dto.getDateToStart(),dto.getDateToEnd())
.eq(ObjectUtil.isNotNull(dto.getComId()),LngPngSettleHdrEc::getComId,dto.getComId())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdrEc::getApproCode,dto.getApproCode())
.orderByDesc(LngPngSettleHdrEc::getId)
.select(LngPngSettleHdrEc.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrEcPageVo.class).contains(x.getProperty()));
IPage<LngPngSettleHdrEc> page = pngSettleHdrEcService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngPngSettleHdrEcPageVo> pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrEcPageVo.class);
return R.ok(pageOutput);
}
@GetMapping(value = "/info")
@ApiOperation(value="根据id查询LngPngSettleHdr信息")
@SaCheckPermission("pngSettleHdrEc:detail")
public R info(@RequestParam Long id){
LngPngSettleHdrEcVo lngPngSettleHdrEcVo = pngSettleHdrEcService.getInfoById(id);
return R.ok(lngPngSettleHdrEcVo);
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询LngPngSettleHdr数据详细日志")
@SaCheckPermission("pngSettleHdrEc:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngPngSettleHdrEcDto.class,id);
return R.ok(logs);
}
@PutMapping
@ApiOperation(value = "修改LngPngSettleHdr")
@SaCheckPermission("pngSettleHdrEc:edit")
public R update(@Valid @RequestBody UpdateLngPngSettleHdrEcDto dto){
return R.ok(dataService.updateById(dto));
}
@PostMapping("/uploadBill")
@ApiOperation(value = "上传修改LngPngSettleHdr对账单")
//@SaCheckPermission("pngSettleHdrEc:uploadBill")
public R uploadBill(@Valid @RequestBody UpdateLngPngSettleHdrEcDto dto){
pngSettleHdrEcService.uploadBill(dto);
return R.ok();
}
}

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

@ -20,21 +20,17 @@ import com.pictc.datalog.DataOperationListener;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;

181
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/entity/LngPngSettleHdrEc.java Normal file
View File

@ -0,0 +1,181 @@
package com.xjrsoft.module.dayPlan.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 电商-管道气销售结算
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Data
@TableName("lng_png_settle_hdr")
@ApiModel(value = "电商-管道气销售结算对象", description = "电商-管道气销售结算")
public class LngPngSettleHdrEc 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;
/**
* 创建人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;
}

18
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettleHdrEcMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.module.dayPlan.mapper;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrEc;
/**
* @title: mapper
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Mapper
public interface LngPngSettleHdrEcMapper extends BaseMapper<LngPngSettleHdrEc> {
}

22
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/IPngSettleHdrEcService.java Normal file
View File

@ -0,0 +1,22 @@
package com.xjrsoft.module.dayPlan.service;
import javax.validation.Valid;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrEcDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrEc;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrEcVo;
/**
* @title: service
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
public interface IPngSettleHdrEcService extends IService<LngPngSettleHdrEc> {
LngPngSettleHdrEcVo getInfoById(Long id);
void uploadBill(@Valid UpdateLngPngSettleHdrEcDto dto);
}

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

@ -9,11 +9,9 @@ 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.LngLngMeasurePur;
import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur;
import com.xjrsoft.module.dayPlan.mapper.LngLngMeasurePurMapper;
import com.xjrsoft.module.dayPlan.service.ILngMeasurePurService;
import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo;
import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo;
import com.xjrsoft.module.system.client.IFileClient;
import com.xjrsoft.module.system.vo.LngFileUploadVo;

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/LngMeasureSalesServiceImpl.java
View File

@ -9,13 +9,9 @@ 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.LngLngMeasure;
import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur;
import com.xjrsoft.module.dayPlan.mapper.LngLngMeasureMapper;
import com.xjrsoft.module.dayPlan.service.ILngMeasureSalesService;
import com.xjrsoft.module.dayPlan.vo.LngLngMeasurePurVo;
import com.xjrsoft.module.dayPlan.vo.LngLngMeasureVo;
import com.xjrsoft.module.dayPlan.vo.LngPngMeasurePurVo;
import com.xjrsoft.module.dayPlan.vo.LngPngMeasureSalesPurVo;
import com.xjrsoft.module.system.client.IFileClient;
import com.xjrsoft.module.system.vo.LngFileUploadVo;

63
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrEcServiceImpl.java Normal file
View File

@ -0,0 +1,63 @@
package com.xjrsoft.module.dayPlan.service.impl;
import javax.validation.Valid;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.datalog.DataOperationContent;
import com.pictc.datalog.DataOperationListener;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrEcDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrEc;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrEcMapper;
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrEcService;
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrEcVo;
import com.xjrsoft.module.system.client.IFileClient;
import cn.hutool.core.bean.BeanUtil;
import lombok.AllArgsConstructor;
/**
* @title: service
* @Author 管理员
* @Date: 2026-04-07
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class PngSettleHdrEcServiceImpl extends ServiceImpl<LngPngSettleHdrEcMapper, LngPngSettleHdrEc> implements IPngSettleHdrEcService {
private final IFileClient fileClient;
private final DatalogService dataService;
@Override
public LngPngSettleHdrEcVo getInfoById(Long id) {
return null;
}
@Override
public void uploadBill(@Valid UpdateLngPngSettleHdrEcDto dto) {
LngPngSettleHdrEc temp = this.getById(dto.getId());
UpdateLngPngSettleHdrEcDto tempDto = BeanUtil.copyProperties(temp, UpdateLngPngSettleHdrEcDto.class);
//List<LngFileUploadVo> billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", dto.getId());
tempDto.setBillList(dto.getBillList());
dataService.updateById(tempDto,new DataOperationListener<UpdateLngPngSettleHdrEcDto>() {
@Override
public UpdateLngPngSettleHdrEcDto before(DataOperationContent<UpdateLngPngSettleHdrEcDto> content) {
return null;
}
@Override
public UpdateLngPngSettleHdrEcDto after(DataOperationContent<UpdateLngPngSettleHdrEcDto> content) {
return null;
}
});
}
}

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrPurServiceImpl.java
View File

@ -6,7 +6,6 @@ import javax.validation.Valid;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.pictc.datalog.DataOperationContent;
import com.pictc.datalog.DataOperationListener;
@ -19,10 +18,7 @@ import com.pictc.utils.CollectionUtils;
import com.pictc.utils.StringUtils;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur;
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrPurMapper;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper;

4
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngSettleHdrServiceImpl.java
View File

@ -6,7 +6,6 @@ import javax.validation.Valid;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.pictc.datalog.DataOperationContent;
import com.pictc.datalog.DataOperationListener;
@ -19,10 +18,7 @@ import com.pictc.utils.CollectionUtils;
import com.pictc.utils.StringUtils;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesDtlMapper;
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleSalesMapper;

41
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-test.yml
View File

@ -2,8 +2,45 @@ spring:
cloud:
nacos: #nacos监控
config:
server-addr: 10.4.126.114:8848 # nacos 配置中心地址
server-addr: 10.4.126.112:8848 # nacos 配置中心地址
namespace: ITC-MS
group: DNE
username: nacos
password: Lng@123
password: Lng@123
extension-configs:
- data-id: global-local.yml
refresh: true
group: DNE
- data-id: discovery-local.yml
refresh: true
group: DNE
- data-id: datasource-local.yml
refresh: true
group: DNE
- data-id: seata-local.yml
refresh: true
group: DNE
- data-id: redis-local.yml
refresh: true
group: DNE
- data-id: magic-api.yml
refresh: true
group: DNE
- data-id: sa-token.yml
refresh: true
group: DNE
- data-id: camunda.yml
refresh: true
group: DNE
- data-id: sentinel-local.yml
refresh: true
group: DNE