查询条件

src/com/engine/salary/enums/UserStatusEnum.java

@@ -1,7 +1,7 @@
 package com.engine.salary.enums;
 
-import java.util.Arrays;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author weaver_cl
@@ -19,14 +19,14 @@ import java.util.Optional;
  **/
 public enum UserStatusEnum {
 
-    TRIAL(0,"试用"),
-    FORMAL(1,"正式"),
-    TEMPORARY(2,"临时"),
-    DELAY(3,"试用延期"),
-    FIRE(4,"解雇"),
-    DEPARTURE(5,"离职"),
-    RETIRED(6,"退休"),
-    INVALID(7,"无效");
+    TRIAL(0, "试用"),
+    FORMAL(1, "正式"),
+    TEMPORARY(2, "临时"),
+    DELAY(3, "试用延期"),
+    FIRE(4, "解雇"),
+    DEPARTURE(5, "离职"),
+    RETIRED(6, "退休"),
+    INVALID(7, "无效");
 
     private Integer value;
     private String description;
@@ -49,4 +49,13 @@ public enum UserStatusEnum {
         Optional<UserStatusEnum> optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
         return optional.isPresent() ? optional.get().description : "";
     }
+
+    public static List<Map<String, String>> getList() {
+        return Arrays.stream(UserStatusEnum.values()).map(v -> {
+            Map<String, String> m = new HashMap();
+            m.put("id", v.value.toString());
+            m.put("content", v.description);
+            return m;
+        }).collect(Collectors.toList());
+    }
 }

src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml

@@ -916,7 +916,7 @@
         FROM hrsa_salary_archive_item t
         WHERE delete_type = 0
         <if test="param.effectiveTime != null">
-            AND t.effective_time &gt;= #{param.effectiveTime}
+            AND t.effective_time &lt; #{param.effectiveTime}
         </if>
         <if test="param.salaryItemIds != null and param.salaryItemIds.size()>0">
             AND t.salary_item_id IN

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

@@ -248,10 +248,19 @@ public class SalaryArchiveController {
         return new ResponseResult<SalaryArchiveImportHandleParam, Map<String, Object>>().run(getSalaryArchiveWrapper(user)::importSalaryArchive, importParam);
     }
 
+    //人员状态列表
+    @GET
+    @Path("/searchCondition")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String searchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SingleTaxAgentAdjustRecordQueryParam, Map<String,Object>>().run(getSalaryArchiveWrapper(user)::searchCondition);
+    }
 
     // ******** 薪资档案主表 end ***********************************************************************************************/
 
     // ******** 薪资项目调整 start ***********************************************************************************************/
+
     /**
      * 获取薪资项目调整表单
      *
@@ -423,7 +432,6 @@ public class SalaryArchiveController {
 
     /**
      * 导出薪资项目调整记录列表
-     *
      */
     @GET
     @Path("/adjustRecord/exportSalaryItemList")
@@ -567,7 +575,7 @@ public class SalaryArchiveController {
 
         User user = HrmUserVarify.getUser(request, response);
 
-        TaxAgentAdjustRecordQueryParam param =new TaxAgentAdjustRecordQueryParam();
+        TaxAgentAdjustRecordQueryParam param = new TaxAgentAdjustRecordQueryParam();
 
         XSSFWorkbook workbook = getSalaryArchiveTaxAgentWrapper(user).exportAdjustRecordList(param);
 
@@ -589,5 +597,7 @@ public class SalaryArchiveController {
         return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build();
 
     }
+
+
     /******** 个税扣缴义务人调整记录 end ***********************************************************************************************/
 }

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

@@ -11,6 +11,7 @@ import com.engine.salary.entity.salaryarchive.param.TaxAgentAdjustRecordQueryPar
 import com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO;
 import com.engine.salary.entity.taxrate.TaxAgent;
 import com.engine.salary.enums.UserStatusEnum;
+import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.service.SalaryArchiveTaxAgentService;
@@ -20,6 +21,7 @@ import com.engine.salary.service.impl.TaxAgentServiceImpl;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import weaver.hrm.User;
@@ -241,4 +243,6 @@ public class SalaryArchiveTaxAgentWrapper extends Service {
     public XSSFWorkbook exportAdjustRecordList(TaxAgentAdjustRecordQueryParam queryParam) {
         return getSalaryArchiveTaxAgentService(user).exportAdjustRecordList(queryParam);
     }
+
+
 }

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

@@ -20,7 +20,10 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
 import com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.taxrate.TaxAgent;
+import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveImportTypeEnum;
+import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum;
+import com.engine.salary.enums.salaryarchive.SalaryArchiveTaxAgentAdjustReasonEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.service.SalaryArchiveItemService;
 import com.engine.salary.service.SalaryArchiveService;
@@ -32,6 +35,7 @@ import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.hrm.User;
@@ -267,5 +271,18 @@ public class SalaryArchiveWrapper extends Service {
         return getSalaryArchiveService(user).exportList(queryParam);
     }
 
+    public Map<String,Object> searchCondition() {
+        List<Map<String, String>> userStatus = UserStatusEnum.getList();
+        List<Map<String, String>> itemAdjustReasons = SalaryArchiveItemAdjustReasonEnum.getList();
+        List<Map<String, String>> TaxAgentAdjustReason = SalaryArchiveTaxAgentAdjustReasonEnum.getList();
+        Collection<TaxAgent> taxAgentList = getTaxAgentService(user).findAll();
+        HashMap map = Maps.newHashMap();
+        map.put("userStatus",userStatus);
+        map.put("itemAdjustReasons",itemAdjustReasons);
+        map.put("TaxAgentAdjustReason",TaxAgentAdjustReason);
+        map.put("taxAgentList",taxAgentList);
+        return map;
+    }
+
 
 }