From 13ac8d0b33240148c26e754e30712a5014484ef9 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Wed, 20 Mar 2024 17:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E8=B5=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmpSalaryItemController.java | 4 ++ .../dto/CreateEmpSalaryItemDto.java | 2 - .../empSalaryItem/dto/EmpSalaryItemDto.java | 5 +- .../dto/UpdateEmpSalaryItemDto.java | 3 +- .../entity/EmpSalaryItemEntity.java | 4 +- .../service/EmpSalaryItemConfigService.java | 3 ++ src/main/resources/config/dictionary.json | 49 ++++++++++--------- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/controller/EmpSalaryItemController.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/controller/EmpSalaryItemController.java index 7b3006d0..016544bd 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/controller/EmpSalaryItemController.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/controller/EmpSalaryItemController.java @@ -9,6 +9,7 @@ import cn.lihongjie.coal.empSalaryItem.dto.CreateEmpSalaryItemDto; import cn.lihongjie.coal.empSalaryItem.dto.EmpSalaryItemDto; import cn.lihongjie.coal.empSalaryItem.dto.UpdateEmpSalaryItemDto; import cn.lihongjie.coal.empSalaryItem.service.EmpSalaryItemService; +import cn.lihongjie.coal.empSalaryItemConfig.service.EmpSalaryItemConfigService; import lombok.extern.slf4j.Slf4j; @@ -43,9 +44,12 @@ public class EmpSalaryItemController { return true; } + @Autowired EmpSalaryItemConfigService empSalaryItemConfigService; + @PostMapping("/init") public Object init() { this.service.initOrg(Ctx.currentUser().getOrganizationId()); + this.empSalaryItemConfigService.initOrg(Ctx.currentUser().getOrganizationId()); return true; } diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java index be5a3fe1..7547bd3a 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java @@ -13,8 +13,6 @@ public class CreateEmpSalaryItemDto extends OrgCommonDto { @Comment("上级名称") private String parentName; - @Formula("(CONCAT(parentName,'-' ,name))") - private String fullName; @Comment("工资项目类型") private String itemType; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java index 755b02aa..cf06756e 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java @@ -15,8 +15,7 @@ public class EmpSalaryItemDto extends OrgCommonDto { @Comment("上级名称") private String parentName; - @Formula("(CONCAT(parentName,'-' ,name))") - private String fullName; + @Comment("工资项目类型") private String itemType; @@ -31,7 +30,7 @@ public class EmpSalaryItemDto extends OrgCommonDto { // @Comment("工资项目类型-名称") private String itemTypeName; - @Comment("工资项目录入方式") + @Comment("工资项目录入方式") private String inputType; @Formula( diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java index ba9a828d..93887b4e 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java @@ -14,8 +14,7 @@ public class UpdateEmpSalaryItemDto extends OrgCommonDto { @Comment("上级名称") private String parentName; - @Formula("(CONCAT(parentName,'-' ,name))") - private String fullName; + @Comment("工资项目类型") private String itemType; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java index d348c2c0..8a55b706 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java @@ -19,8 +19,8 @@ public class EmpSalaryItemEntity extends OrgCommonEntity { @Comment("上级名称") private String parentName; - @Formula("(CONCAT(parentName,'-' ,name))") - private String fullName; +// @Formula("(CONCAT(parentName,'-' ,name))") +// private String fullName; @Comment("工资项目类型") private String itemType; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java index df28d149..b145ee93 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java @@ -217,6 +217,9 @@ public class EmpSalaryItemConfigService } private void initSalaItem(String organizationId) { + + + long delete = repository.deleteByOrganizationIdAndItemType(organizationId, "1"); List items = empSalaryItemService.findAll( diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json index 4b39125a..58a0ffda 100644 --- a/src/main/resources/config/dictionary.json +++ b/src/main/resources/config/dictionary.json @@ -1929,7 +1929,6 @@ } ] }, - { "code": "archiveStatus", "name": "归档状态", @@ -1942,10 +1941,8 @@ "code": "1", "name": "已归档" } - ] }, - { "code": "warehouse.receiptType", "name": "仓库单据类型", @@ -1962,7 +1959,6 @@ "code": "2", "name": "盘库单" } - ] }, { @@ -1981,10 +1977,8 @@ "code": "2", "name": "离职" } - ] }, - { "code": "emp.salary.item.config.type", "name": "工资公式项目配置信息", @@ -2001,7 +1995,6 @@ "code": "2", "name": "工资标准" }, - { "code": "3", "name": "其他辅助字段" @@ -2010,10 +2003,8 @@ "code": "4", "name": "函数" } - ] }, - { "code": "excel.template.type", "name": "excel模板类型", @@ -2034,10 +2025,8 @@ "code": "3", "name": "javascript" } - ] }, - { "code": "excel.generator.datasource.type", "name": "excel生成器数据源类型", @@ -2058,11 +2047,8 @@ "code": "3", "name": "script" } - ] }, - - { "code": "device.workOrder.status", "name": "设备工单状态", @@ -2083,10 +2069,8 @@ "code": "3", "name": "已取消" } - ] }, - { "code": "device.workOrder.type", "name": "设备工单类型", @@ -2115,7 +2099,6 @@ "code": "5", "name": "改造" } - ] }, { @@ -2134,10 +2117,8 @@ "code": "2", "name": "日常" } - ] }, - { "code": "coalBlend.coalType", "name": "配煤-煤类型", @@ -2154,7 +2135,6 @@ "code": "3", "name": "人工" } - ] }, { @@ -2169,7 +2149,6 @@ "code": "1", "name": "产品" } - ] }, { @@ -2196,7 +2175,6 @@ "code": "4", "name": "其他" } - ] }, { @@ -2550,5 +2528,32 @@ "name": "公式计算" } ] + }, + { + "code": "thirdAccount.type", + "name": "第三方账号类型", + "item": [ + + { + "code": "1", + "name": "阿里云" + }, + { + "code": "2", + "name": "腾讯云" + }, + { + "code": "3", + "name": "华为云" + }, + { + "code": "4", + "name": "扬尘监控平台" + }, + { + "code": "5", + "name": "其他" + } + ] } ] \ No newline at end of file