兼容年份1000的情况

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/BatchServiceImpl.java

@@ -28,12 +28,12 @@ public class BatchServiceImpl{
 
     public List<?> getNotSupplyList(String year) {
         List<Map<String, Object>> resList = new ArrayList<>();
+        String param = year;
         if(StringUtils.isBlank(year)||"0".equals(year)||"1000".equals(year)||"2016年前".equals(year)){
-            year ="";
+            param ="";
         }
-
-        List<Map<String,Object>> ydbpNotSupplyList =  ydbpMapper.queryRemainGeomListByYearOfYdbp(year);
-        List<Map<String,Object>> ydbpDataNotSupplyList =  ydbpDataMapper.queryDifferenceGeomAreaByYear(year);
+        List<Map<String,Object>> ydbpNotSupplyList =  ydbpMapper.queryRemainGeomListByYearOfYdbp(param);
+        List<Map<String,Object>> ydbpDataNotSupplyList =  ydbpDataMapper.queryDifferenceGeomAreaByYear(param);
 
         if(CollectionUtils.isNotEmpty(ydbpNotSupplyList)){
             resList.addAll(ydbpNotSupplyList);
@@ -44,14 +44,15 @@ public class BatchServiceImpl{
 
         //条件过滤兼容特使情况
         if("1000".equals(year)){
-            resList = resList.stream().filter(s->"其它".equals(s.get("year")+"")).collect(Collectors.toList());
+            resList = resList.stream().filter(
+                    s->"其它".equals(s.get("year")) || "其它".equals(s.get("nf")) || "1000".equals(s.get("nf"))).collect(Collectors.toList());
         }else if("2016年前".equals(year)) {
             resList = resList.stream().filter(s -> {
-                String yearString = s.get("year").toString();
-                String nf = s.get("nf").toString();
-                if (StringUtils.isNumeric(yearString) && Integer.parseInt(yearString) < 2016) {
+                String yearString = Objects.nonNull(s.get("year"))? s.get("year").toString(): "";
+                String nf = Objects.nonNull(s.get("nf"))? s.get("nf").toString(): "";
+                if (StringUtils.isNumeric(yearString) && Integer.parseInt(yearString) > 1000 && Integer.parseInt(yearString) < 2016) {
                     return true;
-                } else if (StringUtils.isNumeric(nf) && Integer.parseInt(nf) < 2016) {
+                } else if (StringUtils.isNumeric(nf) && Integer.parseInt(nf)>1000 && Integer.parseInt(nf) < 2016) {
                     return true;
                 }
                 return false;

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpMapper.xml

@@ -164,7 +164,7 @@
         SELECT
         gd.id as details_id,
         '' as project_id,
-        COALESCE(LEFT(bp.pf_date,  '其它')) AS year,
+        COALESCE(LEFT(bp.pf_date, '4'),'其它') AS year,
         bp.id  as  node_id,
         bp.id  as  id,
         '1' AS batch_type,