From a010a9821ce0800c95b590f19b461d98f41b9172 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 21 Sep 2018 13:18:58 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=9B=B8=E5=85=B3=E7=9A=84=E5=88=97=E8=A1=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMsgCallbackController.java | 1 + .../com/iformall/controller/WxMsgController.java | 1 + .../iformall/controller/WxMsgModelController.java | 1 + .../controller/WxMsgSignatureController.java | 1 + .../main/java/com/iformall/domain/po/WxMsg.java | 14 ++++++++------ .../java/com/iformall/domain/po/WxMsgCallback.java | 8 +++++--- .../java/com/iformall/domain/po/WxMsgModel.java | 6 ++++-- .../com/iformall/domain/po/WxMsgSignature.java | 4 +++- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java index 4fa146a35..c354c7591 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java @@ -31,6 +31,7 @@ public class WxMsgCallbackController extends BaseController { public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setTenantId(getTenantId()); + wxMsgCallback.setSortColumns(WxMsgCallback.Field.Createtime_DESC); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java index 5ba1dc62d..d971cb9a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java @@ -36,6 +36,7 @@ public class WxMsgController extends BaseController { public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { if (null == wxMsg) wxMsg = new WxMsg(); wxMsg.setTenantId(getTenantId()); + wxMsg.setSortColumns(WxMsg.Field.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java index 9401d9a91..8d083e3f1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java @@ -29,6 +29,7 @@ public class WxMsgModelController extends BaseController { public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); wxMsgModel.setTenantId(getTenantId()); + wxMsgModel.setSortColumns(WxMsgModel.Field.Createtime_DESC); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java index e5063a0c2..e2c45253b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java @@ -28,6 +28,7 @@ public class WxMsgSignatureController extends BaseController { public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); wxMsgSignature.setTenantId(getTenantId()); + wxMsgSignature.setSortColumns(WxMsgSignature.Field.Createtime_DESC); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java index d0eda8980..95b5adf29 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java @@ -204,15 +204,15 @@ public class WxMsg implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` DESC") ,Msg_ASC("`msg` ASC"),Msg_DESC("`msg` DESC") ,Sendtime_ASC("`sendtime` ASC"),Sendtime_DESC("`sendtime` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpectSendNumber_ASC("`expectSendNumber` ASC"),ExpectSendNumber_DESC("`expectSendNumber` DESC") - ,SuccessNumber_ASC("`successNumber` ASC"),SuccessNumber_DESC("`successNumber` DESC") - ,ErrorNumber_ASC("`errorNumber` ASC"),ErrorNumber_DESC("`errorNumber` DESC") - ,ReturnResult_ASC("`returnResult` ASC"),ReturnResult_DESC("`returnResult` DESC") + ,ExpectSendNumber_ASC("`expect_send_number` ASC"),ExpectSendNumber_DESC("`expect_send_number` DESC") + ,SuccessNumber_ASC("`success_number` ASC"),SuccessNumber_DESC("`success_number` DESC") + ,ErrorNumber_ASC("`error_number` ASC"),ErrorNumber_DESC("`error_number` DESC") + ,ReturnResult_ASC("`return_result` ASC"),ReturnResult_DESC("`return_result` DESC") ,Phones_ASC("`phones` ASC"),Phones_DESC("`phones` DESC") ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") ,Isright_ASC("`isright` ASC"),Isright_DESC("`isright` DESC") @@ -250,6 +250,8 @@ public class WxMsg implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index a5c2df3ec..d7da743a9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -127,13 +127,13 @@ public class WxMsgCallback implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,BatchNo_ASC("`batchNo` ASC"),BatchNo_DESC("`batchNo` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,BatchNo_ASC("`batch_no` ASC"),BatchNo_DESC("`batch_no` DESC") ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") ,Begintime_ASC("`begintime` ASC"),Begintime_DESC("`begintime` DESC") ,Endtime_ASC("`endtime` ASC"),Endtime_DESC("`endtime` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,StatusMsg_ASC("`statusMsg` ASC"),StatusMsg_DESC("`statusMsg` DESC") + ,StatusMsg_ASC("`status_msg` ASC"),StatusMsg_DESC("`status_msg` DESC") ,Sign_ASC("`sign` ASC"),Sign_DESC("`sign` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") ; @@ -168,6 +168,8 @@ public class WxMsgCallback implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index 882dd0f69..c2e23aec5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -111,13 +111,13 @@ public class WxMsgModel implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") + ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` DESC") ; private String value; @@ -151,6 +151,8 @@ public class WxMsgModel implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index 57de2e3ce..5282be2e8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -73,7 +73,7 @@ public class WxMsgSignature implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") ; @@ -108,6 +108,8 @@ public class WxMsgSignature implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); }