Просмотр исходного кода

[A端][修复]:短信相关的列表排序问题

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
a010a9821c
8 измененных файлов: 24 добавлений и 12 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java
  2. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java
  3. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java
  4. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java
  5. +8
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java
  6. +5
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java
  7. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
  8. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java

+ 1
- 0
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<WxMsgCallback> page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
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<WxMsg> page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
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<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
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<WxMsgSignature> page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize);
return new ResultData(page);
}


+ 8
- 6
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();
}


+ 5
- 3
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();
}


+ 4
- 2
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();
}


+ 3
- 1
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();
}


Загрузка…
Отмена
Сохранить