国内LNG销售

This commit is contained in:
2026-01-30 17:58:19 +08:00
parent 214520a8e2
commit c211318fea
5 changed files with 42 additions and 19 deletions

View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
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;
@ -106,6 +107,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="合同签订日期",index=10)
@ApiModelProperty("合同签订日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateSign;
/**
@ -113,6 +115,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="有效期开始",index=11)
@ApiModelProperty("有效期开始")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -120,6 +123,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="有效期结束",index=12)
@ApiModelProperty("有效期结束")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**
@ -127,6 +131,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="确认函开始日",index=13)
@ApiModelProperty("确认函开始日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmFrom;
/**
@ -134,6 +139,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="确认函结束日",index=14)
@ApiModelProperty("确认函结束日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmTo;
/**
@ -187,35 +193,46 @@ public class UpdateLngContractSalesDto implements Serializable {
/**
* lngContractPurPng
* lngContractSalesLng
*/
@ApiModelProperty("lngContractPurPng子表")
@LogJoin(name = "lngContractPurPng子表",
@ApiModelProperty("lngContractSalesLng子表")
@LogJoin(name = "lngContractSalesLng子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngDto> lngContractPurPngList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngDto> lngContractSalesLngList;
/**
* lngContractPurPngPoint
* LngContractSalesLngSta
*/
@ApiModelProperty("lngContractPurPngPoint子表")
@LogJoin(name = "lngContractPurPngPoint子表",
@ApiModelProperty("LngContractSalesLngSta子表")
@LogJoin(name = "LngContractSalesLngSta子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngPointDto> lngContractPurPngPointList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngStaDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngStaDto> lngContractSalesLngStaList;
/**
* lngContractPurPngQty
* LngContractSalesLngSta
*/
@ApiModelProperty("LngContractSalesLngDisc子表")
@LogJoin(name = "LngContractSalesLngDisc子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDiscDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngDiscDto> lngContractSalesLngDiscList;
/**
* lngContractSalesLngQty
*/
@ApiModelProperty("lngContractPurPngQty子表")
@LogJoin(name = "lngContractPurPngQty子表",
@ApiModelProperty("LngContractSalesLngQty子表")
@LogJoin(name = "LngContractSalesLngQty子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngQtyDto> lngContractPurPngQtyList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngQtyDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngQtyDto> lngContractSalesLngQtyList;
/**
* lngContractApproRel
*/

View File

@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.dto;
import java.io.Serializable;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
@ -50,6 +51,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
*/
@LogField(name="开始日期",index=3)
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -57,6 +59,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
*/
@LogField(name="结束日期",index=4)
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**

View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
@ -44,6 +45,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
*/
@LogField(name="开始日期",index=2)
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -51,6 +53,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
*/
@LogField(name="结束日期",index=3)
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**

View File

@ -123,9 +123,9 @@ public class ContractSalesLngController {
@SaCheckPermission("contractSalesLng:delete")
public R delete(@Valid @RequestBody List<Long> ids){
boolean res = dataService.deleteByIds(UpdateLngContractPurDto.class,ids, new DataOperationListener<UpdateLngContractPurDto>() {
boolean res = dataService.deleteByIds(UpdateLngContractSalesDto.class,ids, new DataOperationListener<UpdateLngContractSalesDto>() {
@Override
public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
public UpdateLngContractSalesDto before(DataOperationContent<UpdateLngContractSalesDto> content) {
String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName());
List<JdbcParam> params = Lists.newArrayList();
JdbcParam outParam = JdbcParam.ofString(null).setOut(true);
@ -140,7 +140,7 @@ public class ContractSalesLngController {
}
@Override
public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
public UpdateLngContractSalesDto after(DataOperationContent<UpdateLngContractSalesDto> content) {
return null;
}
});