@@ -39,6 +39,8 @@ public class WxAppinfo extends BaseEntity { | |||
private Long payId; | |||
@io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") | |||
private Integer type; | |||
@io.swagger.annotations.ApiModelProperty(value="平台",name="plat") | |||
private Integer plat; | |||
@io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") | |||
private Long payBillId; | |||
@@ -35,4 +35,7 @@ public class WxWeappAuditStatus extends BaseEntity { | |||
@io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") | |||
private Date auditTime; | |||
@io.swagger.annotations.ApiModelProperty(value="小程序平台",name="plat") | |||
private Integer plat; | |||
} |
@@ -32,4 +32,7 @@ public class WxWeappCodeStatus extends BaseEntity { | |||
@io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime") | |||
private Date codeTime; | |||
@io.swagger.annotations.ApiModelProperty(value="小程序平台",name="type") | |||
private Integer plat; | |||
} |
@@ -31,5 +31,8 @@ public class WxWeappReleaseStatus extends BaseEntity { | |||
@io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime") | |||
private Date releaseTime; | |||
@io.swagger.annotations.ApiModelProperty(value="小程序平台",name="plat") | |||
private Integer plat; | |||
} |
@@ -14,7 +14,7 @@ public interface WxWeappAuditStatusMapper extends CommonMapper<WxWeappAuditStatu | |||
List<WxWeappAuditStatusVo> findVoList(WxWeappAuditStatusVo weappAuditStatusVo); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type, @Param(value = "auditStatus") Integer auditStatus); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat") Integer plat, @Param(value = "auditStatus") Integer auditStatus); | |||
void updateStatus(WxWeappAuditStatus record); | |||
@@ -14,7 +14,7 @@ public interface WxWeappCodeStatusMapper extends CommonMapper<WxWeappCodeStatus, | |||
List<WxWeappCodeStatusVo> findVoList(WxWeappCodeStatusVo weappCodeStatusVo); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat")Integer plat); | |||
void updateStatus(WxWeappCodeStatus weappCodeStatus); | |||
@@ -14,7 +14,7 @@ public interface WxWeappReleaseStatusMapper extends CommonMapper<WxWeappReleaseS | |||
List<WxWeappReleaseStatusVo> findVoList(WxWeappReleaseStatusVo weappReleaseStatusVo); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type); | |||
List<Map> findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat") Integer plat); | |||
void updateStatus(WxWeappReleaseStatus weappRelaseStatus); | |||
@@ -32,7 +32,7 @@ public interface WxWeappAuditStatusService { | |||
* | |||
* @return | |||
*/ | |||
List<Map> getVersionList(Integer type, Integer auditStatus); | |||
List<Map> getVersionList(Integer type,Integer plat, Integer auditStatus); | |||
/** | |||
* 根据Id获得实体 | |||
@@ -32,7 +32,7 @@ public interface WxWeappCodeStatusService { | |||
* | |||
* @return | |||
*/ | |||
List<Map> getVersionList(Integer type); | |||
List<Map> getVersionList(Integer type,Integer plat); | |||
/** | |||
* 根据Id获得实体 | |||
@@ -35,7 +35,7 @@ public interface WxWeappReleaseStatusService { | |||
* | |||
* @return | |||
*/ | |||
List<Map> getVersionList(Integer type); | |||
List<Map> getVersionList(Integer type,Integer plat); | |||
/** | |||
* 根据Id获得实体 | |||
@@ -35,8 +35,8 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService | |||
} | |||
@Override | |||
public List<Map> getVersionList(Integer type, Integer auditStatus) { | |||
return weappAuditStatusMapper.findUserVersions(type, auditStatus); | |||
public List<Map> getVersionList(Integer type,Integer plat, Integer auditStatus) { | |||
return weappAuditStatusMapper.findUserVersions(type,plat, auditStatus); | |||
} | |||
@Override | |||
@@ -37,8 +37,8 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { | |||
} | |||
@Override | |||
public List<Map> getVersionList(Integer type) { | |||
return weappCodeStatusMapper.findUserVersions(type); | |||
public List<Map> getVersionList(Integer type,Integer plat) { | |||
return weappCodeStatusMapper.findUserVersions(type,plat); | |||
} | |||
@Override | |||
@@ -42,8 +42,8 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ | |||
} | |||
@Override | |||
public List<Map> getVersionList(Integer type) { | |||
return weappReleaseStatusMapper.findUserVersions(type); | |||
public List<Map> getVersionList(Integer type,Integer plat) { | |||
return weappReleaseStatusMapper.findUserVersions(type,plat); | |||
} | |||
@Override | |||
@@ -16,12 +16,13 @@ | |||
<result column="expires_in" jdbcType="INTEGER" property="expiresIn"/> | |||
<result column="pay_id" jdbcType="BIGINT" property="payId"/> | |||
<result column="type" jdbcType="INTEGER" property="type"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
<result column="pay_bill_id" jdbcType="BIGINT" property="payBillId"/> | |||
</resultMap> | |||
<sql id="allColumns"> | |||
`id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type`,`pay_bill_id` | |||
`id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type`,`plat`,`pay_bill_id` | |||
</sql> | |||
<sql id="dynamicWhereConditions"> | |||
@@ -80,6 +81,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
<if test=" null != payBillId "> | |||
and `pay_bill_id` = #{payBillId} | |||
</if> | |||
@@ -12,10 +12,11 @@ | |||
<result column="audit_status" jdbcType="INTEGER" property="auditStatus"/> | |||
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode"/> | |||
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
</resultMap> | |||
<sql id="allColumns"> | |||
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`, `auditid`, `audit_status`,`audit_err_code`,`audit_time` | |||
`id`,`tenant_id`,`app_id`,`type`,`plat`,`user_version`,`version_desc`, `auditid`, `audit_status`,`audit_err_code`,`audit_time` | |||
</sql> | |||
<sql id="dynamicWhereConditions"> | |||
@@ -32,6 +33,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and `user_version` = #{userVersion} | |||
</if> | |||
@@ -74,6 +78,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
<if test=" null != auditStatus "> | |||
and `audit_status` = #{auditStatus} | |||
</if> | |||
@@ -92,10 +99,11 @@ | |||
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode"/> | |||
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime"/> | |||
<result column="name" jdbcType="VARCHAR" property="name"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
</resultMap> | |||
<sql id="allVoColumns"> | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,`version_desc`, | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,`version_desc`, | |||
c.`auditid`, c.`audit_status`,c.`audit_err_code`,c.`audit_time` as `audit_time`, | |||
a.`name` | |||
</sql> | |||
@@ -114,6 +122,9 @@ | |||
<if test=" null != type "> | |||
and c.`type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and c.`plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and c.`user_version` = #{userVersion} | |||
</if> | |||
@@ -11,10 +11,12 @@ | |||
<result column="code_status" jdbcType="INTEGER" property="codeStatus"/> | |||
<result column="code_err_code" jdbcType="VARCHAR" property="codeErrCode"/> | |||
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
</resultMap> | |||
<sql id="allColumns"> | |||
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time` | |||
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time`,`plat` | |||
</sql> | |||
<sql id="dynamicWhereConditions"> | |||
@@ -31,6 +33,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and `user_version` = #{userVersion} | |||
</if> | |||
@@ -63,13 +68,16 @@ | |||
where `app_id` = #{appId} and `type` = #{type} | |||
</update> | |||
<select id="findUserVersions" resultType="hashmap"> | |||
<select id="findUserVersions"parameterType="hashmap" resultType="hashmap"> | |||
select user_version as version | |||
from wx_weapp_code_status | |||
where 1=1 | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
group by user_version | |||
</select> | |||
@@ -78,6 +86,7 @@ | |||
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||
<result column="app_id" jdbcType="VARCHAR" property="appId"/> | |||
<result column="type" jdbcType="INTEGER" property="type"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/> | |||
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/> | |||
<result column="code_status" jdbcType="INTEGER" property="codeStatus"/> | |||
@@ -87,7 +96,7 @@ | |||
</resultMap> | |||
<sql id="allVoColumns"> | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time` as `code_time`, a.`name` | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time` as `code_time`, a.`name` | |||
</sql> | |||
<sql id="dynamicVoWhereConditions"> | |||
@@ -104,6 +113,9 @@ | |||
<if test=" null != type "> | |||
and c.`type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and c.`plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and c.`user_version` = #{userVersion} | |||
</if> | |||
@@ -11,10 +11,12 @@ | |||
<result column="release_status" jdbcType="INTEGER" property="releaseStatus"/> | |||
<result column="release_err_code" jdbcType="VARCHAR" property="releaseErrCode"/> | |||
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
</resultMap> | |||
<sql id="allColumns"> | |||
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time` | |||
`id`,`tenant_id`,`app_id`,`type`,`plat`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time` | |||
</sql> | |||
<sql id="dynamicWhereConditions"> | |||
@@ -31,6 +33,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and `user_version` = #{userVersion} | |||
</if> | |||
@@ -70,6 +75,9 @@ | |||
<if test=" null != type "> | |||
and `type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and `plat` = #{plat} | |||
</if> | |||
group by user_version | |||
</select> | |||
@@ -84,10 +92,12 @@ | |||
<result column="release_err_code" jdbcType="VARCHAR" property="releaseErrCode"/> | |||
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime"/> | |||
<result column="name" jdbcType="TIMESTAMP" property="name"/> | |||
<result column="plat" jdbcType="INTEGER" property="plat"/> | |||
</resultMap> | |||
<sql id="allVoColumns"> | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`, | |||
c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,c.`version_desc`, | |||
c.`release_status`,c.`release_err_code`,c.`release_time` as `release_time`, | |||
a.`name` | |||
</sql> | |||
@@ -106,6 +116,9 @@ | |||
<if test=" null != type "> | |||
and c.`type` = #{type} | |||
</if> | |||
<if test=" null != plat "> | |||
and c.`plat` = #{plat} | |||
</if> | |||
<if test=" null != userVersion "> | |||
and c.`user_version` = #{userVersion} | |||
</if> | |||
@@ -113,6 +113,7 @@ public class WechatWeappCodeController extends BaseController { | |||
if (appinfo != null) { | |||
codeStatus.setTenantId(appinfo.getTenantId()); | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -145,6 +146,7 @@ public class WechatWeappCodeController extends BaseController { | |||
if (appinfo != null) { | |||
codeStatus.setTenantId(appinfo.getTenantId()); | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -280,6 +282,7 @@ public class WechatWeappCodeController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
if(submitStatus) { | |||
@@ -393,6 +396,7 @@ public class WechatWeappCodeController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
auditStatus.setAuditid(auditId); | |||
@@ -567,6 +571,7 @@ public class WechatWeappCodeController extends BaseController { | |||
releaseStatus.setTenantId(auditStatus.getTenantId()); | |||
releaseStatus.setAppId(auditStatus.getAppId()); | |||
releaseStatus.setType(auditStatus.getType()); | |||
releaseStatus.setPlat(auditStatus.getPlat()); | |||
releaseStatus.setUserVersion(auditStatus.getUserVersion()); | |||
releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | |||
} | |||
@@ -642,6 +642,7 @@ public class WxWeappInfoController extends BaseController { | |||
codeStatus.setAppId(appinfo.getAppId()); | |||
if (appinfo != null) { | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -698,6 +699,7 @@ public class WxWeappInfoController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
auditStatus.setAuditid(auditid); | |||
@@ -870,6 +872,7 @@ public class WxWeappInfoController extends BaseController { | |||
releaseStatus.setTenantId(auditStatus.getTenantId()); | |||
releaseStatus.setAppId(auditStatus.getAppId()); | |||
releaseStatus.setType(auditStatus.getType()); | |||
releaseStatus.setPlat(auditStatus.getPlat()); | |||
releaseStatus.setUserVersion(auditStatus.getUserVersion()); | |||
releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | |||
} | |||
@@ -934,6 +937,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappCodeStatusVo.setName(null); | |||
} | |||
} | |||
weappCodeStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); | |||
weappCodeStatusVo.setSortColumns(BaseEntity.SortField.CodeTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -956,6 +960,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappAuditStatusVo.setName(null); | |||
} | |||
} | |||
weappAuditStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); | |||
weappAuditStatusVo.setSortColumns(BaseEntity.SortField.AuditTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -978,6 +983,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappReleaseStatusVo.setName(null); | |||
} | |||
} | |||
weappReleaseStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); | |||
weappReleaseStatusVo.setSortColumns(BaseEntity.SortField.ReleaseTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC,BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -989,7 +995,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) | |||
public ResultData getCodeVersionList(Integer type) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getCodeVersionList"); | |||
final List<Map> list = weappCodeStatusService.getVersionList(type); | |||
final List<Map> list = weappCodeStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode()); | |||
return new ResultData(list); | |||
} | |||
@@ -1000,7 +1006,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "status", value = "审核状态", dataType = "int", paramType = "query")}) | |||
public ResultData getAuditVersionList(Integer type, Integer status) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditVersionList"); | |||
final List<Map> list = weappAuditStatusService.getVersionList(type, status); | |||
final List<Map> list = weappAuditStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode(), status); | |||
return new ResultData(list); | |||
} | |||
@@ -1010,7 +1016,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) | |||
public ResultData getReleaseVersionList(Integer type) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getReleaseVersionList"); | |||
final List<Map> list = weappReleaseStatusService.getVersionList(type); | |||
final List<Map> list = weappReleaseStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode()); | |||
return new ResultData(list); | |||
} | |||
@@ -113,6 +113,7 @@ public class WechatWeappCodeController extends BaseController { | |||
if (appinfo != null) { | |||
codeStatus.setTenantId(appinfo.getTenantId()); | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -145,6 +146,7 @@ public class WechatWeappCodeController extends BaseController { | |||
if (appinfo != null) { | |||
codeStatus.setTenantId(appinfo.getTenantId()); | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -280,6 +282,7 @@ public class WechatWeappCodeController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
if(submitStatus) { | |||
@@ -393,6 +396,7 @@ public class WechatWeappCodeController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
auditStatus.setAuditid(auditId); | |||
@@ -567,6 +571,7 @@ public class WechatWeappCodeController extends BaseController { | |||
releaseStatus.setTenantId(auditStatus.getTenantId()); | |||
releaseStatus.setAppId(auditStatus.getAppId()); | |||
releaseStatus.setType(auditStatus.getType()); | |||
releaseStatus.setPlat(auditStatus.getPlat()); | |||
releaseStatus.setUserVersion(auditStatus.getUserVersion()); | |||
releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | |||
} | |||
@@ -639,6 +639,7 @@ public class WxWeappInfoController extends BaseController { | |||
codeStatus.setAppId(appinfo.getAppId()); | |||
if (appinfo != null) { | |||
codeStatus.setType(appinfo.getType()); | |||
codeStatus.setPlat(appinfo.getPlat()); | |||
} | |||
codeStatus.setUserVersion(userVersion); | |||
codeStatus.setVersionDesc(userDesc); | |||
@@ -695,6 +696,7 @@ public class WxWeappInfoController extends BaseController { | |||
auditStatus.setTenantId(codeStatus.getTenantId()); | |||
auditStatus.setAppId(codeStatus.getAppId()); | |||
auditStatus.setType(codeStatus.getType()); | |||
auditStatus.setPlat(codeStatus.getPlat()); | |||
auditStatus.setUserVersion(codeStatus.getUserVersion()); | |||
auditStatus.setVersionDesc(codeStatus.getVersionDesc()); | |||
auditStatus.setAuditid(auditid); | |||
@@ -867,6 +869,7 @@ public class WxWeappInfoController extends BaseController { | |||
releaseStatus.setTenantId(auditStatus.getTenantId()); | |||
releaseStatus.setAppId(auditStatus.getAppId()); | |||
releaseStatus.setType(auditStatus.getType()); | |||
releaseStatus.setPlat(auditStatus.getPlat()); | |||
releaseStatus.setUserVersion(auditStatus.getUserVersion()); | |||
releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); | |||
} | |||
@@ -931,6 +934,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappCodeStatusVo.setName(null); | |||
} | |||
} | |||
weappCodeStatusVo.setPlat(EnumAppPlat.WX.getCode()); | |||
weappCodeStatusVo.setSortColumns(BaseEntity.SortField.CodeTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -953,6 +957,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappAuditStatusVo.setName(null); | |||
} | |||
} | |||
weappAuditStatusVo.setPlat(EnumAppPlat.WX.getCode()); | |||
weappAuditStatusVo.setSortColumns(BaseEntity.SortField.AuditTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappAuditStatusVo> page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -975,6 +980,7 @@ public class WxWeappInfoController extends BaseController { | |||
weappReleaseStatusVo.setName(null); | |||
} | |||
} | |||
weappReleaseStatusVo.setPlat(EnumAppPlat.WX.getCode()); | |||
weappReleaseStatusVo.setSortColumns(BaseEntity.SortField.ReleaseTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC,BaseEntity.SortField.UserVersion_DESC); | |||
final PageInfo<WxWeappReleaseStatusVo> page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); | |||
return new ResultData(page); | |||
@@ -986,7 +992,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) | |||
public ResultData getCodeVersionList(Integer type) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getCodeVersionList"); | |||
final List<Map> list = weappCodeStatusService.getVersionList(type); | |||
final List<Map> list = weappCodeStatusService.getVersionList(type,EnumAppPlat.WX.getCode()); | |||
return new ResultData(list); | |||
} | |||
@@ -997,7 +1003,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "status", value = "审核状态", dataType = "int", paramType = "query")}) | |||
public ResultData getAuditVersionList(Integer type, Integer status) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditVersionList"); | |||
final List<Map> list = weappAuditStatusService.getVersionList(type, status); | |||
final List<Map> list = weappAuditStatusService.getVersionList(type,EnumAppPlat.WX.getCode(), status); | |||
return new ResultData(list); | |||
} | |||
@@ -1007,7 +1013,7 @@ public class WxWeappInfoController extends BaseController { | |||
@ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) | |||
public ResultData getReleaseVersionList(Integer type) { | |||
logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getReleaseVersionList"); | |||
final List<Map> list = weappReleaseStatusService.getVersionList(type); | |||
final List<Map> list = weappReleaseStatusService.getVersionList(type,EnumAppPlat.WX.getCode()); | |||
return new ResultData(list); | |||
} | |||