浮动薪酬优化

src/com/engine/salary/service/VariableArchiveService.java

@@ -40,7 +40,7 @@ public interface VariableArchiveService {
      * @param variableArchives
      * @return
      */
-    List<Map<String, Object>> buildVariableArchiveData(Collection<VariableArchiveListDTO> variableArchives);
+    List<Map<String, Object>> buildVariableArchiveData(List<VariableArchiveListDTO> variableArchives);
 
     /**
      * 创建浮动薪酬档案

src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java

@@ -150,7 +150,7 @@ public class VariableArchiveServiceImpl extends Service implements VariableArchi
      * @return
      */
     @Override
-    public List<Map<String, Object>> buildVariableArchiveData(Collection<VariableArchiveListDTO> variableArchives) {
+    public List<Map<String, Object>> buildVariableArchiveData(List<VariableArchiveListDTO> variableArchives) {
         List<Long> variableArchiveIds = variableArchives.stream().map(VariableArchiveListDTO::getId).collect(Collectors.toList());
         // 获取浮动薪资档案所对应的浮动薪资项目数据
         List<VariableArchiveItemPO> variableArchiveItemList = getVariableArchiveItemService(user).listByVariableArchiveIds(variableArchiveIds);

src/com/engine/salary/web/VariableArchiveController.java

@@ -111,23 +111,12 @@ public class VariableArchiveController {
     @Produces(MediaType.APPLICATION_JSON)
     public String createData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody VariableArchiveSaveParam saveParam) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<VariableArchiveSaveParam, String>(user).run(getVariableArchiveWrapper(user)::createData, saveParam);
-    }
-
-    /**
-     * 编辑浮动薪酬档案
-     *
-     * @param request
-     * @param response
-     * @param updateParam
-     * @return
-     */
-    @POST
-    @Path("/updateData")
-    @Produces(MediaType.APPLICATION_JSON)
-    public String updateData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody VariableArchiveSaveParam updateParam) {
-        User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<VariableArchiveSaveParam, String>(user).run(getVariableArchiveWrapper(user)::updateData, updateParam);
+        if (saveParam.getId() == null) {
+            return new ResponseResult<VariableArchiveSaveParam, String>(user).run(getVariableArchiveWrapper(user)::createData, saveParam);
+        } else {
+            // 更新
+            return new ResponseResult<VariableArchiveSaveParam, String>(user).run(getVariableArchiveWrapper(user)::updateData, saveParam);
+        }
     }
 
 

src/com/engine/salary/wrapper/VariableArchiveWrapper.java

@@ -52,7 +52,7 @@ public class VariableArchiveWrapper extends Service {
 
         //薪资档案列表
         PageInfo<VariableArchiveListDTO> pageInfo = getVariableArchiveService(user).listPage(queryParam);
-        Collection<VariableArchiveListDTO> salaryArchives = pageInfo.getList();
+        List<VariableArchiveListDTO> salaryArchives = pageInfo.getList();
 
         // 获取所有浮动薪酬项目
         List<VariableItemPO> variableItems = getVariableItemService(user).listAll();