qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

累计bug

This commit is contained in:
钱涛 2022-03-11 15:47:08 +08:00
parent 822f9d4289
commit 692a57ae63
9 changed files with 286 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/annotation/SalaryTable.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.annotation;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import com.cloudstore.eccom.pc.table.WeaTableType;
import java.lang.annotation.*;
@ -64,6 +64,6 @@ public @interface SalaryTable {
/**
* 列表选择框
*/
WeaTableTypeEnum tableType() default WeaTableTypeEnum.NONE;
WeaTableType tableType() default WeaTableType.NONE;
}

12
src/com/engine/salary/component/SalaryWeaTable.java
View File

@ -5,7 +5,6 @@ import com.cloudstore.eccom.pc.table.*;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import org.apache.commons.lang3.StringUtils;
import weaver.general.PageIdConst;
import weaver.hrm.User;
@ -69,12 +68,13 @@ public class SalaryWeaTable<T> extends WeaTable {
super.setOperates(weaTableOperates);
}
WeaTableTypeEnum weaTableTypeEnum = table.tableType();
WeaTableType weaTableTypeEnum = table.tableType();
//设置check是否可用
if (weaTableTypeEnum == WeaTableTypeEnum.CHECKBOX) {
WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom();
checkboxpopedom.setShowmethod("true");
super.setCheckboxpopedom(checkboxpopedom);
if (weaTableTypeEnum == WeaTableType.CHECKBOX) {
super.setTableType(weaTableTypeEnum);
// WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom();
// checkboxpopedom.setShowmethod("true");
// super.setCheckboxpopedom(checkboxpopedom);
}
}

4
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
View File

