From b11471bf785b857f49d6fe6eb8ecf3adf63f9a40 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 26 Feb 2024 19:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CoalAnalysisEntity.java | 2 +- .../entity/CoalAnalysisHisEntity.java | 2 +- .../CoalWashingDailyAnalysisEntity.java | 2 +- .../empSalary/entity/EmpSalaryEntity.java | 2 +- .../entity/EmpSalaryBatchEntity.java | 2 +- .../entity/EmployeeRecordEntity.java | 2 +- src/main/resources/config/dictionary.json | 20 +++++++++++++++++++ 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java index ddf1fcdc..44e8ec9d 100644 --- a/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java @@ -23,7 +23,7 @@ public class CoalAnalysisEntity extends OrgCommonEntity { @Comment("归档状态") @ColumnDefault("'0'") - private String archiveStatus; + private String archiveStatus = "0"; @Formula( "(select i.name\n" diff --git a/src/main/java/cn/lihongjie/coal/coalAnalysisHis/entity/CoalAnalysisHisEntity.java b/src/main/java/cn/lihongjie/coal/coalAnalysisHis/entity/CoalAnalysisHisEntity.java index 4dc72f96..8d06b71d 100644 --- a/src/main/java/cn/lihongjie/coal/coalAnalysisHis/entity/CoalAnalysisHisEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalAnalysisHis/entity/CoalAnalysisHisEntity.java @@ -23,7 +23,7 @@ public class CoalAnalysisHisEntity extends OrgCommonEntity { @Comment("归档状态") @ColumnDefault("'0'") - private String archiveStatus; + private String archiveStatus = "0"; @ManyToOne @Comment("关联化验数据") diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java index 7538fbff..8f6776ff 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity { @Comment("归档状态") - private String archiveStatus; + private String archiveStatus = "0"; @Formula( "(select i.name\n" diff --git a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java index e5767cfe..dc30611f 100644 --- a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java @@ -84,7 +84,7 @@ public class EmpSalaryEntity extends OrgCommonEntity { @Comment("归档状态") @ColumnDefault("'0'") - private String archiveStatus; + private String archiveStatus = "0"; @Formula( "(select i.name\n" diff --git a/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java b/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java index e5b70c46..8957999b 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java @@ -24,7 +24,7 @@ public class EmpSalaryBatchEntity extends OrgCommonEntity { @Comment("归档状态") @ColumnDefault("'0'") - private String archiveStatus; + private String archiveStatus = "0"; @Formula( "(select i.name\n" diff --git a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java index b4cc322d..07cd8725 100644 --- a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java +++ b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java @@ -48,7 +48,7 @@ public class EmployeeRecordEntity extends OrgCommonEntity { @Comment("归档状态") @ColumnDefault("'0'") - private String archiveStatus; + private String archiveStatus = "0"; @Formula( "(select i.name\n" diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json index db499ee7..e2f6b4d5 100644 --- a/src/main/resources/config/dictionary.json +++ b/src/main/resources/config/dictionary.json @@ -1984,6 +1984,26 @@ ] }, + + { + "code": "emp.salary.item.config.type", + "name": "工资公式项目配置信息", + "item": [ + { + "code": "0", + "name": "人员字段" + }, + { + "code": "1", + "name": "工资字段" + }, + { + "code": "2", + "name": "其他" + } + + ] + }, { "code": "emp.record.type", "name": "员工档案记录类型",