Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaTask.java

@@ -66,4 +66,8 @@ public class MetaTask extends BaseEntity{
     @ApiModelProperty("金币奖励数量")
     @ExcelProperty("金币奖励数量")
     private int goldNum;
+
+    @ApiModelProperty("是否自动领取")
+    @ExcelProperty("是否自动领取")
+    private boolean autoReceive;
 }

src/main/java/com/izouma/nineth/service/MetaTaskToUserService.java

@@ -34,7 +34,7 @@ public class MetaTaskToUserService {
 
     private MetaUserTaskProgressRepo metaUserTaskProgressRepo;
 
-    private final String PREFIX = "0/ ";
+    private final String PREFIX = "0/";
 
     public Page<MetaTaskToUser> all(PageQuery pageQuery) {
         return metaTaskToUserRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTaskToUser.class), JpaUtils.toPageRequest(pageQuery));
@@ -86,7 +86,9 @@ public class MetaTaskToUserService {
         metaTaskToUser.setGetTime(LocalDateTime.now());
         metaTaskToUser.setAwardType(metaTask.getAwardType());
         metaTaskToUser.setStatus(MetaTaskStatus.PROGRESS);
-        return MetaRestResult.returnSuccess(metaTaskToUserRepo.save(metaTaskToUser));
+        MetaTaskToUser save = metaTaskToUserRepo.save(metaTaskToUser);
+        setProgress(save);
+        return MetaRestResult.returnSuccess(save);
     }
 
 

src/main/vue/src/views/MetaTaskEdit.vue

@@ -102,6 +102,9 @@
 							<el-input-number v-model="formData.value" :min="0"> </el-input-number>
 						</el-form-item>
 					</template>
+                    <el-form-item prop="autoReceive" label="是否自动领取">
+						<el-switch v-model="formData.autoReceive"> </el-switch>
+					</el-form-item>
 					<el-form-item prop="publish" label="是否发布">
 						<el-switch v-model="formData.publish"> </el-switch>
 					</el-form-item>

src/main/vue/src/views/MetaTaskList.vue

@@ -43,14 +43,14 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="createdAt" label="创建时间"> </el-table-column>
-            <el-table-column prop="name" label="任务名称"> </el-table-column>
-            <el-table-column prop="type" label="任务类型" :formatter="typeFormatter"> </el-table-column>
-            <el-table-column prop="value" label="配置值"> </el-table-column>
-            <el-table-column prop="detail" label="详情"> </el-table-column>
-            <el-table-column prop="awardType" label="奖励类型" :formatter="awardTypeFormatter"> </el-table-column>
-            <el-table-column prop="awardPic" label="奖励图片">
+            <el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="createdAt" align="center" label="任务创建时间" width="100"> </el-table-column>
+            <el-table-column prop="name" align="center" label="任务名称" width="200"> </el-table-column>
+            <el-table-column prop="type" align="center" label="任务类型" :formatter="typeFormatter" width="100"> </el-table-column>
+            <el-table-column prop="value" align="center" label="配置值" width="80"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="awardType" align="center" label="奖励类型" :formatter="awardTypeFormatter" width="100"> </el-table-column>
+            <el-table-column prop="awardPic" align="center" label="奖励图片" width="100">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
@@ -61,18 +61,23 @@
                     </el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="goldNum" label="奖励金币数量"> </el-table-column>
-            <el-table-column prop="publish" label="是否发布">
+            <el-table-column prop="goldNum" align="center" label="奖励金币数量" width="100"> </el-table-column>
+			<el-table-column prop="autoReceive" align="center" label="自动领取" width="80">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.autoReceive ? '' : 'info'"> {{ row.autoReceive }} </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="publish" align="center" label="是否发布" width="80">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column prop="mark" label="是否展示角标">
+            <el-table-column prop="mark" align="center" label="展示角标" width="80">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.mark ? '' : 'info'"> {{ row.mark }} </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column prop="finish" label="是否结束">
+            <el-table-column prop="finish" align="center" label="是否结束" width="80">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.finish ? '' : 'info'"> {{ row.finish }} </el-tag>
                 </template>