lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-10-24 17:46:29 +08:00
parent 23a749973d 4b96702dc9
commit 8cfc34dbcb
16 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysJdcbfj.java
View File

@ -29,6 +29,12 @@ public class XzdCbysJdcbfj extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysWgcbtb.java
View File

@ -28,6 +28,12 @@ public class XzdCbysWgcbtb extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcb.java
View File

@ -29,6 +29,12 @@ public class XzdCbysZjhcb extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/XzdCbysZjhcbAlteration.java
View File

@ -29,6 +29,11 @@ public class XzdCbysZjhcbAlteration extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysJdcbfjBo.java
View File

@ -31,6 +31,12 @@ public class XzdCbysJdcbfjBo extends BaseEntity {
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysWgcbtbBo.java
View File

@ -29,6 +29,12 @@ public class XzdCbysWgcbtbBo extends BaseEntity {
*/
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbAlterationBo.java
View File

@ -29,6 +29,12 @@ public class XzdCbysZjhcbAlterationBo extends BaseEntity {
*/
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/bo/XzdCbysZjhcbBo.java
View File

@ -29,6 +29,12 @@ public class XzdCbysZjhcbBo extends BaseEntity {
*/
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysJdcbfjVo.java
View File

@ -37,6 +37,12 @@ public class XzdCbysJdcbfjVo implements Serializable {
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysWgcbtbVo.java
View File

@ -38,6 +38,12 @@ public class XzdCbysWgcbtbVo implements Serializable {
@ExcelProperty(value = "主键ID，自增")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbAlterationVo.java
View File

@ -38,6 +38,12 @@ public class XzdCbysZjhcbAlterationVo implements Serializable {
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/domain/vo/XzdCbysZjhcbVo.java
View File

@ -37,6 +37,12 @@ public class XzdCbysZjhcbVo implements Serializable {
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysJdcbfjServiceImpl.java
View File

@ -100,6 +100,7 @@ public class XzdCbysJdcbfjServiceImpl extends ServiceImpl<XzdCbysJdcbfjMapper, X
lqw.orderByDesc(XzdCbysJdcbfj::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdCbysJdcbfj::getDocCode, bo.getDocCode());
lqw.eq(StringUtils.isNotBlank(bo.getDocTitle()), XzdCbysJdcbfj::getDocTitle, bo.getDocTitle());
lqw.eq(bo.getDeptId() != null, XzdCbysJdcbfj::getDeptId, bo.getDeptId());
lqw.eq(bo.getDocDate() != null, XzdCbysJdcbfj::getDocDate, bo.getDocDate());
lqw.eq(bo.getProjectId() != null, XzdCbysJdcbfj::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getBudgetCategory()), XzdCbysJdcbfj::getBudgetCategory, bo.getBudgetCategory());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysWgcbtbServiceImpl.java
View File

@ -119,6 +119,7 @@ public class XzdCbysWgcbtbServiceImpl extends ServiceImpl<XzdCbysWgcbtbMapper, X
lqw.orderByDesc(XzdCbysWgcbtb::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdCbysWgcbtb::getDocCode, bo.getDocCode());
lqw.eq(StringUtils.isNotBlank(bo.getDocTitle()), XzdCbysWgcbtb::getDocTitle, bo.getDocTitle());
lqw.eq(bo.getDeptId() != null, XzdCbysWgcbtb::getDeptId, bo.getDeptId());
lqw.eq(bo.getDocDate() != null, XzdCbysWgcbtb::getDocDate, bo.getDocDate());
lqw.eq(StringUtils.isNotBlank(bo.getBudgetCategory()), XzdCbysWgcbtb::getBudgetCategory, bo.getBudgetCategory());
lqw.eq(bo.getProjectId() != null, XzdCbysWgcbtb::getProjectId, bo.getProjectId());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbAlterationServiceImpl.java
View File

@ -126,6 +126,7 @@ public class XzdCbysZjhcbAlterationServiceImpl extends ServiceImpl<XzdCbysZjhcbA
lqw.orderByDesc(XzdCbysZjhcbAlteration::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdCbysZjhcbAlteration::getDocCode, bo.getDocCode());
lqw.eq(StringUtils.isNotBlank(bo.getDocTitle()), XzdCbysZjhcbAlteration::getDocTitle, bo.getDocTitle());
lqw.eq(bo.getDeptId() != null, XzdCbysZjhcbAlteration::getDeptId, bo.getDeptId());
lqw.eq(bo.getDocDate() != null, XzdCbysZjhcbAlteration::getDocDate, bo.getDocDate());
lqw.eq(bo.getProjectId() != null, XzdCbysZjhcbAlteration::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getBudgetCategory()), XzdCbysZjhcbAlteration::getBudgetCategory, bo.getBudgetCategory());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/service/impl/XzdCbysZjhcbServiceImpl.java
View File

@ -101,6 +101,7 @@ public class XzdCbysZjhcbServiceImpl extends ServiceImpl<XzdCbysZjhcbMapper, Xzd
lqw.orderByDesc(XzdCbysZjhcb::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdCbysZjhcb::getDocCode, bo.getDocCode());
lqw.eq(StringUtils.isNotBlank(bo.getDocTitle()), XzdCbysZjhcb::getDocTitle, bo.getDocTitle());
lqw.eq(bo.getDeptId() != null, XzdCbysZjhcb::getDeptId, bo.getDeptId());
lqw.eq(bo.getDocDate() != null, XzdCbysZjhcb::getDocDate, bo.getDocDate());
lqw.eq(bo.getProjectId() != null, XzdCbysZjhcb::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getBudgetCategory()), XzdCbysZjhcb::getBudgetCategory, bo.getBudgetCategory());