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

[列表显示][修改]:列表显示排序

release
Stormeye Wu 7 лет назад
Родитель
Сommit
046b191f05
5 измененных файлов: 20 добавлений и 9 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java
  2. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java
  4. +4
    -0
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java
  5. +6
    -3
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java Просмотреть файл

@@ -23,6 +23,8 @@ public class WxWeappAuditStatus implements Serializable {
@Transient @Transient
protected String sortColumns; protected String sortColumns;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId; private String appId;
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
@@ -43,6 +45,7 @@ public class WxWeappAuditStatus implements Serializable {
public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 4
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java Просмотреть файл

@@ -23,29 +23,27 @@ public class WxWeappCodeStatus implements Serializable {
@Transient @Transient
protected String sortColumns; protected String sortColumns;


/**小程序ID*/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId; private String appId;
/**小程序类型(1-B端 2-C端)*/
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端 3-公众服务号 4-公众订阅号)",name="type")
private Integer type; private Integer type;
/**用户版本*/
@io.swagger.annotations.ApiModelProperty(value="用户版本",name="userVersion") @io.swagger.annotations.ApiModelProperty(value="用户版本",name="userVersion")
private String userVersion; private String userVersion;
@io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc") @io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc")
private String versionDesc; private String versionDesc;
/**code提交状态*/
@io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, 1:失败)",name="codeStatus") @io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, 1:失败)",name="codeStatus")
private Integer codeStatus; private Integer codeStatus;
@io.swagger.annotations.ApiModelProperty(value="code提交错误码",name="codeErrCode") @io.swagger.annotations.ApiModelProperty(value="code提交错误码",name="codeErrCode")
private String codeErrCode; private String codeErrCode;
/**更新时间*/
@io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime") @io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime")
private Date codeTime; private Date codeTime;


public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java Просмотреть файл

@@ -23,6 +23,8 @@ public class WxWeappReleaseStatus implements Serializable {
@Transient @Transient
protected String sortColumns; protected String sortColumns;


@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId; private String appId;
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
@@ -41,6 +43,7 @@ public class WxWeappReleaseStatus implements Serializable {
public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC") ,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 4
- 0
mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java Просмотреть файл

@@ -110,6 +110,7 @@ public class WechatWeappCodeController {
codeStatus = new WxWeappCodeStatus(); codeStatus = new WxWeappCodeStatus();
codeStatus.setAppId(appId); codeStatus.setAppId(appId);
if (appinfo != null) { if (appinfo != null) {
codeStatus.setTenantId(appinfo.getTenantId());
codeStatus.setType(appinfo.getType()); codeStatus.setType(appinfo.getType());
} }
codeStatus.setUserVersion(userVersion); codeStatus.setUserVersion(userVersion);
@@ -141,6 +142,7 @@ public class WechatWeappCodeController {
codeStatus = new WxWeappCodeStatus(); codeStatus = new WxWeappCodeStatus();
codeStatus.setAppId(appId); codeStatus.setAppId(appId);
if (appinfo != null) { if (appinfo != null) {
codeStatus.setTenantId(appinfo.getTenantId());
codeStatus.setType(appinfo.getType()); codeStatus.setType(appinfo.getType());
} }
codeStatus.setUserVersion(userVersion); codeStatus.setUserVersion(userVersion);
@@ -272,6 +274,7 @@ public class WechatWeappCodeController {
if (auditStatus == null) { if (auditStatus == null) {
auditStatus = new WxWeappAuditStatus(); auditStatus = new WxWeappAuditStatus();
auditStatus.setId(codeStatus.getId()); auditStatus.setId(codeStatus.getId());
auditStatus.setTenantId(codeStatus.getTenantId());
auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setAppId(codeStatus.getAppId());
auditStatus.setType(codeStatus.getType()); auditStatus.setType(codeStatus.getType());
auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setUserVersion(codeStatus.getUserVersion());
@@ -425,6 +428,7 @@ public class WechatWeappCodeController {
isUpdate = true; isUpdate = true;
} else { } else {
releaseStatus = new WxWeappReleaseStatus(); releaseStatus = new WxWeappReleaseStatus();
releaseStatus.setTenantId(auditStatus.getTenantId());
releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setAppId(auditStatus.getAppId());
releaseStatus.setType(auditStatus.getType()); releaseStatus.setType(auditStatus.getType());
releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setUserVersion(auditStatus.getUserVersion());


+ 6
- 3
mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java Просмотреть файл

@@ -549,6 +549,7 @@ public class WxWeappInfoController extends BaseController {
if (codeStatus == null) { if (codeStatus == null) {
codeStatus = new WxWeappCodeStatus(); codeStatus = new WxWeappCodeStatus();
codeStatus.setId(appinfo.getId()); codeStatus.setId(appinfo.getId());
codeStatus.setTenantId(appinfo.getTenantId());
codeStatus.setAppId(appinfo.getAppId()); codeStatus.setAppId(appinfo.getAppId());
if (appinfo != null) { if (appinfo != null) {
codeStatus.setType(appinfo.getType()); codeStatus.setType(appinfo.getType());
@@ -605,6 +606,7 @@ public class WxWeappInfoController extends BaseController {
if (auditStatus == null) { if (auditStatus == null) {
auditStatus = new WxWeappAuditStatus(); auditStatus = new WxWeappAuditStatus();
auditStatus.setId(codeStatus.getId()); auditStatus.setId(codeStatus.getId());
auditStatus.setTenantId(codeStatus.getTenantId());
auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setAppId(codeStatus.getAppId());
auditStatus.setType(codeStatus.getType()); auditStatus.setType(codeStatus.getType());
auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setUserVersion(codeStatus.getUserVersion());
@@ -775,6 +777,7 @@ public class WxWeappInfoController extends BaseController {
} else { } else {
releaseStatus = new WxWeappReleaseStatus(); releaseStatus = new WxWeappReleaseStatus();
releaseStatus.setId(auditStatus.getId()); releaseStatus.setId(auditStatus.getId());
releaseStatus.setTenantId(auditStatus.getTenantId());
releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setAppId(auditStatus.getAppId());
releaseStatus.setType(auditStatus.getType()); releaseStatus.setType(auditStatus.getType());
releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setUserVersion(auditStatus.getUserVersion());
@@ -835,7 +838,7 @@ public class WxWeappInfoController extends BaseController {
weappCodeStatusVo.setName(null); weappCodeStatusVo.setName(null);
} }
} }
weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC);
weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.TenantId_ASC, WxWeappCodeStatus.Field.Type_ASC, WxWeappCodeStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@@ -857,7 +860,7 @@ public class WxWeappInfoController extends BaseController {
weappAuditStatusVo.setName(null); weappAuditStatusVo.setName(null);
} }
} }
weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.UserVersion_DESC);
weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.TenantId_ASC, WxWeappAuditStatus.Field.Type_ASC, WxWeappAuditStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@@ -879,7 +882,7 @@ public class WxWeappInfoController extends BaseController {
weappReleaseStatusVo.setName(null); weappReleaseStatusVo.setName(null);
} }
} }
weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.UserVersion_DESC);
weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.TenantId_ASC, WxWeappReleaseStatus.Field.Type_ASC,WxWeappReleaseStatus.Field.UserVersion_DESC);
final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


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