add: 政策高级查询

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java

@@ -88,11 +88,11 @@ public class SarLawsAttrInfo extends BaseEntity {
     @TableField("TGDWLAWS")
     private String tgdwlaws;
 
-    @TableField("NYLXLAWS")
-    private String nylxlaws;
-
-    @TableField("YYRZLAWS")
-    private String yyrzlaws;
+//    @TableField("NYLXLAWS")
+//    private String nylxlaws;
+//
+//    @TableField("YYRZLAWS")
+//    private String yyrzlaws;
 
     @TableField("ZRBMLAWS")
     private String zrbmlaws;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java

@@ -77,9 +77,12 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
                 case "issueTime":
                     page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                     break;
-                case "SSRQ":
+                case "SSRQLAWS":
                     page.setOrderByA("SSRQLAWS");
                     break;
+                case "LAWSSYCX":
+                    page.setOrderByA("LAWS_SYCX");
+                    break;
                 case "standStatusShow":
                     page.setOrderByA("standStatusShow");//文本状态
                     break;
@@ -145,7 +148,7 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
             case "issueTime":
                 page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                 break;
-            case "SSRQ":
+            case "SSRQLAWS":
                 page.setOrderByA("SSRQLAWS");//实施日期
                 break;
             case "standStatusShow":

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java

@@ -34,6 +34,18 @@ public class SarLawsStandInfoPage extends BasePage {
     @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护")
     private String lawsType;
 
+    @ApiModelProperty(value = "一级政策分类")
+    private String lawsTypeFirstLevel;
+
+    @ApiModelProperty(value = "二级政策份分类")
+    private String lawsTypeSecondLevel;
+
+    @ApiModelProperty(value = "三级政策分类")
+    private String lawsTypeThirdLevel;
+
+    @ApiModelProperty(value = "四级政策分类")
+    private String lawsTypeFourthLevel;
+
     @ApiModelProperty(value = "政策编号")
     private String lawsNumber;
 
@@ -70,6 +82,8 @@ public class SarLawsStandInfoPage extends BasePage {
     @ApiModelProperty(value = "适用车型-配置管理中维护")
     private String lawsSycx;
 
+    private String[] lawsSycxArray;
+
     @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）")
     private String isRelateAccess;
 
@@ -231,8 +245,10 @@ public class SarLawsStandInfoPage extends BasePage {
     private String XCSJBUSS;
 
     private String SSRQLAWS;
+    private String XRZSSRQLAWS;
     private String XCXSSRQLAWS;
     private String ZCXSSRQLAWS;
+    private String SXRQLAWS;
     private String ZCWBLAWS;
     private String GCWBLAWS;
     private String JDWJLAWS;
@@ -240,6 +256,7 @@ public class SarLawsStandInfoPage extends BasePage {
     private String CYSDLAWS;
     private String TGRLAWS;
     private String TGDWLAWS;
+    private String SYRZLAWS;
     private String NYLXLAWS;
     private String YYRZLAWS;
     private String ZRBMLAWS;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -170,6 +170,10 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                 }
             }
         }
+        // 查询的使适用车型是多选
+        if (StringUtils.isNotBlank(page.getLawsSycx())) {
+            page.setLawsSycxArray(page.getLawsSycx().split(","));
+        }
         Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsInfoPage(page);