diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java index ae45f05..0b71e99 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java @@ -4,12 +4,15 @@ import java.util.List; import com.playlet.system.domain.PlayletItemType; import com.playlet.system.service.IPlayletItemTypeService; +import com.playlet.system.service.ISysDictDataService; +import com.playlet.system.service.ISysDictTypeService; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -42,6 +45,8 @@ public class PlayletItemController extends BaseController { private final IPlayletItemTypeService playletItemTypeService; + private final ISysDictTypeService sysDictTypeService; + @RequiresPermissions("system:playlet:item:view") @GetMapping() public String item() @@ -89,6 +94,7 @@ public class PlayletItemController extends BaseController { public String add(ModelMap modelMap) { List itemTypes = playletItemTypeService.selectPlayletItemTypeList(new PlayletItemType()); + modelMap.put("sourceTypes", sysDictTypeService.selectDictDataByType("playlet_source_type")); modelMap.put("itemTypes", itemTypes); return prefix + "/add"; } @@ -100,7 +106,7 @@ public class PlayletItemController extends BaseController { @Log(title = "短剧基础", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(PlayletItem playletItem) + public AjaxResult addSave(@Validated PlayletItem playletItem) { return toAjax(playletItemService.insertPlayletItem(playletItem)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java index 2eee2aa..b7521e7 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java @@ -4,6 +4,7 @@ import java.util.List; import com.github.pagehelper.PageInfo; import com.playlet.common.core.domain.Result; +import com.playlet.system.service.IPlayletItemService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -36,6 +37,8 @@ public class PlayletTaskController extends BaseController { private final IPlayletTaskService playletTaskService; + private final IPlayletItemService playletItemService; + @RequiresPermissions("playlet:task:view") @GetMapping() public String task() { @@ -71,7 +74,8 @@ public class PlayletTaskController extends BaseController { * 新增任务 */ @GetMapping("/add") - public String add() { + public String add(ModelMap modelMap) { + modelMap.put("playletItems", playletItemService.lambdaQuery().list()); return prefix + "/add"; } @@ -102,6 +106,7 @@ public class PlayletTaskController extends BaseController { public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletTask playletTask = playletTaskService.selectPlayletTaskById(id); mmap.put("playletTask", playletTask); + mmap.put("playletItems", playletItemService.lambdaQuery().list()); return prefix + "/edit"; } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java index 980f74b..2a7ea60 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java @@ -96,11 +96,6 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { List revenueRecordList = revenueRecordService.searchByTaskId(task.getId()); if (CollectionUtils.isNotEmpty(revenueRecordList)) { Long totalMoney = revenueRecordList.stream().mapToLong(PlayletRevenueRecord::getPracticalEarnings).sum(); - task.setBonusDividePercent(new DecimalFormat("#.0").format((totalMoney / task.getBonusDivideMoney() * 100)) + "%"); - task.setBonusDividePercent(totalMoney.toString()); - } else { - task.setBonusDividePercent("100%"); - task.setBonusDividePercent("0"); } } return task; diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java index d83b01b..5700171 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java @@ -49,7 +49,7 @@ public class PlayletUserItemAppServiceImpl implements PlayletUserItemAppService model = playletUserItem; } // JSONObject body = new JSONObject(); - return this.getPlayletUrl(); + return this.getPlayletUrl(playletUserItem.getItemId()); } @Override @@ -67,7 +67,8 @@ public class PlayletUserItemAppServiceImpl implements PlayletUserItemAppService return PageInfo.of(list); } - private String getPlayletUrl(){ + private String getPlayletUrl(Long itemId){ + PlayletItem item = iPlayletItemService.getById(itemId); String token = "zlwaiSrEM9KEbilu5f"; String timestamp = String.valueOf((int)(System.currentTimeMillis()/1000)); String clientId = "10005693"; @@ -76,7 +77,7 @@ public class PlayletUserItemAppServiceImpl implements PlayletUserItemAppService JSONObject body = new JSONObject(); body.put("clientId", clientId); body.put("channelId", channelId); - body.put("bookId","41000103084"); + body.put("bookId",item.getItemId()); body.put("chapterIdx","1"); body.put("name","zhongcaodaren"); body.put("mediaSource","ks"); diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html index 13ec28f..01a36d3 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html @@ -13,6 +13,12 @@ +
+ +
+ +
+
@@ -20,18 +26,18 @@
- +
- +
- +
- +
@@ -80,19 +86,15 @@
- +
- +
- +
- +
@@ -101,6 +103,12 @@
+
+ +
+ +
+
@@ -111,7 +119,7 @@
- +
@@ -137,18 +145,21 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-item-add').serialize()); + var data = $("#form-item-add").serializeArray(); + var sourceTypeIds = $.form.selectCheckeds("sourceType"); + data.push({"name": "sourceTypeIds", "value": sourceTypeIds}); + $.operate.save(prefix + "/add", data); } } $("input[name='releaseTime']").datetimepicker({ - format: "yyyy-mm-dd", + format: "yyyy-mm-dd hh:mm", minView: "month", autoclose: true }); $("input[name='upTime']").datetimepicker({ - format: "yyyy-mm-dd", + format: "yyyy-mm-dd hh:mm", minView: "month", autoclose: true }); diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html index e38e07e..d89b7de 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html @@ -39,17 +39,13 @@
- +
- +
@@ -143,13 +139,13 @@ } $("input[name='releaseTime']").datetimepicker({ - format: "yyyy-mm-dd", + format: "yyyy-mm-dd hh:mm", minView: "month", autoclose: true }); $("input[name='upTime']").datetimepicker({ - format: "yyyy-mm-dd", + format: "yyyy-mm-dd hh:mm", minView: "month", autoclose: true }); diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html index fbc7070..66e98d4 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html @@ -72,6 +72,10 @@ field: 'itemId', title: '剧集ID' }, + { + field: 'taskId', + title: '任务ID' + }, { field: 'itemTypeName', title: '剧场' @@ -130,19 +134,11 @@ }, { field: 'videoType', - title: '剧集类型', - align: 'center', - formatter: function(value, row, index) { - return $.table.selectDictLabel(videoTypeDict, value); - } + title: '剧集类型' }, { field: 'labelType', - title: '剧集标签', - align: 'center', - formatter: function(value, row, index) { - return $.table.selectDictLabel(labelTypeDict, value); - } + title: '剧集标签' }, { field: 'forUser', @@ -152,6 +148,10 @@ field: 'numberEpisode', title: '前端剧集' }, + { + field: 'numberCost', + title: '收费集数' + }, { field: 'isDelete', title: '是否删除 1 正常 0 删除', diff --git a/playlet-admin/src/main/resources/templates/system/playlet/task/add.html b/playlet-admin/src/main/resources/templates/system/playlet/task/add.html index 1e2c567..05a0bfc 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/task/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/task/add.html @@ -7,11 +7,19 @@
- +
+
+ +
+ +
+
@@ -31,45 +39,57 @@
- +
- +
- +
- +
- +
- +
- +
- +
- + +
+ +
+
+
+ +
+ +
+
+
+
- +
- +
- +
- +
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/task/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/task/edit.html index 10bc036..2073b8f 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/task/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/task/edit.html @@ -2,13 +2,14 @@ +
- +
@@ -20,68 +21,95 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- + +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
- -
- -
-
-
- +
+
+ +
+ +
+
- +
+ \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/task/task.html b/playlet-admin/src/main/resources/templates/system/playlet/task/task.html index 0590359..655279c 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/task/task.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/task/task.html @@ -68,10 +68,34 @@ field: 'taskId', title: '任务id' }, + { + field: 'itemId', + title: '短剧id' + }, { field: 'name', title: '任务名称' }, + { + field: 'peopleNumber', + title: '参与人数' + }, + { + field: 'commissionRate', + title: '提成比例' + }, + { + field: 'recommendLabel', + title: '推荐标签' + }, + { + field: 'taskUrl', + title: '任务链接' + }, + { + field: 'taskDiskUrl', + title: '网盘链接' + }, { field: 'startTime', title: '任务开始时间' @@ -85,32 +109,20 @@ title: '任务短剧平台' }, { - field: 'rule', - title: '任务规则' - }, - { - field: 'contributeStartTime', - title: '任务投稿开始时间' - }, - { - field: 'contributeEndTime', - title: '任务投稿结束时间' - }, - { - field: 'askFor', - title: '任务要求' + field: 'baseBonus', + title: '基础奖金' }, { field: 'totalBonus', - title: '任务总奖金,单位分 保留' - }, - { - field: 'awardDescribe', - title: '任务奖励描述' + title: '任务总奖金' }, { field: 'state', - title: '任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成' + title: '任务状态' + }, + { + field: 'taskContent', + title: '任务介绍' }, { field: 'remark', diff --git a/playlet-admin/src/main/resources/templates/system/playlet/type/add.html b/playlet-admin/src/main/resources/templates/system/playlet/type/add.html index aef7f88..bca91ae 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/type/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/type/add.html @@ -12,6 +12,22 @@
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/type/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/type/edit.html index c5991b2..7a89adc 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/type/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/type/edit.html @@ -13,6 +13,22 @@
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/type/type.html b/playlet-admin/src/main/resources/templates/system/playlet/type/type.html index ebff935..a1ad12d 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/type/type.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/type/type.html @@ -47,6 +47,8 @@ var editFlag = [[${@permission.hasPermi('playlet:type:edit')}]]; var removeFlag = [[${@permission.hasPermi('playlet:type:remove')}]]; var prefix = ctx + "system/playlet/type"; + var producerDict = [[${@dict.getType('playlet_producer_type')}]]; + var sourceDict = [[${@dict.getType('playlet_source_type')}]]; $(function() { var options = { @@ -64,6 +66,22 @@ title: '剧场id', visible: false }, + { + field: 'producerType', + title: '剧集方', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(producerDict, value); + } + }, + { + field: 'sourceType', + title: '平台', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(sourceDict, value); + } + }, { field: 'name', title: '剧场名称' diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java index 2d36c3c..c8d0c24 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java @@ -41,6 +41,12 @@ public class PlayletItem extends BaseEntity{ @ApiModelProperty(value = "来源类型 1.抖音 2.快手 3.视频号") private Long sourceType; + @TableField(exist = false) + private String [] sourceTypeIds; + + @TableField(exist = false) + private String producerType; + /** 视频名称 */ @Excel(name = "短剧标题") @ApiModelProperty(value = "短剧标题") @@ -84,17 +90,23 @@ public class PlayletItem extends BaseEntity{ /** 视频类型1 科幻 2 爱情 3 恐怖 4 悬疑.. */ @Excel(name = "类型1 科幻 2 爱情 3 恐怖 4 悬疑..") @ApiModelProperty(value = "类型1 科幻 2 爱情 3 恐怖 4 悬疑..") - private Long videoType; + private String videoType; @Excel(name = "标签") @ApiModelProperty(value = "标签") - private Long labelType; + private String labelType; /** 集数 */ @Excel(name = "集数") @ApiModelProperty(value = "集数") private Long numberEpisode; + @ApiModelProperty(value = "收费集数") + private Long numberCost; + + @ApiModelProperty(value = "任务id") + private String taskId; + /** 是否删除 1 正常 0 删除 */ @Excel(name = "是否删除 1 正常 0 删除") @ApiModelProperty(value = "是否删除 1 正常 0 删除") diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java index 7d60902..c7d7e98 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java @@ -25,6 +25,12 @@ public class PlayletItemType extends BaseEntity @TableId(value = "id", type = IdType.AUTO) private Long id; + @Excel(name = "字典 playlet_producer_type") + private String producerType; + + @Excel(name = "字典 playlet_source_type") + private String sourceType; + /** 剧场名称 */ @Excel(name = "剧场名称") private String name; diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java index df01047..d224bef 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java @@ -12,6 +12,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.playlet.common.annotation.Excel; +import java.math.BigDecimal; import java.util.Date; /** @@ -35,8 +36,8 @@ public class PlayletTask extends BaseEntity { /** * 任务id 保留字段 */ - @Excel(name = "任务id 保留字段") - @ApiModelProperty(value = "任务id 保留字段") + @Excel(name = "任务id") + @ApiModelProperty(value = "任务id") private String taskId; /** @@ -46,6 +47,29 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "任务名称") private String name; + @Excel(name = "短剧ID") + @ApiModelProperty(value = "短剧ID") + private Long itemId; + + @TableField(exist = false) + @ApiModelProperty(value = "短剧") + private PlayletItem playletItem; + + @ApiModelProperty(value = "参与人数") + private Integer peopleNumber; + + @ApiModelProperty(value = "提成比例") + private BigDecimal commissionRate; + + @ApiModelProperty(value = "推荐标签") + private String recommendLabel; + + @ApiModelProperty(value = "任务链接") + private String taskUrl; + + @ApiModelProperty(value = "任务网盘地址") + private String taskDiskUrl; + /** * 任务开始时间 */ @@ -67,34 +91,6 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "任务短剧平台") private Long platformType; - /** - * 任务规则 - */ - @Excel(name = "任务规则") - @ApiModelProperty(value = "任务规则") - private String rule; - - /** - * 任务投稿开始时间 - */ - @Excel(name = "任务投稿开始时间") - @ApiModelProperty(value = "任务投稿开始时间") - private Date contributeStartTime; - - /** - * 任务投稿结束时间 - */ - @Excel(name = "任务投稿结束时间") - @ApiModelProperty(value = "任务投稿结束时间") - private Date contributeEndTime; - - /** - * 任务要求 - */ - @Excel(name = "任务要求") - @ApiModelProperty(value = "任务要求") - private String askFor; - /** * 任务总奖金,单位分 保留 */ @@ -106,6 +102,17 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "基础佣金,单位分") private Long baseBonus; + /** + * 任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成 + */ + @Excel(name = "任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") + @ApiModelProperty(value = "任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") + private Long state; + + @Excel(name = "活动介绍") + @ApiModelProperty(value = "活动介绍") + private String taskContent; + @Excel(name = "视频数") @ApiModelProperty(value = "视频数") private Long videoCount; @@ -122,40 +129,10 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "评论数") private Long commentCount; - @Excel(name = "活动介绍") - @ApiModelProperty(value = "活动介绍") - private String taskContent; - - @Excel(name = "活动图片") - @ApiModelProperty(value = "活动图片") - private String taskImg; - - /** - * 任务奖励描述 - */ - @Excel(name = "任务奖励描述") - @ApiModelProperty(value = "任务奖励描述") - private String awardDescribe; - - /** - * 任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成 - */ - @Excel(name = "任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") - @ApiModelProperty(value = "任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") - private Long state; @TableField(exist = false) @Excel(name = "用户id") @ApiModelProperty(value = "用户id") private String userId; - @TableField(exist = false) - @Excel(name = "奖金划分 百分比 保留一位小数") - @ApiModelProperty(value = "奖金划分 百分比 保留一位小数") - private String bonusDividePercent; - - @TableField(exist = false) - @Excel(name = "奖金划分 金额 单位分") - @ApiModelProperty(value = "奖金划分 金额 单位分") - private Long bonusDivideMoney; } diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java index a9d48eb..7043b6a 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java @@ -3,10 +3,14 @@ package com.playlet.system.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.playlet.common.utils.DateUtils; +import com.playlet.system.domain.PlayletItemType; import com.playlet.system.pojo.dto.PlayletItemSearchRequestDTO; +import com.playlet.system.service.IPlayletItemTypeService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class PlayletItemServiceImpl extends ServiceImpl implements IPlayletItemService { private final PlayletItemMapper playletItemMapper; + private final IPlayletItemTypeService playletItemTypeService; + /** * 查询短剧基础 * @@ -57,8 +63,23 @@ public class PlayletItemServiceImpl extends ServiceImpl + @@ -25,13 +26,14 @@ + - select id, item_id, source_type, video_name, complete_not, cover_pic, actor_name, producer, connect_site, release_time, video_type, label_type, item_type, number_episode, up_time, is_delete, special_item, for_user, remark, create_by, update_by, create_time, update_time from playlet_item + select id, item_id,task_id, number_cost, source_type, video_name, complete_not, cover_pic, actor_name, producer, connect_site, release_time, video_type, label_type, item_type, number_episode, up_time, is_delete, special_item, for_user, remark, create_by, update_by, create_time, update_time from playlet_item @@ -36,6 +38,8 @@ insert into playlet_item_type name, + producer_type, + source_type, status, create_by, create_time, @@ -45,6 +49,8 @@ #{name}, + #{producerType}, + #{sourceType}, #{status}, #{createBy}, #{createTime}, @@ -58,6 +64,8 @@ update playlet_item_type name = #{name}, + producer_type = #{producerType}, + source_type = #{sourceType}, status = #{status}, create_by = #{createBy}, create_time = #{createTime}, diff --git a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml index 440d4c7..b69cd2f 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml @@ -11,10 +11,12 @@ - - - - + + + + + + @@ -22,8 +24,6 @@ - - @@ -36,23 +36,23 @@ select id, task_id, name, + item_id, + people_number, + commission_rate, + recommend_label, + task_url, + task_disk_url, start_time, end_time, platform_type, - rule, - contribute_start_time, - contribute_end_time, - ask_for, - total_bonus, - video_count, - play_count, - star_count, - comment_count, base_bonus, - task_content, - task_img, - award_describe, + total_bonus, state, + task_content, + comment_count, + star_count, + play_count, + video_count, create_time, update_time, create_by, @@ -66,46 +66,37 @@ and task_id = #{taskId} and name like concat('%', #{name}, '%') - and start_time = #{startTime} - and end_time = #{endTime} - and platform_type = #{platformType} - and rule = #{rule} - and contribute_start_time = #{contributeStartTime} - and contribute_end_time = #{contributeEndTime} - and ask_for = #{askFor} - and total_bonus = #{totalBonus} - and award_describe = #{awardDescribe} and state = #{state}