From 298d432152b6d7ff82d9b0fcc03f9f14811797aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 11 Mar 2022 17:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/dto/AttendQuoteFieldListDTO.java | 6 ++++++ .../engine/salary/web/AddUpSituationController.java | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteFieldListDTO.java b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteFieldListDTO.java index 7214fe82c..edfe202fb 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteFieldListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteFieldListDTO.java @@ -1,6 +1,9 @@ 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.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; @@ -20,6 +23,9 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@SalaryTable(pageId = "b4f85287-e3f9-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = { + @SalaryTableOperate(text = "查看明细") +}) public class AttendQuoteFieldListDTO { //主键id @JsonSerialize(using = ToStringSerializer.class) diff --git a/src/com/engine/salary/web/AddUpSituationController.java b/src/com/engine/salary/web/AddUpSituationController.java index efffb1483..3a3127c51 100644 --- a/src/com/engine/salary/web/AddUpSituationController.java +++ b/src/com/engine/salary/web/AddUpSituationController.java @@ -260,6 +260,16 @@ public class AddUpSituationController { return ResponseResult.run(getService(user)::importAddUpSituation, map); } + @POST + @Path("/preview") + @Produces(MediaType.APPLICATION_JSON) + public String preview(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AddUpSituationImportParam importParam) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + map.put("importParam", importParam); + return ResponseResult.run(getService(user)::preview, map); + } + }