weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

id类型修改;

Browse Source
This commit is contained in:
王奎兴
2026-02-26 16:24:05 +08:00
parent aa33331616
commit 8b35c96716
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceInfo/entity/BmsInvoiceInfo.java
+2 -2
View File
@@ -24,8 +24,8 @@ public class BmsInvoiceInfo extends BaseVOEntity {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
@TableId(type = IdType.AUTO)
private Long id;
/**用户ID*/
@ApiModelProperty(value = "用户ID")
@Excel(name = "用户ID", width = 15)
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsInvoiceList.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class BmsInvoiceList extends BaseVOEntity {
/**主键*/
@TableId(type = IdType.AUTO)
private String id;
private Long id;
/**发票抬头*/
@ApiModelProperty(value = "发票抬头")
@Excel(name = "发票抬头", width = 15)
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/entity/BmsSettlementPartyInvoice.java
+2 -2
View File
@@ -18,8 +18,8 @@ import java.util.Date;
@Data
public class BmsSettlementPartyInvoice extends BaseVOEntity {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ID_WORKER_STR)
private String id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "结算方姓名")
@Excel(name = "结算方姓名", width = 15)
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java
+4 -4
View File
@@ -198,7 +198,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
List<BmsMakeOutInvoice> bmsMakeOutInvoices = bmsInvoiceListDTO.getBmsMakeOutInvoices();
if(ObjectUtil.isNotNull(bmsMakeOutInvoices)&&bmsMakeOutInvoices.size()>0){
for (BmsMakeOutInvoice bmsMakeOutInvoice : bmsMakeOutInvoices) {
if(StringUtils.isNotBlank(bmsMakeOutInvoice.getId())){
if(bmsMakeOutInvoice.getId() != null){
//bmsMakeOutInvoice.setUpdateBy(sysUser.getId());
bmsMakeOutInvoice.setUpdateTime(new Date());
bmsMakeOutInvoice.setIsDelete(0);
@@ -208,7 +208,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
String invoiceCode=bmsMakeOutInvoice.getInvoiceCode();
BigDecimal invoiceValue=bmsMakeOutInvoice.getInvoiceValue();
BeanUtils.copyProperties(bmsInvoiceList, bmsMakeOutInvoice);
bmsMakeOutInvoice.setId("");
//bmsMakeOutInvoice.setId("");
//bmsMakeOutInvoice.setCreateBy(sysUser.getId());
bmsMakeOutInvoice.setCreateTime(new Date());
bmsMakeOutInvoice.setInvoiceId(bmsInvoiceList.getId());
@@ -318,7 +318,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
String invoiceCode=bmsMakeOutInvoice.getInvoiceCode();
BigDecimal invoiceValue=bmsMakeOutInvoice.getInvoiceValue();
BeanUtils.copyProperties(bmsInvoiceList, bmsMakeOutInvoice);
bmsMakeOutInvoice.setId("");
//bmsMakeOutInvoice.setId("");
//bmsMakeOutInvoice.setCreateBy(sysUser.getId());
bmsMakeOutInvoice.setCreateTime(date);
bmsMakeOutInvoice.setInvoiceId(bmsInvoiceList.getId());
@@ -705,7 +705,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
if (null == sysUser) {
throw new ServiceException("未查询到登录人信息");
}
if(StringUtils.isBlank(bmsInvoiceListInvoiceStateDTO.getId())){
if(bmsInvoiceListInvoiceStateDTO.getId() == null){
throw new ServiceException("未获取到发票信息");
}
String [] idList = bmsInvoiceListInvoiceStateDTO.getId().split(",");
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListDTO.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class BmsInvoiceListDTO implements Serializable {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
private Long id;
/**发票抬头*/
@ApiModelProperty(value = "发票抬头")
@Excel(name = "发票抬头", width = 15)
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/todo/BmsInvoiceListQueryDTO.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class BmsInvoiceListQueryDTO implements Serializable {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
private Long id;
/**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/
@ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）")
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListDetailsVO.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class BmsInvoiceListDetailsVO implements Serializable {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
private Long id;
/**发票抬头*/
@ApiModelProperty(value = "发票抬头")
@Excel(name = "发票抬头", width = 15)
mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/vo/BmsInvoiceListVO.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class BmsInvoiceListVO implements Serializable {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
private Long id;
/**发票申请时间*/
@ApiModelProperty(value = "发票申请时间")
@Excel(name = "发票申请时间", width = 25, dateFormat = "yyyy-MM-dd HH:mm:ss")
mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java
+3 -3
View File
@@ -23,12 +23,12 @@ public class BmsMakeOutInvoice extends BaseVOEntity {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
private String id;
@TableId(type = IdType.AUTO)
private Long id;
/**发票ID*/
@ApiModelProperty(value = "发票ID")
@Excel(name = "发票ID", width = 15)
private String invoiceId;
private Long invoiceId;
/**发票抬头*/
@ApiModelProperty(value = "发票抬头")
@Excel(name = "发票抬头", width = 15)