Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
# Conflicts: # itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java # itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java # itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java # itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java # itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java # itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java
This commit is contained in:
张秉卓
@ -0,0 +1,144 @@
|
||||
package com.xjrsoft.module.contract.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.pictc.datalog.DataOperationContent;
|
||||
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.contract.dto.LngContractPageDto;
|
||||
import com.xjrsoft.module.contract.dto.UpdateLngContractPurDto;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPur;
|
||||
import com.xjrsoft.module.contract.service.IContractPurPngService;
|
||||
import com.xjrsoft.module.contract.vo.LngContractPurPageVo;
|
||||
import com.xjrsoft.module.datalog.service.DatalogService;
|
||||
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
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: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/contract" + "/contractPurPng")
|
||||
@Api(value = "/contract" + "/contractPurPng",tags = "国内管道气采购代码")
|
||||
@AllArgsConstructor
|
||||
public class ContractPurPngController {
|
||||
|
||||
|
||||
private final IContractPurPngService contractPurPngService;
|
||||
private final DatalogService dataService;
|
||||
|
||||
@GetMapping(value = "/page")
|
||||
@ApiOperation(value="LngContract列表(分页)")
|
||||
@SaCheckPermission("contractPurPng:list")
|
||||
public R page(@Valid LngContractPageDto dto){
|
||||
|
||||
LambdaQueryWrapper<LngContractPur> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper
|
||||
.eq(ObjectUtil.isNotNull(dto.getId()),LngContractPur::getId,dto.getId())
|
||||
.like(StrUtil.isNotBlank(dto.getKNo()),LngContractPur::getKNo,dto.getKNo())
|
||||
.like(StrUtil.isNotBlank(dto.getKName()),LngContractPur::getKName,dto.getKName())
|
||||
.like(StrUtil.isNotBlank(dto.getCpName()),LngContractPur::getCpName,dto.getCpName())
|
||||
//.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngContract::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd())
|
||||
//.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngContract::getDateTo,dto.getDateToStart(),dto.getDateToEnd())
|
||||
.like(StrUtil.isNotBlank(dto.getApproCode()),LngContractPur::getApproCode,dto.getApproCode())
|
||||
.like(StrUtil.isNotBlank(dto.getCpTableName()),LngContractPur::getCpTableName,dto.getCpTableName())
|
||||
.like(StrUtil.isNotBlank(dto.getOnlineSign()),LngContractPur::getOnlineSign,dto.getOnlineSign())
|
||||
.eq(ObjectUtil.isNotNull(dto.getComId()),LngContractPur::getComId,dto.getComId())
|
||||
.like(StrUtil.isNotBlank(dto.getNote()),LngContractPur::getNote,dto.getNote())
|
||||
.orderByDesc(LngContractPur::getId)
|
||||
.select(LngContractPur.class,x -> VoToColumnUtil.fieldsToColumns(LngContractPurPageVo.class).contains(x.getProperty()));
|
||||
IPage<LngContractPur> page = contractPurPngService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngContractPurPageVo> pageOutput = ConventPage.getPageOutput(page, LngContractPurPageVo.class);
|
||||
return R.ok(pageOutput);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/info")
|
||||
@ApiOperation(value="根据id查询LngContract信息")
|
||||
// @SaCheckPermission("contractPurPng:detail")
|
||||
public R info(@RequestParam Long id){
|
||||
return R.ok(contractPurPngService.getInfoById(id));
|
||||
}
|
||||
|
||||
@GetMapping(value = "/datalog")
|
||||
@ApiOperation(value="根据id查询LngContract数据详细日志")
|
||||
@SaCheckPermission("contractPurPng:datalog")
|
||||
public R datalog(@RequestParam Long id){
|
||||
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngContractPurDto.class,id);
|
||||
return R.ok(logs);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping
|
||||
@ApiOperation(value = "新增LngContract")
|
||||
@SaCheckPermission("contractPurPng:add")
|
||||
public R add(@Valid @RequestBody UpdateLngContractPurDto dto){
|
||||
//UpdateLngContractPurDto res = dataService.insert(dto);
|
||||
UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener<UpdateLngContractPurDto>() {
|
||||
@Override
|
||||
public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
|
||||
return R.ok(res);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@ApiOperation(value = "修改LngContract")
|
||||
@SaCheckPermission("contractPurPng:edit")
|
||||
public R update(@Valid @RequestBody UpdateLngContractPurDto dto){
|
||||
//return R.ok(dataService.updateById(dto));
|
||||
UpdateLngContractPurDto res = dataService.insert(dto, new DataOperationListener<UpdateLngContractPurDto>() {
|
||||
@Override
|
||||
public UpdateLngContractPurDto before(DataOperationContent<UpdateLngContractPurDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngContractPurDto after(DataOperationContent<UpdateLngContractPurDto> content) {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
return R.ok(res);
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
@ApiOperation(value = "删除")
|
||||
@SaCheckPermission("contractPurPng:delete")
|
||||
public R delete(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.deleteByIds(UpdateLngContractPurDto.class, ids));
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -10,14 +10,14 @@ import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气销售
|
||||
* @title: 国内管道气
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract_fact_rel")
|
||||
@ApiModel(value = "国内管道气销售对象", description = "国内管道气销售")
|
||||
@ApiModel(value = "国内管道气采购/销售对象", description = "国内管道气采购")
|
||||
public class LngContractFactRel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -0,0 +1,287 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
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.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气采购
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract")
|
||||
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购")
|
||||
public class LngContractPur implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同主体ID(天然气公司/惠贸)
|
||||
*/
|
||||
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long comId;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@ApiModelProperty("合同号")
|
||||
private String kNo;
|
||||
|
||||
/**
|
||||
* 合同名称
|
||||
*/
|
||||
@ApiModelProperty("合同名称")
|
||||
private String kName;
|
||||
|
||||
/**
|
||||
* 业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)
|
||||
*/
|
||||
@ApiModelProperty("业务类型(PI-国际采购/SI-国际销售/PP-国内PNG采购/SL-国内LNG销售/SP-国内PNG销售/T-管道运输/P-加工服务)")
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)
|
||||
*/
|
||||
@ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)")
|
||||
private String onlineSign;
|
||||
|
||||
/**
|
||||
* 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)
|
||||
*/
|
||||
@ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)")
|
||||
private String cpTableName;
|
||||
|
||||
/**
|
||||
* 主交易对手编码
|
||||
*/
|
||||
@ApiModelProperty("主交易对手编码")
|
||||
private String cpCode;
|
||||
|
||||
/**
|
||||
* 主交易对手名称
|
||||
*/
|
||||
@ApiModelProperty("主交易对手名称")
|
||||
private String cpName;
|
||||
|
||||
/**
|
||||
* 合同期限
|
||||
*/
|
||||
@ApiModelProperty("合同期限")
|
||||
private String kPeriod;
|
||||
|
||||
/**
|
||||
* 合同签订日期
|
||||
*/
|
||||
@ApiModelProperty("合同签订日期")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateSign;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 确认函开始日
|
||||
*/
|
||||
@ApiModelProperty("确认函开始日")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateCfmFrom;
|
||||
|
||||
/**
|
||||
* 确认函结束日
|
||||
*/
|
||||
@ApiModelProperty("确认函结束日")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateCfmTo;
|
||||
|
||||
/**
|
||||
* 币种
|
||||
*/
|
||||
@ApiModelProperty("币种")
|
||||
private String curCode;
|
||||
|
||||
/**
|
||||
* 合同金额
|
||||
*/
|
||||
@ApiModelProperty("合同金额")
|
||||
private String amountDesc;
|
||||
|
||||
/**
|
||||
* 我方联系人
|
||||
*/
|
||||
@ApiModelProperty("我方联系人")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long empId;
|
||||
|
||||
/**
|
||||
* 业务部门ID
|
||||
*/
|
||||
@ApiModelProperty("业务部门ID")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long bDeptId;
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
/**
|
||||
* lngContractPurPng
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPng子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "kId")
|
||||
@LogJoin(name = "合同上载点关联信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractPurPng.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractPurPng> lngContractPurPngList;
|
||||
/**
|
||||
* lngContractPurPngPoint
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPngPoint子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "kId")
|
||||
@LogJoin(name = "合同上载点关联信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractPurPngPoint.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractPurPngPoint> lngContractPurPngPointList;
|
||||
/**
|
||||
* lngContractPurPngQty
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPngQty子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "kId")
|
||||
@LogJoin(name = "合同数量关联信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractPurPngQty.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractPurPngQty> lngContractPurPngQtyList;
|
||||
/**
|
||||
* lngContractApproRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractApproRel子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "tableId")
|
||||
@LogJoin(name = "合同审批要素关联信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "tableId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractApproRel.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractApproRel> lngContractApproRelList;
|
||||
/**
|
||||
* lngContractFactRel
|
||||
*/
|
||||
@ApiModelProperty("lngContractFactRel子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "kId")
|
||||
@LogJoin(name = "合同要素关联信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractFactRel.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractFactRel> lngContractFactRelList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,163 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
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 io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气采购
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract_pur_png")
|
||||
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购")
|
||||
public class LngContractPurPng implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
private String prcTypeCode;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
private String periodTypeCode;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
private String uomCode;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
private String note;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long createUserId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime createDate;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long modifyUserId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ApiModelProperty("")
|
||||
|
||||
|
||||
|
||||
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,156 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
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 com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气采购
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract_pur_png_point")
|
||||
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购")
|
||||
public class LngContractPurPngPoint implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 上载点编码
|
||||
*/
|
||||
@ApiModelProperty("上载点编码")
|
||||
|
||||
|
||||
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 自主托运(Y-是，N-否)
|
||||
*/
|
||||
@ApiModelProperty("自主托运(Y-是，N-否)")
|
||||
|
||||
|
||||
|
||||
private String transSign;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
/**
|
||||
* lngContractPurPngPoint
|
||||
*/
|
||||
@ApiModelProperty("lngContractPurPngPointSales子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "id", joinField = "kpppId")
|
||||
@LogJoin(name = "交割点信息",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "id",relatedField = "kpppId", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = LngContractPurPngPointSales.class, type = JoinType.MANY)
|
||||
|
||||
private List<LngContractPurPngPointSales> lngContractPurPngPointSalesList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
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 com.pictc.annotations.datalog.LogField;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气采购
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract_pur_png_point_sales")
|
||||
@ApiModel(value = "国内管道气采购-上载点-交割点对象", description = "国内管道气采购-上载点-交割点")
|
||||
public class LngContractPurPngPointSales implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-国内采购-管道气-上载点主键")
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long kpppId;
|
||||
|
||||
/**
|
||||
* 上载点编码
|
||||
*/
|
||||
@ApiModelProperty("上载点编码")
|
||||
private String pointUpCode;
|
||||
|
||||
/**
|
||||
* 自主托运(Y-是，N-否)
|
||||
*/
|
||||
@ApiModelProperty("自主托运(Y-是，N-否)")
|
||||
private String transSign;
|
||||
|
||||
|
||||
/**
|
||||
* 交割点编码
|
||||
*/
|
||||
@ApiModelProperty("交割点编码")
|
||||
private String pointDelyCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,244 @@
|
||||
package com.xjrsoft.module.contract.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
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 io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 国内管道气采购
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_contract_pur_png_qty")
|
||||
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购")
|
||||
public class LngContractPurPngQty implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 合同-档案主键
|
||||
*/
|
||||
@ApiModelProperty("合同-档案主键")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Long kId;
|
||||
|
||||
/**
|
||||
* 开始日期(需要校验周期)
|
||||
*/
|
||||
@ApiModelProperty("开始日期(需要校验周期)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 优先级(必须录入)
|
||||
*/
|
||||
@ApiModelProperty("优先级(必须录入)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 基础量/增量(基础量/增量1/增量2)
|
||||
*/
|
||||
@ApiModelProperty("基础量/增量(基础量/增量1/增量2)")
|
||||
|
||||
|
||||
|
||||
private String baseInc;
|
||||
|
||||
/**
|
||||
* 比值(方/吉焦)
|
||||
*/
|
||||
@ApiModelProperty("比值(方/吉焦)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal rateM3Gj;
|
||||
|
||||
/**
|
||||
* 月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)
|
||||
*/
|
||||
@ApiModelProperty("月气量(吉焦)(qty_m3_month*rate_m3_gj/1000)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyGjMonth;
|
||||
|
||||
/**
|
||||
* 月气量(方)(qty_gj_month*1000/rate_m3_gj)
|
||||
*/
|
||||
@ApiModelProperty("月气量(方)(qty_gj_month*1000/rate_m3_gj)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyM3Month;
|
||||
|
||||
/**
|
||||
* 日气量(吉焦)(根据当月天数自动计算)
|
||||
*/
|
||||
@ApiModelProperty("日气量(吉焦)(根据当月天数自动计算)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyGjDay;
|
||||
|
||||
/**
|
||||
* 日气量(方)(根据当月天数自动计算)
|
||||
*/
|
||||
@ApiModelProperty("日气量(方)(根据当月天数自动计算)")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal qtyM3Day;
|
||||
|
||||
/**
|
||||
* 照付不议类型(P-比例/M3-方/GJ-吉焦)
|
||||
*/
|
||||
@ApiModelProperty("照付不议类型(P-比例/M3-方/GJ-吉焦)")
|
||||
|
||||
|
||||
|
||||
private String zfbyTypeCode;
|
||||
|
||||
/**
|
||||
* 照付不议比例%/量数值
|
||||
*/
|
||||
@ApiModelProperty("照付不议比例%/量数值")
|
||||
|
||||
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.IGNORED)
|
||||
private BigDecimal zfbyValue;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractFactRelMapper extends MPJBaseMapper<LngContractFactRel>, BaseMapper<LngContractFactRel> {
|
||||
public interface LngContractFactRelMapper extends MPJBaseMapper<LngContractFactRel>,BaseMapper<LngContractFactRel> {
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.contract.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPur;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractPurMapper extends MPJBaseMapper<LngContractPur>, BaseMapper<LngContractPur> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.contract.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPng;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractPurPngMapper extends MPJBaseMapper<LngContractPurPng> , BaseMapper<LngContractPurPng>{
|
||||
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.xjrsoft.module.contract.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngPoint;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngQty;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractPurPngPointMapper extends MPJBaseMapper<LngContractPurPngPoint> , BaseMapper<LngContractPurPngPoint>{
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.xjrsoft.module.contract.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngPoint;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngQty;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractPurPngPointSalesMapper extends MPJBaseMapper<LngContractPurPngPointSales> , BaseMapper<LngContractPurPngPointSales>{
|
||||
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.xjrsoft.module.contract.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngQty;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngContractPurPngQtyMapper extends MPJBaseMapper<LngContractPurPngQty>, BaseMapper<LngContractPurPngQty> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.xjrsoft.module.contract.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPur;
|
||||
import com.xjrsoft.module.contract.vo.LngContractPurVo;
|
||||
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
|
||||
public interface IContractPurPngService extends MPJBaseService<LngContractPur>, MPJDeepService<LngContractPur>, MPJRelationService<LngContractPur> {
|
||||
|
||||
LngContractPurVo getInfoById(Long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package com.xjrsoft.module.contract.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPur;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngPoint;
|
||||
import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales;
|
||||
import com.xjrsoft.module.contract.mapper.LngContractPurMapper;
|
||||
import com.xjrsoft.module.contract.mapper.LngContractPurPngPointSalesMapper;
|
||||
import com.xjrsoft.module.contract.service.IContractPurPngService;
|
||||
import com.xjrsoft.module.contract.vo.LngContractPurPngPointVo;
|
||||
import com.xjrsoft.module.contract.vo.LngContractPurVo;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomer;
|
||||
import com.xjrsoft.module.system.client.IFileClient;
|
||||
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-30
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class ContractPurPngServiceImpl extends MPJBaseServiceImpl<LngContractPurMapper, LngContractPur> implements IContractPurPngService {
|
||||
|
||||
private final IFileClient fileClient;
|
||||
|
||||
private final LngContractPurPngPointSalesMapper lngContractPurPngPointSalesMapper;
|
||||
|
||||
@Override
|
||||
public LngContractPurVo getInfoById(Long id) {
|
||||
LngContractPur lngContractPur = this.getByIdDeep(id);
|
||||
if(lngContractPur == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(lngContractPur.getLngContractPurPngPointList() != null) {
|
||||
for(LngContractPurPngPoint pp:lngContractPur.getLngContractPurPngPointList()) {
|
||||
List<LngContractPurPngPointSales> list = lngContractPurPngPointSalesMapper.selectList(new LambdaQueryWrapper<LngContractPurPngPointSales>()
|
||||
.eq(LngContractPurPngPointSales::getKpppId, pp.getId()));
|
||||
pp.setLngContractPurPngPointSalesList(list);
|
||||
}
|
||||
}
|
||||
LngContractPurVo vo = BeanUtil.toBean(lngContractPur, LngContractPurVo.class);
|
||||
|
||||
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_contract", "lngFileUploadList", vo.getId());
|
||||
vo.setLngFileUploadList(fileList);
|
||||
return vo;
|
||||
}
|
||||
}
|
||||
@ -164,7 +164,18 @@ public class CustomerController {
|
||||
@ApiOperation(value = "删除")
|
||||
@SaCheckPermission("customer:delete")
|
||||
public R delete(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(customerService.delete(ids));
|
||||
//return R.ok(customerService.delete(ids));
|
||||
return R.ok(dataService.deleteByIds(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
|
||||
@Override
|
||||
public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
@ -172,7 +183,18 @@ public class CustomerController {
|
||||
@ApiOperation(value = "启用LngCustomer")
|
||||
@SaCheckPermission("customer:enable")
|
||||
public R enable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids));
|
||||
|
||||
return R.ok(dataService.enable(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
|
||||
@Override
|
||||
public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@ -180,7 +202,18 @@ public class CustomerController {
|
||||
@ApiOperation(value = "禁用LngCustomer")
|
||||
@SaCheckPermission("customer:disable")
|
||||
public R disable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids));
|
||||
//return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids));
|
||||
return R.ok(dataService.disable(UpdateLngCustomerDto.class,ids, new DataOperationListener<UpdateLngCustomerDto>() {
|
||||
@Override
|
||||
public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
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.ValueDirectionType;
|
||||
@ -266,6 +267,11 @@ public class LngCustomer implements Serializable {
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
/**
|
||||
* 是否基础设施使用方
|
||||
*/
|
||||
@ApiModelProperty(name="是否基础设施使用方")
|
||||
private String facSign;
|
||||
|
||||
/**
|
||||
* lngCustomerAttrPower
|
||||
|
||||
@ -20,7 +20,6 @@ import com.pictc.datalog.DataOperationContent;
|
||||
import com.pictc.datalog.DataOperationListener;
|
||||
import com.pictc.enums.BusinessCode;
|
||||
import com.pictc.enums.ExceptionCommonCode;
|
||||
import com.xjrsoft.common.advice.tran.CustomerDataProvider;
|
||||
import com.xjrsoft.common.advice.tran.SupplierDataProvider;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.common.model.result.R;
|
||||
@ -161,7 +160,18 @@ public class SupplierController {
|
||||
@ApiOperation(value = "删除")
|
||||
@SaCheckPermission("supplier:delete")
|
||||
public R delete(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids));
|
||||
//return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids));
|
||||
return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
|
||||
@Override
|
||||
public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
@ -169,7 +179,18 @@ public class SupplierController {
|
||||
@ApiOperation(value = "启用LngSupplier")
|
||||
@SaCheckPermission("supplier:enable")
|
||||
public R enable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids));
|
||||
//return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids));
|
||||
return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
|
||||
@Override
|
||||
public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@ -177,7 +198,18 @@ public class SupplierController {
|
||||
@ApiOperation(value = "禁用LngSupplier")
|
||||
@SaCheckPermission("supplier:disable")
|
||||
public R disable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids));
|
||||
//return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids));
|
||||
return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids, new DataOperationListener<UpdateLngSupplierDto>() {
|
||||
@Override
|
||||
public UpdateLngSupplierDto before(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateLngSupplierDto after(DataOperationContent<UpdateLngSupplierDto> content) {
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user