From 50d1b85cec5e44afdb6a3e5c9fc95179df5bfd8e Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 26 Sep 2024 17:36:08 +0800 Subject: [PATCH] md --- .../erp/emis/domain/EmisSettleBill.java | 43 ++++++++++++++++--- .../erp/emis/domain/EmisSettleSubBill.java | 17 ++++++++ .../erp/emis/domain/EmisTmsScanRecord.java | 9 +--- .../xdadan/erp/emis/domain/EmisWaybill.java | 2 - .../emis/mapper/EmisSettleSubBillMapper.java | 7 +++ .../emis/service/IEmisSettleBillService.java | 4 +- .../service/IEmisSettleSubBillService.java | 3 +- .../impl/EmisSettleBillServiceImpl.java | 10 +++++ .../impl/EmisSettleSubBillServiceImpl.java | 12 ++++++ 9 files changed, 90 insertions(+), 17 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java index 7a7bb2b4a..69e327c51 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.domain; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.common.annotation.audit.DataAuditField; +import com.xdadan.erp.common.annotation.audit.DataAuditTable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.xdadan.erp.common.annotation.Excel; @@ -31,6 +33,7 @@ import lombok.Data; * @date 2024-07-03 18:54:51 */ @Data + @DataAuditTable(tableName ="emis_settle_bill",tableComment = "客户账单表") public class EmisSettleBill extends BaseEntity { private static final long serialVersionUID = 1L; @@ -40,8 +43,10 @@ public class EmisSettleBill extends BaseEntity /* 总结算账单编号 */ private String settleBillNo; /* 结算账单名称 */ + @DataAuditField(fieldComment = "账单名称") private String settleBillName; /* 结算账单类型 1-现金 2-月结 */ + @DataAuditField(fieldComment = "账单类型") private String settleType; /* 结算开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @@ -50,16 +55,21 @@ public class EmisSettleBill extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date settleEndDate; /* 账单月份 202402 */ + @DataAuditField(fieldComment = "账单月份") private String billMonth; /* 应收款金额 */ + @DataAuditField(fieldComment = "应收款") private BigDecimal recMoney; /* 已收款金额 */ + @DataAuditField(fieldComment = "已收款") private BigDecimal recedMoney; /* 已开票金额 */ private BigDecimal invoicedMoney; /* 月结编号 */ + @DataAuditField(fieldComment = "月结账号") private String custNo; /* 月结账户名称 */ + @DataAuditField(fieldComment = "月结客户") private String custName; /* 客户编码 */ private String customerCode; @@ -69,33 +79,47 @@ public class EmisSettleBill extends BaseEntity private String siteCode; /* 结算站点名称 */ private String siteName; - /* 安全金额 */ + /* 理赔金额 */ + @DataAuditField(fieldComment = "理赔金额") private BigDecimal satisfyMoney; - /* 允许金额 */ + /* 折让金额 */ + @DataAuditField(fieldComment = "折让金额") private BigDecimal allowanceMoney; /* 抵扣金额 */ + @DataAuditField(fieldComment = "抵扣金额") private BigDecimal deductionMoney; /* 其他金额 */ + @DataAuditField(fieldComment = "其他金额") private BigDecimal otherMoney; - /* 安全原因 */ + /* 理赔原因 */ + @DataAuditField(fieldComment = "理赔原因") private String satisfyReason; - /* 允许原因 */ + /* 折让原因 */ + @DataAuditField(fieldComment = "折让原因") private String allowanceReason; /* 抵扣原因 */ + @DataAuditField(fieldComment = "抵扣原因") private String deductionReason; /* 其他原因 */ + @DataAuditField(fieldComment = "其他原因") private String otherReason; /* 开票状态 0-未开票 1-已开票 2-部分开票 3-不开票 */ + @DataAuditField(fieldComment = "开票状态") private String openBillStatus; /* 付款状态 0-未付款 1-已付款 2-部分付款 */ + @DataAuditField(fieldComment = "付款状态") private String paymentStatus; /* 核销状态 0-未核销1-已核销 */ + @DataAuditField(fieldComment = "核销状态") private String chargeStatus; /* 总票数 */ + @DataAuditField(fieldComment = "总票数") private Integer sendPieceSum; /* 总件数 */ + @DataAuditField(fieldComment = "总件数") private Integer pieceNumber; /* 总重量 */ + @DataAuditField(fieldComment = "总重量") private BigDecimal feeWeight; /* 未结数量 */ private BigDecimal uncollectedAmount; @@ -104,19 +128,26 @@ public class EmisSettleBill extends BaseEntity /* 退款数量 */ private BigDecimal refundAmount; /* 退款金额 */ + @DataAuditField(fieldComment = "退款金额") private BigDecimal refundMoney; - /* 销售回款人 */ + /* 回款联系人 */ + @DataAuditField(fieldComment = "回款联系人") private String payee; /* 销售联系人 */ + @DataAuditField(fieldComment = "销售联系人") private String salesmen; /* 付款期 默认10天 */ + @DataAuditField(fieldComment = "账期") private BigDecimal creditPeriod; /* 付款期类型 1-天 2-月 */ + private String creditPeriodType; /* 账单日 1-31 */ + @DataAuditField(fieldComment = "账单日") private Integer settleDay; /* 最后回款日 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @DataAuditField(fieldComment = "最后回款日") private Date paymentDueDate; /* 推送oms */ private String blSendOms; @@ -132,11 +163,13 @@ public class EmisSettleBill extends BaseEntity /* 财务确认站点 */ private String confirmCenterCode; /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + @DataAuditField(fieldComment = "业务确认状态") private String blConfirmSite; /* 站点确认日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmSiteDate; /* 站点确认人 */ + @DataAuditField(fieldComment = "业务确认人") private String confirmSiteManCode; /* 网点确认备注 */ private String confirmSiteNote; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java index 554e4d55d..f5b4ef578 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.domain; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.common.annotation.audit.DataAuditField; +import com.xdadan.erp.common.annotation.audit.DataAuditTable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.xdadan.erp.common.annotation.Excel; @@ -31,6 +33,7 @@ import lombok.Data; * @date 2024-07-03 18:54:52 */ @Data + @DataAuditTable(tableName ="emis_settle_sub_bill",tableComment = "运单出账表") public class EmisSettleSubBill extends BaseEntity { @@ -43,6 +46,7 @@ public class EmisSettleSubBill extends BaseEntity /* 父账单号 */ private String parentBillNo; /* 总结算账单号 */ + @DataAuditField(fieldComment = "账单编号") private String settleBillNo; /* 运单号 */ private String billCode; @@ -50,41 +54,52 @@ public class EmisSettleSubBill extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date billDate; /* 账单费用 */ + @DataAuditField(fieldComment = "出账费用") private BigDecimal billFee; /* 费用币种 */ private String currency; /* 结算账单类型 1-现金 2-月结 */ + @DataAuditField(fieldComment = "出账类型") private String settleType; /* 是否已拆单 0-否 1-是 */ private String blSplit; /* 是否已合账 */ + @DataAuditField(fieldComment = "是否定制账单") private String blMerge; /* 账单月份 202402 */ + @DataAuditField(fieldComment = "账单月份") private String billMonth; /* 月结编号 */ + @DataAuditField(fieldComment = "月结账号") private String custNo; /* 月结客户名称 */ + @DataAuditField(fieldComment = "月结客户") private String custName; /* 客户编码 */ private String customerCode; /* 客户名称 */ private String customerName; /* 销售回款人 */ + @DataAuditField(fieldComment = "回款联系人") private String payee; /* 销售联系人 */ + @DataAuditField(fieldComment = "销售回款人") private String salesmen; /* 是否特殊报价 */ private String blSpecialQuote; /* 是否敏感物 */ private String blSensitive; /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ + @DataAuditField(fieldComment = "财务确认状态") private String blConfirmCenter; /* 财务确认日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmCenterDate; /* 财务确认备注 */ + @DataAuditField(fieldComment = "财务确认备注") private String confirmCenterNote; /* 财务确认人 */ + @DataAuditField(fieldComment = "财务确认人") private String confirmCenterManCode; /* 财务确认站点 */ private String confirmCenterCode; @@ -94,8 +109,10 @@ public class EmisSettleSubBill extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date confirmSiteDate; /* 站点确认人 */ + @DataAuditField(fieldComment = "业务确认人") private String confirmSiteManCode; /* 网点确认备注 */ + @DataAuditField(fieldComment = "业务确认备注") private String confirmSiteNote; /* 确认网点代码 */ private String confirmSiteCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java index ec5b23049..9ddb29c81 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java @@ -12,15 +12,9 @@ package com.xdadan.erp.emis.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.xdadan.erp.common.annotation.audit.DataAuditField; import com.xdadan.erp.common.annotation.audit.DataAuditTable; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.xdadan.erp.common.annotation.Excel; import com.xdadan.erp.common.core.domain.BaseEntity; -import com.xdadan.erp.common.core.domain.TreeEntity; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -32,10 +26,9 @@ import lombok.Data; * @author linfso * @date 2024-05-10 08:21:42 */ -//@JsonInclude(JsonInclude.Include.ALWAYS.NON_NULL) @Data @TableName("emis_tms_scan_record") -@DataAuditTable(tableName = "emis_tms_scan_record",tableComment = "扫描记录表") +@DataAuditTable(tableName ="emis_tms_scan_record",tableComment = "扫描记录表") public class EmisTmsScanRecord extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 466bc96ee..bcfd3d72d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -35,8 +35,6 @@ import lombok.Data; * @author linfso * @date 2024-04-11 05:48:01 */ -//@JsonInclude(JsonInclude.Include.ALWAYS.NON_NULL) -//@DataAuditFilter @Data @TableName("emis_waybill") @DataAuditTable(tableName = "emis_waybill",tableComment = "运单表") diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java index 36e0f8afc..a956950b6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java @@ -14,8 +14,12 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.common.annotation.audit.DataAuditLog; +import com.xdadan.erp.common.annotation.audit.OperateType; import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.EmisWaybill; +import com.xdadan.erp.emis.service.impl.EmisSettleSubBillServiceImpl; +import com.xdadan.erp.emis.service.impl.EmisTmsScanRecordServiceImpl; import org.apache.ibatis.annotations.Param; /** @@ -89,6 +93,7 @@ public interface EmisSettleSubBillMapper extends BaseMapper * @param emisSettleSubBill * @return */ + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass= EmisSettleSubBillServiceImpl.class) public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); @@ -123,6 +128,7 @@ public interface EmisSettleSubBillMapper extends BaseMapper * @param id 主键 * @return 结果 */ + @DataAuditLog(operateType= OperateType.DELETE,serviceClass= EmisSettleSubBillServiceImpl.class) public int deleteEmisSettleSubBillById(Long id); /** @@ -131,6 +137,7 @@ public interface EmisSettleSubBillMapper extends BaseMapper * @param ids 需要删除的数据主键集合 * @return 结果 */ + @DataAuditLog(operateType= OperateType.DELETE,serviceClass= EmisSettleSubBillServiceImpl.class) public int deleteEmisSettleSubBillByIds(Long[] ids); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java index b5b0338fe..b7e5da729 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -10,6 +10,8 @@ package com.xdadan.erp.emis.service; import java.util.List; + +import com.xdadan.erp.common.core.audit.IDataAuditService; import com.xdadan.erp.emis.domain.EmisSettleBill; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -19,7 +21,7 @@ import com.xdadan.erp.emis.domain.exception.EmisBizError; * @author linfso * @date 2024-07-03 18:54:51 */ -public interface IEmisSettleBillService +public interface IEmisSettleBillService extends IDataAuditService { /** * 主键查询 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java index d1feed785..ee91511c7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java @@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service; import java.util.List; import java.util.Map; +import com.xdadan.erp.common.core.audit.IDataAuditService; import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.EmisWaybill; @@ -21,7 +22,7 @@ import com.xdadan.erp.emis.domain.EmisWaybill; * @author linfso * @date 2024-07-03 18:54:52 */ -public interface IEmisSettleSubBillService +public interface IEmisSettleSubBillService extends IDataAuditService { /** * 主键查询 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index b5d4101a4..d277619ad 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -50,6 +50,16 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS @Autowired private EmisSettleSubBillMapper emisSettleSubBillMapper; + /** + * 获取稽核数据 + * @param id + * @return + */ + @Override + public Object getAuditObjectById(Object id) { + return emisSettleBillMapper.selectEmisSettleBillById((Long)id); + } + /** * 查询结算总账单 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java index 2304c26e2..683b91777 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -42,6 +42,17 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService private EmisSettlePayRelMapper emisSettlePayRelMapper; + + /** + * 获取稽核数据 + * @param id + * @return + */ + @Override + public Object getAuditObjectById(Object id) { + return emisSettleSubBillMapper.selectEmisSettleSubBillById((Long)id); + } + /** * 查询结算子账单 * @@ -166,4 +177,5 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService return emisSettleSubBillMapper.deleteEmisSettleSubBillById(id); } + }