From ccc88c036ed322c16559f6725cf0f5e1f64a98fe Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 22 Sep 2023 18:02:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsStandInfoController.java | 26 +++++++++---------- .../entity/SarLawsStandInfo.java | 4 +++ .../entity/SarLawsStandInfoPage.java | 6 +++-- .../impl/SarLawsStandInfoServiceImpl.java | 12 ++++----- .../SarLawsStandInfoMapper.xml | 14 +++++++--- 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index 9620fbbb..d61e8da5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -74,13 +74,13 @@ public class SarLawsStandInfoController extends BaseController public ResponseMessage> 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 } 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 } - if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List 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 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 } if (null != page.getNowOrder()) { switch (page.getNowOrder()) { - case 1: + case "desc": page.setOrder1("desc"); break; - case 2: + case "asc": page.setOrder1("asc"); break; default: diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java index e3676cf9..1f1aef14 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfo.java @@ -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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java index c995ecd7..dc5f3dcd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java @@ -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) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 550fd7ab..4f9bd2e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -524,13 +524,13 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl order by - - ${orderByA} ${order1}, - + + + ${orderByA} SUBSTRING_INDEX(SSRQLAWS,',',1), + + + + ${orderByA} ${order1}, + + + SAR_LAWS_STAND_INFO.id limit ${pager.startIndex-1},${pageSize}