优化

CHANGELOG.md

@@ -1,3 +1,17 @@
 JinBooks v 1.0.1 GA 2025/05/31
     *(JINBOOKS-250501) 社区版正式发布。
 
+JinBooks v 1.1.0 GA 2025/06/20
+    *(JINBOOKS-250601) 凭证批量提交。
+    *(JINBOOKS-250602) 余额统一到科目余额表。
+    *(JINBOOKS-250603) 凭证模板统一管理。
+    *(JINBOOKS-250604) 月末处理优化，计提工资和发放工资等等，应发工资 = 工资+应加-应扣。
+    *(JINBOOKS-250605) 自动生成报表改false，每月末结转统一生成报表。
+    *(JINBOOKS-250606) 资产负载表功能优化，修复资产负载表总额异常。
+    *(JINBOOKS-250607) 修复凭证填写科目搜索问题。
+    *(JINBOOKS-250608) 设置默认账套。
+    *(JINBOOKS-250609) 凭证模板日期和类型管理。
+    *(JINBOOKS-250610) UI优化。
+    *(JINBOOKS-250611) 默认数据、后台代码优化。
+    *(JINBOOKS-250612) 仪表盘报表优化，消除错误。
+    *(JINBOOKS-250613) 权限控制的优化。

jinbooks-ui/src/views/settlement/carry-forward.vue

@@ -11,7 +11,6 @@
         <el-tab-pane label="期末处理" name="carry-forward">
           <el-form-item  label="类型：">
             <el-radio-group v-model="queryParams.category" @change="getList">
-              <el-radio-button :value="0">全部</el-radio-button>
               <el-radio-button :value="1">期末</el-radio-button>
               <el-radio-button :value="2">计提</el-radio-button>
               <el-radio-button :value="3">支付</el-radio-button>
@@ -259,7 +258,7 @@ const data = reactive({
   form: {...initFormData},
   queryParams: {
     bookId: currBookStore.bookId,
-    category:0
+    category:1
   },
   voucherForm: {},
   items: {

jinbooks-ui/src/views/voucher/voucher-template.vue

@@ -15,7 +15,6 @@
           </el-form-item>
           <el-form-item  label="类型：">
             <el-radio-group v-model="queryParams.category" @change="getList">
-              <el-radio-button :value="0">全部</el-radio-button>
               <el-radio-button :value="1">期末</el-radio-button>
               <el-radio-button :value="2">计提</el-radio-button>
               <el-radio-button :value="3">支付</el-radio-button>
@@ -217,7 +216,7 @@ const data = reactive({
   queryParams: {
     periodType: 'month',
     standardId:'',
-    category:0,
+    category:1,
     date: parseTime(new Date(), "{y}-{m}"),
     reportQuarter: getCurrentQuarter(),
     reportDate: parseTime(new Date(), "{y}-{m}"),

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookSubjectServiceImpl.java

@@ -665,7 +665,10 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
         List<BookSubject> listSubject = bookSubjectMapper.selectList(bookLqw);
         
         List<String>subjectCodes = new ArrayList<>();
-        subjectCodes.add(subjectCode);
+        for(BookSubject s : listSubject) {
+        	subjectCodes.add(s.getCode());
+        }
+        
         List<StatementSubjectBalance> listSubjectBalance=subjectBalanceService.selectSubjectBalance(bookId, subjectCodes);
         HashMap<String,StatementSubjectBalance> subjectBalanceMap = new HashMap<>();
         for(StatementSubjectBalance sb : listSubjectBalance) {

jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java

@@ -315,7 +315,7 @@ public class EmployeeSalaryServiceImpl extends ServiceImpl<EmployeeSalaryMapper,
         Book book = bookMapper.selectById(bookId);
         Integer voucherType = dto.getVoucherType();
         EmployeeSalary salary = super.getById(dto.getId());
-        String tplCode = (voucherType == 2 ? "jt_fp_lwf" : "zf_lwf");
+        String tplCode = (voucherType == 2 ? "fp_lwf" : "zf_lwf");
         if (voucherType == 2 && StringUtils.isNotBlank(salary.getAccrualVoucherId())) {
             return Message.ok("收票凭证已生成");
         } else if (voucherType == 3 && StringUtils.isNotBlank(salary.getSalaryVoucherId())) {
@@ -365,7 +365,7 @@ public class EmployeeSalaryServiceImpl extends ServiceImpl<EmployeeSalaryMapper,
             itemsMap.put(item.getSubjectCode(), item);
         }
         
-        if (voucherTemplate.getCode().equals("jt_fp_lwf")) {//收发票
+        if (voucherTemplate.getCode().equals("fp_lwf")) {//收发票
         	if(itemsMap.containsKey("660222")) {
 	       		 //劳务费
 	       		 debitAmount = debitAmount.add(salary.getPayAmount());