feat: 添加政策字段回显

2023-09-22 18:02:52 +08:00
parent 274219bdeb
commit ccc88c036e
5 changed files with 38 additions and 24 deletions
@@ -74,13 +74,13 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
    public ResponseMessage<PageInfo<SarLawsStandInfo>> page(SarLawsStandInfoPage page) throws Exception {
        if (null != page.getNowOrderBy()) {
            switch (page.getNowOrderBy()) {
-                case 1:
+                case "issueTime":
                    page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                    break;
-                case 2:
-                    page.setOrderByA("XCXSSRQLAWS");
+                case "SSRQ":
+                    page.setOrderByA("SSRQLAWS");
                    break;
-                case 3:
+                case "standStatusShow":
                    page.setOrderByA("standStatusShow");//文本状态
                    break;
                default:
@@ -89,10 +89,10 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
            }
            if (null != page.getNowOrder()) {
                switch (page.getNowOrder()) {
-                    case 1:
+                    case "desc":
                        page.setOrder1("desc");
                        break;
-                    case 2:
+                    case "asc":
                        page.setOrder1("asc");
                        break;
                    default:
@@ -103,7 +103,7 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
        }


-        if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
            String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_LAWS_ATTR_INFO");
            if (StringUtils.isNotBlank(advanceStr)) {
@@ -142,13 +142,13 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>

    private void nowOrderFunc(SarLawsStandInfoPage page) {
        switch (page.getNowOrderBy()) {
-            case 1:
+            case "issueTime":
                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                break;
-            case 2:
-                page.setOrderByA("XCXSSRQLAWS");//实施日期
+            case "SSRQ":
+                page.setOrderByA("SSRQLAWS");//实施日期
                break;
-            case 3:
+            case "standStatusShow":
                page.setOrderByA("standStatusShow");//文本状态
                break;
            default:
@@ -157,10 +157,10 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
        }
        if (null != page.getNowOrder()) {
            switch (page.getNowOrder()) {
-                case 1:
+                case "desc":
                    page.setOrder1("desc");
                    break;
-                case 2:
+                case "asc":
                    page.setOrder1("asc");
                    break;
                default:
@@ -302,4 +302,8 @@ public class SarLawsStandInfo extends BaseEntity {
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private String XCXSSRQLAWS; // 新车实施日期

+    // 实施日期
+    @TableField(exist = false)
+    private String SSRQLAWS;
+
 }
@@ -263,10 +263,12 @@ public class SarLawsStandInfoPage extends BasePage {
    private String ids;
    @TableField(exist = false)
    private String proType;
+    // 排序方式
    @TableField(exist = false)
-    private Integer nowOrder;
+    private String nowOrder;
+    //排序字段
    @TableField(exist = false)
-    private Integer nowOrderBy;
+    private String nowOrderBy;
    @TableField(exist = false)
    private String orderByA = "";
    @TableField(exist = false)
@@ -524,13 +524,13 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao

    private void nowOrderFunc(SarLawsStandInfoPage page) {
        switch (page.getNowOrderBy()) {
-            case 1:
+            case "issue":
                page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                break;
-            case 2:
-                page.setOrderByA("XCXSSRQLAWS");//实施日期
+            case "SSRQ":
+                page.setOrderByA("SSRQLAWS");//实施日期
                break;
-            case 3:
+            case "standStatusShow":
                page.setOrderByA("standStatusShow");//文本状态
                break;
            default:
@@ -539,10 +539,10 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
        }
        if (null != page.getNowOrder()) {
            switch (page.getNowOrder()) {
-                case 1:
+                case "desc":
                    page.setOrder1("desc");
                    break;
-                case 2:
+                case "asc":
                    page.setOrder1("asc");
                    break;
                default:
@@ -386,6 +386,7 @@
        SAR_LAWS_STAND_INFO.COUNTRY,
        SAR_LAWS_STAND_INFO.MODIFY_TIME,
        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+        SAR_LAWS_ATTR_INFO.SSRQLAWS,
        (
        CASE
        WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
@@ -395,9 +396,16 @@
        from SAR_LAWS_STAND_INFO
        <include refid="SarStandardsInfo_in_left"/>
        order by
-        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
-            ${orderByA} ${order1},
-        </if>
+         <choose>
+             <when test="orderByA == SSRQLAWS">
+                 ${orderByA} SUBSTRING_INDEX(SSRQLAWS,',',1),
+             </when>
+         <otherwise>
+             <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+                 ${orderByA} ${order1},
+             </if>
+         </otherwise>
+         </choose>
        SAR_LAWS_STAND_INFO.id
        limit ${pager.startIndex-1},${pageSize}
    </select>