Merge branch 'dev-mata-ldz' of xiongzhu/raex_back into master

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

@@ -34,7 +34,7 @@ public class MetaParamsConfig extends AuditedEntity {
     public enum ValueType {
 
         STRING,
-
+        DATETIME,
         BOOLEAN
 
     }

src/main/java/com/izouma/nineth/repo/MetaUserGoldRecordRepo.java

@@ -18,6 +18,6 @@ public interface MetaUserGoldRecordRepo extends JpaRepository<MetaUserGoldRecord
     @Transactional
     void softDelete(Long id);
 
-    @Query(value = "select user_id userId,sum(operation_num) num,nickname nickName,avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 group by user_id order by sum(operation_num) desc",nativeQuery = true)
+    @Query(value = "select user_id userId,sum(operation_num) num,nickname nickName,avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 and operation_num > 0 group by user_id  order by sum(operation_num) desc",nativeQuery = true)
     List<Map<String,String>> top(String beginTime, String endTime);
 }

src/main/vue/src/views/MetaParamsConfigList.vue

@@ -53,6 +53,13 @@
                         active-value="1"
                         inactive-value="0"
                     ></el-switch>
+                    <el-date-picker
+                        v-model="formData.value"
+                        v-if="formData.type === 'DATETIME'"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择日期时间"
+                    ></el-date-picker>
                 </el-form-item>
             </el-form>
             <span slot="footer">
@@ -95,6 +102,10 @@ export default {
                     label: '字符串',
                     value: 'STRING'
                 },
+                {
+                    label: '日期时间',
+                    value: 'DATETIME'
+                },
                 {
                     label: '开关',
                     value: 'BOOLEAN'