lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善工资项目

Browse Source
This commit is contained in:
lihongjie0209
2024-03-20 17:02:08 +08:00
parent d991a893b7
commit 13ac8d0b33
7 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/lihongjie/coal/empSalaryItem/controller/EmpSalaryItemController.java
View File

@@ -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;
}

2
src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java
View File

@@ -13,8 +13,6 @@ public class CreateEmpSalaryItemDto extends OrgCommonDto {
@Comment("上级名称")
private String parentName;
@Formula("(CONCAT(parentName,'-' ,name))")
private String fullName;
@Comment("工资项目类型")
private String itemType;

5
src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java
View File

@@ -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(

3
src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java
View File

@@ -14,8 +14,7 @@ public class UpdateEmpSalaryItemDto extends OrgCommonDto {
@Comment("上级名称")
private String parentName;
@Formula("(CONCAT(parentName,'-' ,name))")
private String fullName;
@Comment("工资项目类型")
private String itemType;

4
src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java
View File

@@ -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;

3
src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java
View File

@@ -217,6 +217,9 @@ public class EmpSalaryItemConfigService
}
private void initSalaItem(String organizationId) {
long delete = repository.deleteByOrganizationIdAndItemType(organizationId, "1");
List<EmpSalaryItemEntity> items = empSalaryItemService.findAll(

49
src/main/resources/config/dictionary.json
View File

@@ -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": "其他"
}
]
}
]