修复电站导出

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzdfkServiceImpl.java

@@ -25,17 +25,15 @@ public class RzdfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="审核通过";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "2");
+        String status = "审核通过";
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
-        return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "2");
+        return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzdshServiceImpl.java

@@ -26,16 +26,14 @@ public class RzdshServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="待融资审核";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "2");
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzwtgServiceImpl.java

@@ -26,16 +26,14 @@ public class RzwtgServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="审核不通过,重新验收";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "2");
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzyfkServiceImpl.java

@@ -26,16 +26,14 @@ public class RzyfkServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="已放款,放款完成";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "2");
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrdfkServiceImpl.java

@@ -23,14 +23,12 @@ public class TrdfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="审核通过";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "1");
+        String status = "审核通过";
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
-        return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "1");
+        return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrdtsServiceImpl.java

@@ -26,13 +26,11 @@ public class TrdtsServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="待推送";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "1");
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrwtgServiceImpl.java

@@ -24,13 +24,11 @@ public class TrwtgServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="审核不通过,重新验收";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "1");
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TryfkServiceImpl.java

@@ -24,13 +24,11 @@ public class TryfkServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="放款完成";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "1");
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrytsServiceImpl.java

@@ -24,13 +24,11 @@ public class TrytsServiceImpl implements IExportPageService {
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         String status="待融资审核";
-        if (null != status ){
-            params.put("status", Arrays.asList(status.split(",")));
-        }
-        params.put("type", "1");
         if(Objects.nonNull(filters)){
             params.putAll(filters);
         }
+        params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : filters.get("status"));
+        params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
     }
 }