From 012273d1c72a3a1ab1cdcf8ad3902af9525b6277 Mon Sep 17 00:00:00 2001 From: orangebabu <2409692770@qq.com> Date: Wed, 11 Jun 2025 15:16:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jinbooks-ui/src/utils/DistData.ts | 20 +++++- .../hr/salary-voucher-rules/template.vue | 71 ++++++++++++++----- .../enums/SalaryVoucherTemplateEnum.java | 11 +-- .../EmployeeSalarySummaryServiceImpl.java | 3 +- 4 files changed, 82 insertions(+), 23 deletions(-) diff --git a/jinbooks-ui/src/utils/DistData.ts b/jinbooks-ui/src/utils/DistData.ts index a4c2ab7..49d7b29 100644 --- a/jinbooks-ui/src/utils/DistData.ts +++ b/jinbooks-ui/src/utils/DistData.ts @@ -2213,9 +2213,13 @@ const distData: DistData = { value: "companyCosts" }, { - label: "实发工资", + label: "应发工资", value: "salaryPayable" }, + { + label: "实发工资", + value: "actualSalary" + }, { label: "个人所得税", value: "personalIncomeTax" @@ -2237,6 +2241,20 @@ const distData: DistData = { value: "providentFundPaidByEnterprises" } ], + "labor_fee_values": [ + { + label: "劳务费总额", + value: "companyCosts" + }, + { + label: "实发劳务费", + value: "actualSalary" + }, + { + label: "代扣个人所得税", + value: "personalIncomeTax" + } + ], "salary_directions": [ { label: "借", diff --git a/jinbooks-ui/src/views/hr/salary-voucher-rules/template.vue b/jinbooks-ui/src/views/hr/salary-voucher-rules/template.vue index 799903c..8a17e3c 100644 --- a/jinbooks-ui/src/views/hr/salary-voucher-rules/template.vue +++ b/jinbooks-ui/src/views/hr/salary-voucher-rules/template.vue @@ -8,7 +8,7 @@
- + @@ -47,7 +47,7 @@ :show-overflow-tooltip="true"> @@ -89,10 +89,17 @@ import modal from "@/plugins/modal"; const {t} = useI18n() const {proxy} = getCurrentInstance()!; -const {salary_values, salary_directions} - = proxy?.useDict( "salary_values", "salary_directions"); +const {salary_values, salary_directions, labor_fee_values} + = proxy?.useDict( "salary_values", "salary_directions", "labor_fee_values"); const emit: any = defineEmits(['dialogOfClosedMethods']) const formRef = ref | null>(null); +interface SalaryValueItem { + label: string + value: string | number +} + +const salaryValuesList = ref([]) + const props: any = defineProps({ title: { type: String, @@ -185,35 +192,67 @@ function reset(): any { form.value = { voucherType: 0, wordHead: '记' - }; + } - const summaryTemplate = typeTextMap[form.value.voucherType] || ""; + // 先根据 voucherType 给 salaryValuesList 赋值 + if (form.value.voucherType === 0 || form.value.voucherType === 1) { + salaryValuesList.value = salary_values.value + } else { + salaryValuesList.value = labor_fee_values.value + } - dataList.value = [{ - id: null, - summary: summaryTemplate, - direction: "1", - subjectCode: props.deptOptions?.[0]?.code || null, - selectedValue: salary_values.value[0].value, - }] + // 取第一个值 + const selectedValue = salaryValuesList.value.length > 0 ? salaryValuesList.value[0].value : null - formRef?.value?.resetFields(); + // 设置 dataList + const summaryTemplate = typeTextMap[form.value.voucherType] || "" + + dataList.value = [ + { + id: null, + summary: summaryTemplate, + direction: "1", + subjectCode: props.deptOptions?.[0]?.code || null, + selectedValue: selectedValue, + } + ] + + formRef?.value?.resetFields() } -function addRecord() { +function addRecord() { const summaryTemplate = typeTextMap[form.value.voucherType] || ""; + // 根据 voucherType 先切换数据源 + if (form.value.voucherType === 0 || form.value.voucherType === 1) { + salaryValuesList.value = salary_values.value; + } else { + salaryValuesList.value = labor_fee_values.value; + } + + // 如果 salaryValuesList 为空，安全处理（防止访问 undefined） + const selectedValue = salaryValuesList.value.length > 0 ? salaryValuesList.value[0].value : null; + + // 新增一条记录 dataList.value.push({ id: null, summary: summaryTemplate, direction: "1", subjectCode: props.deptOptions?.[0]?.code || null, - selectedValue: salary_values.value[0].value, + selectedValue: selectedValue, }); } +function handleChangeType() { + // 根据 voucherType 先切换数据源 + if (form.value.voucherType === 0 || form.value.voucherType === 1) { + salaryValuesList.value = salary_values.value; + } else { + salaryValuesList.value = labor_fee_values.value; + } +} function dialogOfClosedMethods(val: any): any { dialogStatus.value = false; diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/enums/SalaryVoucherTemplateEnum.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/enums/SalaryVoucherTemplateEnum.java index 32d37af..93d749a 100644 --- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/enums/SalaryVoucherTemplateEnum.java +++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/enums/SalaryVoucherTemplateEnum.java @@ -1,12 +1,12 @@ /* * Copyright [2025] [JinBooks of copyright http://www.jinbooks.com] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,7 @@ * limitations under the License. * */ - + package com.jinbooks.enums; @@ -29,7 +29,8 @@ import lombok.Getter; @Getter public enum SalaryVoucherTemplateEnum { COMPANY_COSTS("companyCosts", "公司成本"), - SALARY_PAYABLE("salaryPayable", "实发工资"), + SALARY_PAYABLE("salaryPayable", "应发工资"), + ACTUAL_SALARY("actualSalary", "实发工资"), PERSONAL_INCOME_TAX("personalIncomeTax", "个人所得税"), PERSONAL_WITHHOLDING_SOCIAL_SECURITY("personalWithholdingOfSocialSecurity", "个人代扣社保"), PERSONAL_WITHHOLDING_PROVIDENT_FUND("personalWithholdingOfProvidentFund", "个人代扣公积金"), diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java index bd1f78b..1b40b20 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java @@ -173,7 +173,8 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl summary.getBusinessExpenditureCosts(); - case SALARY_PAYABLE -> summary.getTotalAmount(); + case SALARY_PAYABLE -> summary.getTotalAmount().add(summary.getTotalSocialInsurance()).add(summary.getProvidentFund()).add(summary.getPersonalTax()); + case ACTUAL_SALARY -> summary.getTotalAmount(); case PERSONAL_INCOME_TAX -> summary.getPersonalTax(); case PERSONAL_WITHHOLDING_SOCIAL_SECURITY -> summary.getTotalSocialInsurance(); case PERSONAL_WITHHOLDING_PROVIDENT_FUND -> summary.getProvidentFund(); From 3408d73f5505c19d4ad4fec41da1bf4eb014aed5 Mon Sep 17 00:00:00 2001 From: orangebabu <2409692770@qq.com> Date: Wed, 11 Jun 2025 17:21:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BookServiceImpl.java | 91 ++++++++++++++++++- .../EmployeeSalarySummaryServiceImpl.java | 4 + 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java index 6d8c34c..cbc07c0 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookServiceImpl.java @@ -1,12 +1,12 @@ /* * Copyright [2025] [JinBooks of copyright http://www.jinbooks.com] - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,13 +14,15 @@ * limitations under the License. * */ - + package com.jinbooks.persistence.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jinbooks.entity.Message; @@ -29,6 +31,9 @@ import com.jinbooks.entity.book.dto.BookChangeDto; import com.jinbooks.entity.book.dto.BookPageDto; import com.jinbooks.entity.book.vo.BookVo; import com.jinbooks.entity.dto.ListIdsDto; +import com.jinbooks.entity.hr.EmployeeSalarySummary; +import com.jinbooks.entity.hr.EmployeeSalaryVoucherRule; +import com.jinbooks.entity.hr.EmployeeSalaryVoucherRuleTemplate; import com.jinbooks.enums.BookBusinessExceptionEnum; import com.jinbooks.exception.BusinessException; import com.jinbooks.persistence.mapper.BookMapper; @@ -40,6 +45,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * @description: @@ -79,6 +85,12 @@ public class BookServiceImpl extends ServiceImpl implements Bo @Autowired StandardSubjectCashFlowService standardSubjectCashFlowService; + @Autowired + EmployeeSalaryVoucherRuleTemplateService employeeSalaryVoucherRuleTemplateService; + + @Autowired + EmployeeSalaryVoucherRuleService employeeSalaryVoucherRuleService; + @Override public Message> pageList(BookPageDto dto) { Page page = bookMapper.pageList(dto.build(), dto); @@ -113,6 +125,9 @@ public class BookServiceImpl extends ServiceImpl implements Bo //新增默认科目和现金流量的关系 standardSubjectCashFlowService.saveTemplateRelationships(dto.getId()); + //新增默认工资凭证规则模板 + setSalaryVoucherRule(dto.getId()); + //新增账套 Book newBook = new Book(); BeanUtil.copyProperties(dto, newBook); @@ -204,4 +219,72 @@ public class BookServiceImpl extends ServiceImpl implements Bo return bookMapper.listBooks(userId); } + private void setSalaryVoucherRule(String bookId) { + // 1. 查询内置的模板数据（bookId为null的数据） + List builtInTemplates = employeeSalaryVoucherRuleTemplateService.list( + Wrappers.lambdaQuery() + .isNull(EmployeeSalaryVoucherRuleTemplate::getBookId) + ); + + if (ObjectUtils.isEmpty(builtInTemplates)) { + return; // 如果没有内置模板数据，直接返回 + } + + // 2. 获取内置模板的ID列表 + List builtInTemplateIds = builtInTemplates.stream() + .map(EmployeeSalaryVoucherRuleTemplate::getId) + .toList(); + + // 3. 查询对应的内置规则数据 + List builtInRules = employeeSalaryVoucherRuleService.list( + Wrappers.lambdaQuery() + .in(EmployeeSalaryVoucherRule::getTemplateId, builtInTemplateIds) + ); + + // 4. 复制模板数据并设置新的bookId，同时建立映射关系 + CopyOptions copyOptions = new CopyOptions(); + copyOptions.setIgnoreProperties("id", "createdBy", "createdDate", "modifiedBy", "modifiedDate"); + + Map templateIdMapping = new HashMap<>(); + + // 逐个处理模板数据，确保映射关系正确 + for (EmployeeSalaryVoucherRuleTemplate builtInTemplate : builtInTemplates) { + String oldTemplateId = builtInTemplate.getId(); + + // 复制模板数据 + EmployeeSalaryVoucherRuleTemplate newTemplate = BeanUtil.copyProperties( + builtInTemplate, + EmployeeSalaryVoucherRuleTemplate.class, + "id", "createdBy", "createdDate", "modifiedBy", "modifiedDate", "deleted" + ); + newTemplate.setBookId(bookId); + + // 保存单个模板以获取新生成的ID + employeeSalaryVoucherRuleTemplateService.save(newTemplate); + + // 建立新旧ID映射关系 + String newTemplateId = newTemplate.getId(); + templateIdMapping.put(oldTemplateId, newTemplateId); + } + + // 5. 复制规则数据并设置新的templateId + if (ObjectUtils.isNotEmpty(builtInRules)) { + List newRules = BeanUtil.copyToList( + builtInRules, + EmployeeSalaryVoucherRule.class, + copyOptions + ); + + // 更新规则数据的templateId为新模板的ID + newRules.forEach(rule -> { + String oldTemplateId = rule.getTemplateId(); + String newTemplateId = templateIdMapping.get(oldTemplateId); + rule.setTemplateId(newTemplateId); + }); + + // 6. 批量保存新的规则数据 + employeeSalaryVoucherRuleService.saveBatch(newRules); + } + } + } diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java index 1b40b20..9e695ca 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java @@ -268,6 +268,10 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl