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

日志

This commit is contained in:
钱涛 2023-12-26 17:49:50 +08:00
parent b7435554e8
commit 7d1ce983dd
6 changed files with 82 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/elog/annotation/ElogTransform.java
View File

@ -5,6 +5,7 @@ import java.lang.annotation.*;
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.TYPE})
@Inherited
public @interface ElogTransform {
String tablename() default "";

29
src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java Normal file
View File

@ -0,0 +1,29 @@
package com.engine.salary.elog.entity.param;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class GetDetailChangesParam {
/**
* 服务（模块）名
*/
String module;
/**
* 方法名
*/
String function;
/**
* 主键id
*/
String mainid;
/**
* 转换方法
*/
String detailTransMethod;
}

3
src/com/engine/salary/elog/service/ILoggerTableService.java
View File

@ -2,6 +2,7 @@ package com.engine.salary.elog.service;
import com.cloudstore.eccom.pc.table.WeaTable;
import com.engine.salary.elog.entity.param.ELogGetLogParam;
import com.engine.salary.elog.entity.param.GetDetailChangesParam;
import com.engine.salary.util.page.PageInfo;
import javax.servlet.http.HttpServletRequest;
@ -13,7 +14,7 @@ public interface ILoggerTableService {
WeaTable queryLogsPapi(String data, HttpServletRequest request);
List getDetailChanges(String module, String function, String mainid,String transMethod);
List getDetailChanges(GetDetailChangesParam param);
List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request);

7
src/com/engine/salary/elog/service/impl/LoggerTableService.java
View File

@ -14,6 +14,7 @@ import com.engine.salary.elog.entity.dto.FilterConditionDto;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.salary.elog.entity.dto.ShowColumsDto;
import com.engine.salary.elog.entity.param.ELogGetLogParam;
import com.engine.salary.elog.entity.param.GetDetailChangesParam;
import com.engine.salary.elog.enums.ElogConsts;
import com.engine.salary.elog.service.ILoggerTableService;
import com.engine.salary.elog.util.ElogServiceUtils;
@ -851,10 +852,8 @@ public class LoggerTableService extends Service implements ILoggerTableService {
}
@Override
public List<Map<String, Object>> getDetailChanges(String module, String function, String mainid, String detailTransMethod) {
List<Map<String, Object>> list = getDetailChangesMethod(module, function, mainid, detailTransMethod, null);
return list;
public List<Map<String, Object>> getDetailChanges(GetDetailChangesParam param) {
return getDetailChangesMethod(param.getModule(), param.getFunction(), param.getMainid(), param.getDetailTransMethod(), null);
}
/**

37
src/com/engine/salary/elog/web/LoggerTableController.java
View File

@ -2,11 +2,11 @@ package com.engine.salary.elog.web;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.elog.entity.param.ELogGetLogParam;
import com.engine.salary.elog.entity.param.GetDetailChangesParam;
import com.engine.salary.elog.service.ILoggerTableService;
import com.engine.salary.elog.service.impl.LoggerTableService;
import com.engine.salary.util.ResponseResult;
import com.engine.salary.util.page.PageInfo;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import weaver.hrm.HrmUserVarify;
import weaver.hrm.User;
@ -43,7 +43,14 @@ public class LoggerTableController {
return new ResponseResult<String, PageInfo>(user).run(getLoggerTableService(user)::queryLogs, data);
}
@ApiOperation("获取日志（卡片）")
/**
* 获取日志（卡片）
*
* @param request
* @param response
* @param data
* @return
*/
@POST
@Path("/getCardLogs")
@Produces(MediaType.APPLICATION_JSON)
@ -51,16 +58,21 @@ public class LoggerTableController {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, List<Map<String, Object>>>(user).run(getLoggerTableService(user)::queryCardLogList, data);
}
//
// @ApiOperation("获取单条操作记录的更新明细")
// @RequestMapping(path = "getDetailChanges", method = {RequestMethod.GET, RequestMethod.POST})
// @WeaPermission(publicPermission = true)
// public WeaResult<List<Map<String, Object>>> getDetailChanges(@PathVariable("module") @ApiParam("服务（模块）名") String module,
// @PathVariable("function") @ApiParam("方法名") String function,
// @RequestParam("mainid") @ApiParam("主键id") String mainid,
// @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod) {
// return WeaResult.success(getLoggerTableService(user).getDetailChanges(module, function, mainid, detailTransMethod));
// }
/**
* 获取单条操作记录的更新明细
* @param request
* @param response
* @param param
* @return
*/
@POST
@Path("/getDetailChanges")
@Produces(MediaType.APPLICATION_JSON)
public String getDetailChanges(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GetDetailChangesParam param) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<GetDetailChangesParam, List>(user).run(getLoggerTableService(user)::getDetailChanges, param);
}
// @ApiOperation("获取单条操作记录的更新明细")
// @POST
// @Path("/getDetailChanges")
@ -95,6 +107,7 @@ public class LoggerTableController {
/**
* 获取日志列表
*
* @param request
* @param response
* @param param

22
src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.salaryitem.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.SalarySystemTypeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;
@ -25,21 +26,25 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
//hrsa_salary_item
@ElogTransform(name = "薪资项目")
public class SalaryItemPO {
/**
* 主键id
*/
@ElogTransform(name = "主键id")
private Long id;
/**
* 名称
*/
@ElogTransform(name = "名称")
private String name;
/**
* 编号
*/
@ElogTransform(name = "编号")
private String code;
/**
@ -47,26 +52,31 @@ public class SalaryItemPO {
*
* @see SalarySystemTypeEnum
*/
@ElogTransform(name = "是否是系统项目")
private Integer systemType;
/**
* 系统薪资项目的id（是从哪个系统薪资项目复制过来的）
*/
@ElogTransform(name = "系统薪资项目的id")
private Long sysSalaryItemId;
/**
* 默认使用。0：默认不适用、1：默认使用
*/
@ElogTransform(name = "默认使用")
private Integer useDefault;
/**
* 薪资档案引用。0：薪资档案未引用、1：薪资档案引用
*/
@ElogTransform(name = "薪资档案引用")
private Integer useInEmployeeSalary;
/**
* 核算时隐藏
*/
@ElogTransform(name = "核算时隐藏")
private Integer hideDefault;
/**
@ -74,11 +84,13 @@ public class SalaryItemPO {
*
* @see SalaryRoundingModeEnum
*/
@ElogTransform(name = "进位规则")
private Integer roundingMode;
/**
* 保留的小数位数
*/
@ElogTransform(name = "保留的小数位数")
private Integer pattern;
/**
@ -86,6 +98,7 @@ public class SalaryItemPO {
*
* @see SalaryValueTypeEnum
*/
@ElogTransform(name = "取值方式")
private Integer valueType;
/**
@ -93,46 +106,55 @@ public class SalaryItemPO {
*
* @see SalaryDataTypeEnum
*/
@ElogTransform(name = "字段类型")
private String dataType;
/**
* 公式
*/
@ElogTransform(name = "公式")
private Long formulaId;
/**
* 备注
*/
@ElogTransform(name = "备注")
private String description;
/**
* 是否可以编辑。0：不可编辑、1：可编辑
*/
@ElogTransform(name = "是否可以编辑")
private Integer canEdit;
/**
* 租户key
*/
@ElogTransform(name = "租户key")
private String tenantKey;
/**
* 创建人id
*/
@ElogTransform(name = "创建人id")
private Long creator;
/**
* 是否删除
*/
@ElogTransform(name = "是否删除")
private Integer deleteType;
/**
* 创建时间
*/
@ElogTransform(name = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ElogTransform(name = "更新时间")
private Date updateTime;
//查询条件