记得上下班打卡 | git大法好,push需谨慎

Commit a60270f4 authored by 胡佳晨's avatar 胡佳晨

提交修改

parent 64c15b66
...@@ -25,6 +25,8 @@ public class PerformancePartnerListDao { ...@@ -25,6 +25,8 @@ public class PerformancePartnerListDao {
private int surplusGeneral; private int surplusGeneral;
@ApiModelProperty(value = "演出状态") @ApiModelProperty(value = "演出状态")
private int status; private int status;
@ApiModelProperty(value = "演出类型")
private int type;
@ApiModelProperty(value = "提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝") @ApiModelProperty(value = "提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus; private int auditStatus;
@ApiModelProperty(value = "拒绝理由") @ApiModelProperty(value = "拒绝理由")
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<result column="total_sale_price" property="totalSalePrice"/> <result column="total_sale_price" property="totalSalePrice"/>
<result column="surplus_general" property="surplusGeneral"/> <result column="surplus_general" property="surplusGeneral"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="type" property="type"/>
<result column="audit_status" property="auditStatus"/> <result column="audit_status" property="auditStatus"/>
<result column="reject_txt" property="rejectTxt"/> <result column="reject_txt" property="rejectTxt"/>
<result column="created_at" property="createdAt"/> <result column="created_at" property="createdAt"/>
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
0 0
) AS 'surplus_general' , ) AS 'surplus_general' ,
ps.`status` , ps.`status` ,
p.type,
ps.audit_status , ps.audit_status ,
p.reject_txt , p.reject_txt ,
p.created_at p.created_at
......
...@@ -507,9 +507,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -507,9 +507,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
public boolean onLinePerformance(String performancesId) { public boolean onLinePerformance(String performancesId) {
try { try {
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId)); KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
// if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) { if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) {
// return false; return false;
// } }
// mysql // mysql
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
KylinPerformanceStatus performanceStatusUpdate = new KylinPerformanceStatus(); KylinPerformanceStatus performanceStatusUpdate = new KylinPerformanceStatus();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment