diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java index f9c42c179..2594bde0f 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java @@ -88,7 +88,7 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand table = new SalaryWeaTable(user, AddUpSituationRecordDTO.class); diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java index 810201b81..845a5bdff 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java @@ -62,7 +62,7 @@ public class AddUpSituationListCmd extends AbstractCommonCommand table = new SalaryWeaTable(user, AddUpSituationDTO.class); diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index eff67c450..2bc6043fe 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -17,7 +17,7 @@ from hrmresource e where e.status not in (7) - AND t.id IN + AND e.id IN #{id} diff --git a/src/com/engine/salary/web/AddUpSituationController.java b/src/com/engine/salary/web/AddUpSituationController.java index 0993826d7..efffb1483 100644 --- a/src/com/engine/salary/web/AddUpSituationController.java +++ b/src/com/engine/salary/web/AddUpSituationController.java @@ -66,6 +66,16 @@ public class AddUpSituationController { return ResponseResult.run(getService(user)::list, map); } + @POST + @Path("/getDetailList") + @Produces(MediaType.APPLICATION_JSON) + public String getDetailList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AddUpSituationQueryParam queryParam) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + map.put("queryParam", queryParam); + return ResponseResult.run(getService(user)::getDetailList, map); + } + @GET @Path("/downloadTemplate") @@ -250,4 +260,6 @@ public class AddUpSituationController { return ResponseResult.run(getService(user)::importAddUpSituation, map); } + + }