@ -1,11 +1,11 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.util.excel.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -26,7 +26,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@SalaryTable(pageId = "a4f85287-e3f9-4275-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX, operates = {
@SalaryTable(pageId = "a4f85287-e3f9-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = {
@SalaryTableOperate(text = "查看明细")
})
public class AddUpDeductionDTO {

4
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
View File

@ -1,10 +1,10 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.util.excel.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -19,7 +19,7 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
//数据采集-累计专项附加扣除记录
@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX)
@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX)
public class AddUpDeductionRecordDTO {
//主键id

4
src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
View File

@ -1,12 +1,12 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.util.excel.ExcelProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -21,7 +21,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX, operates = {
@SalaryTable(pageId = "a4f85287-e3f9-7841-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = {
@SalaryTableOperate(text = "查看明细")
})
public class AddUpSituationDTO {

4
src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
View File

@ -1,10 +1,10 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.util.excel.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -25,7 +25,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@SalaryTable(pageId = "a5f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableTypeEnum.CHECKBOX)
@SalaryTable(pageId = "a5f85287-3354-4275-adn9-7d06e54y6rj8",tableType = WeaTableType.CHECKBOX)
public class AddUpSituationRecordDTO {
@SalaryTableColumn(column = "id", display = false)

4
src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
View File

@ -1,10 +1,10 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.util.excel.ExcelProperty;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -24,7 +24,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX, operates = {
@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = {
@SalaryTableOperate(text = "查看明细")
})
public class OtherDeductionListDTO {

4
src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
View File

@ -1,8 +1,8 @@
package com.engine.salary.entity.datacollection.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.weaverboot.tools.enumTools.weaComponent.WeaTableTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -22,7 +22,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d98e54y6rj8", tableType = WeaTableTypeEnum.CHECKBOX)
@SalaryTable(pageId = "a4f85287-e3f9-6612-adn9-7d98e54y6rj8", tableType = WeaTableType.CHECKBOX)
public class OtherDeductionRecordDTO {
//主键id

266
src/com/engine/salary/web/AttendQuoteController.java
View File

@ -38,4 +38,270 @@ public class AttendQuoteController {
return ResponseResult.run(getService(user)::list, map);
}
// /**
// * 获取引用考勤表单
// * @return
// */
// @GetMapping("/getSyncForm")
// @ApiOperation("获取引用考勤表单")
// @WeaPermission
// public WeaResult<WeaForm> getSyncForm() {
// return WeaResult.success(service.getSyncForm(UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 获取薪资周期和考勤周期
// * @param salaryYearMonth 薪资所属月
// * @param salarySobId 薪资账套id
// * @return
// */
// @PostMapping("/getSalaryCycleAndAttendCycle")
// @ApiOperation("获取薪资周期和考勤周期")
// @WeaPermission
// public WeaResult<Map<String, Object>> getSalaryCycleAndAttendCycle(@RequestParam(value = "salaryYearMonth") YearMonth salaryYearMonth, @RequestParam(value = "salarySobId") Long salarySobId) {
// return WeaResult.success(service.getSalaryCycleAndAttendCycle(salaryYearMonth, salarySobId, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 同步引用考勤数据
// * @return
// */
// @PostMapping("/syncAttendQuoteData")
// @ApiOperation("同步引用考勤数据")
// @WeaPermission
// public WeaResult<String> syncAttendQuoteData(@RequestBody AttendQuoteDataSyncParam syncParam) {
// return attendQuoteDataService.syncAttendQuoteData(syncParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 获取薪资账套下拉列表
// * @return
// */
// @GetMapping("/selectSalarySobList")
// @ApiOperation("获取薪资账套下拉列表")
// @WeaPermission
// public WeaResult<List<Map<String, Object>>> selectSalarySobList() {
// return WeaResult.success(service.selectSalarySobList(UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 下载导入模板
// * @return
// */
// @PostMapping("/downloadTemplate")
// @ApiOperation("下载导入模板")
// @WeaPermission
// public WeaResult<Map<String, Object>> downloadTemplate(@RequestBody AttendQuoteDataExportTemplateParam exportParam) {
// String currentTenantKey = TenantContext.getCurrentTenantKey();
// Long currentEmployeeId = UserContext.getCurrentEmployeeId();
// if (exportParam.getSalaryYearMonth()==null || exportParam.getSalarySobId()==null) {
// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 100250, "薪资所属月和薪资账套id不能为空"));
// }
// return WeaResult.success(attendQuoteDataService.downloadTemplate(exportParam, currentEmployeeId, currentTenantKey));
// }
//
// /**
// * 获取导入参数
// * @return
// */
// @GetMapping("/getImportParams")
// @ApiOperation("获取导入参数")
// @WeaPermission
// public WeaResult<ExcelImportParam> getImportParams() {
// return WeaResult.success(salaryBatchService.buildImportParam("importAttendQuoteData",
// "importAttendQuoteData",
// SalaryI18nUtil.getI18nLabel(TenantContext.getCurrentTenantKey(), UserContext.getCurrentEmployeeId(), 85367, "考勤引用"),
// null,
// null));
// }
//
// /**
// * 查看考勤数据
// * @param queryParam
// * @return
// */
// @PostMapping("/view")
// @ApiOperation("查看")
// @WeaPermission
// public WeaResult<WeaTable<LinkedHashMap>> view(@RequestBody AttendQuoteDataQueryParam queryParam) {
// String currentTenantKey = TenantContext.getCurrentTenantKey();
// Long currentEmployeeId = UserContext.getCurrentEmployeeId();
// if (queryParam.getAttendQuoteId() == null) {
// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(TenantContext.getCurrentTenantKey(), UserContext.getCurrentEmployeeId(), 100253, "考勤引用id不能为空"));
// }
// return WeaResult.success(attendQuoteDataService.view(queryParam, currentEmployeeId, currentTenantKey));
// }
//
// /**
// * 删除考勤数据
// * @param ids
// * @return
// */
// @PostMapping("/delete")
// @ApiOperation("删除")
// @WeaPermission
// public WeaResult<String> delete(@RequestBody Collection<Long> ids) {
// String currentTenantKey = TenantContext.getCurrentTenantKey();
// Long currentEmployeeId = UserContext.getCurrentEmployeeId();
// if (CollectionUtils.isEmpty(ids)) {
// return WeaResult.fail(SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 84026, "参数错误"));
// }
// return service.delete(ids, currentEmployeeId, currentTenantKey);
// }
//
// /**
// * 导出考勤数据
// * @param queryParam
// * @return
// */
// @PostMapping("/export")
// @ApiOperation("导出考勤数据")
// @WeaPermission
// public WeaResult<Map<String, Object>> export(@RequestBody AttendQuoteDataQueryParam queryParam) {
// String currentTenantKey = TenantContext.getCurrentTenantKey();
// Long currentEmployeeId = UserContext.getCurrentEmployeeId();
// if (queryParam.getAttendQuoteId() == null) {
// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(TenantContext.getCurrentTenantKey(), UserContext.getCurrentEmployeeId(), 100253, "考勤引用id不能为空"));
// }
// return WeaResult.success(attendQuoteDataService.export(queryParam, currentEmployeeId, currentTenantKey));
// }
//
// /**
// * 考勤字段管理列表
// * @param queryParam
// * @return
// */
// @PostMapping("/fieldList")
// @ApiOperation("考勤字段管理列表")
// @WeaPermission
// public WeaResult<EditableTable<Map<String, Object>>> fieldList(@RequestBody AttendQuoteFieldQueryParam queryParam) {
// return WeaResult.success(attendQuoteFieldService.list(queryParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 同步考勤模块字段
// * @return
// */
// @PostMapping("/syncAttendFields")
// @ApiOperation("同步考勤模块字段")
// @WeaPermission
// public WeaResult<String> syncAttendFields() {
// return attendQuoteFieldService.syncAttendFields(UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 获取考勤字段表单
// * @param id
// * @return
// */
// @GetMapping("/getFieldForm")
// @ApiOperation("获取考勤字段表单")
// @WeaPermission
// public WeaResult<WeaForm> getFieldForm(@RequestParam(value = "id", required = false) Long id) {
// return WeaResult.success(attendQuoteFieldService.getFrom(id, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 新建考勤字段
// * @param saveParam
// * @return
// */
// @PostMapping("/saveField")
// @ApiOperation("新建考勤字段")
// @WeaPermission
// public WeaResult<String> saveField(@RequestBody AttendQuoteFieldSaveParam saveParam) {
// return attendQuoteFieldService.save(saveParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 启用/停用自定义字段
// * @param id
// * @param enableStatus
// * @return
// */
// @PostMapping("/updateEnableStatus")
// @ApiOperation("启用/停用自定义字段")
// @WeaPermission
// public WeaResult<String> updateEnableStatus(@RequestParam(value = "id") Long id, @RequestParam(value = "enableStatus") Boolean enableStatus) {
// return attendQuoteFieldService.updateEnableStatus(id, enableStatus, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 修改考勤字段
// * @param saveParam
// * @return
// */
// @PostMapping("/updateField")
// @ApiOperation("修改考勤字段")
// @WeaPermission
// public WeaResult<String> updateField(@RequestBody AttendQuoteFieldSaveParam saveParam) {
// return attendQuoteFieldService.update(saveParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 删除考勤字段
// * @param ids
// * @return
// */
// @PostMapping("/deleteField")
// @ApiOperation("删除考勤字段")
// @WeaPermission
// public WeaResult<String> deleteField(@RequestBody Collection<Long> ids) {
// String currentTenantKey = TenantContext.getCurrentTenantKey();
// Long currentEmployeeId = UserContext.getCurrentEmployeeId();
// if (CollectionUtils.isEmpty(ids)) {
// return WeaResult.fail(SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 84026, "参数错误"));
// }
// return attendQuoteFieldService.delete(ids, currentEmployeeId, currentTenantKey);
// }
//
// /**
// * 数据采集-考勤引用字段设置列表
// * @param queryParam
// * @return
// */
// @PostMapping("/fieldSetting/list")
// @ApiOperation("数据采集-考勤引用字段设置-列表")
// @WeaPermission
// public WeaResult<List<AttendQuoteFieldSettingListDTO>> fieldSettingList(@RequestBody AttendQuoteFieldSettingQueryParam queryParam) {
// return WeaResult.success(attendQuoteFieldSettingService.list(queryParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 数据采集-考勤引用字段设置保存
// * @param saveParam
// * @return
// */
// @PostMapping("/fieldSetting/save")
// @ApiOperation("数据采集-考勤引用字段设置-保存")
// @WeaPermission
// public WeaResult<String> fieldSettingSave(@RequestBody AttendQuoteFieldSettingSaveParam saveParam) {
// return attendQuoteFieldSettingService.save(saveParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
//
// /**
// * 数据采集-考勤引用字段设置-恢复默认设置
// * @return
// */
// @PostMapping("/fieldSetting/recoverAsDefault")
// @ApiOperation("数据采集-考勤引用字段设置-恢复默认设置")
// @WeaPermission
// public WeaResult<List<AttendQuoteFieldSettingListDTO>> fieldSettingRecoverAsDefault(@RequestBody AttendQuoteFieldSettingRecoverParam recoverParam) {
// return WeaResult.success(attendQuoteFieldSettingService.recoverAsDefault(recoverParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()));
// }
//
// /**
// * 数据采集-考勤引用字段设置-设为默认设置
// * @param saveParam
// * @return
// */
// @PostMapping("/fieldSetting/saveAsDefault")
// @ApiOperation("数据采集-考勤引用字段设置-设为默认设置")
// @WeaPermission
// public WeaResult<String> fieldSettingSaveAsDefault(@RequestBody AttendQuoteFieldSettingSaveParam saveParam) {
// return attendQuoteFieldSettingService.saveAsDefault(saveParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey());
// }
}