Merge branch 'CH-0414-年龄段修改' of sckj/mz-cloud into master

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqLrServiceImpl.java

@@ -129,9 +129,12 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
         }
         // apply添加新的筛选条件
         if(StringUtils.isNotBlank(gljtSqLr.getNld())){
-            if("1".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) BETWEEN 80 AND 89");
-            if("2".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) BETWEEN 90 AND 99");
-            if("3".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) >=100");
+//            if("1".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) BETWEEN 80 AND 89");
+//            if("2".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) BETWEEN 90 AND 99");
+//            if("3".equals(gljtSqLr.getNld())) queryWrapper.apply("(get_month_diff(csrq, DATE_FORMAT(now(), '%Y%m%d')) / 12) >=100");
+            if("1".equals(gljtSqLr.getNld())) queryWrapper.in(GljtSqLr::getPc, Arrays.asList("0", "3"));
+            if("2".equals(gljtSqLr.getNld())) queryWrapper.in(GljtSqLr::getPc, Arrays.asList("1", "4"));
+            if("3".equals(gljtSqLr.getNld())) queryWrapper.in(GljtSqLr::getPc, Arrays.asList("2", "5"));
         }
         if(StringUtils.isNotBlank(gljtSqLr.getBtbzId())){
             queryWrapper.apply("pc = " + gljtSqLr.getBtbzId());