diff --git a/jinbooks-ui/src/views/settlement/carry-forward.vue b/jinbooks-ui/src/views/settlement/carry-forward.vue index 4270c97..f317f15 100644 --- a/jinbooks-ui/src/views/settlement/carry-forward.vue +++ b/jinbooks-ui/src/views/settlement/carry-forward.vue @@ -80,6 +80,9 @@ + + + diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/VoucherTemplate.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/VoucherTemplate.java index 42e80c3..2b43b91 100644 --- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/VoucherTemplate.java +++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/voucher/VoucherTemplate.java @@ -77,6 +77,11 @@ public class VoucherTemplate extends BaseEntity implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) Integer voucherType; + /** + * 默认凭证日期,为月份的第几天,0为月末 + */ + Integer voucherDate; + /** * 字头:“记”、“收”、“付”、“转”等 */ diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java index 13c1281..892b013 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java @@ -324,7 +324,6 @@ public class EmployeeSalaryServiceImpl extends ServiceImpl itemLqw = Wrappers.lambdaQuery(); itemLqw.eq(VoucherTemplateItem::getRelatedId, voucherTemplate.getRelatedId()); @@ -385,7 +398,7 @@ public class EmployeeSalaryServiceImpl extends ServiceImpl voucherItems = new ArrayList<>(); diff --git a/sql/jinbooks_v1.0.1-add.sql b/sql/jinbooks_v1.0.1-add.sql index 24af956..82ccba7 100644 --- a/sql/jinbooks_v1.0.1-add.sql +++ b/sql/jinbooks_v1.0.1-add.sql @@ -13,4 +13,7 @@ DROP COLUMN `salary_voucher_id`, DROP COLUMN `accrual_voucher_id`; -DROP TABLE `jinbooks`.`jbx_employee_salary_voucher_rule_template`, `jinbooks`.`jbx_employee_salary_voucher_rule`; \ No newline at end of file +DROP TABLE `jinbooks`.`jbx_employee_salary_voucher_rule_template`, `jinbooks`.`jbx_employee_salary_voucher_rule`; + +ALTER TABLE `jinbooks`.`jbx_voucher_template` +ADD COLUMN `voucher_date` SMALLINT NULL DEFAULT 0 COMMENT '默认凭证日期,为月份的第几天,0为月末' AFTER `voucher_type`;