全员

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://admin.anqi.shop/a-notice-api/
+VUE_APP_API_BASE_URL=http://localhost:8000/a-notice-api/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-hanhai-vue/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://admin.anqi.shop/a-notice-api/
+VUE_APP_API_BASE_URL=http://localhost:8000/a-notice-api/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-cloud-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,3 +0,0 @@
-org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class
-org/jeecg/common/system/api/ISysBaseAPI.class
-org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +0,0 @@
-/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
-/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java
-/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
-/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-local-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-org/jeecg/common/system/api/ISysBaseAPI.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -77,6 +77,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/api/login/**", "anon");
         filterChainDefinitionMap.put("/api/index/**", "anon");
 
+        filterChainDefinitionMap.put("/api/info/**", "anon");
 
 
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 演员集表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Api(tags="演员集表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 演员集表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Data
@@ -63,4 +63,44 @@ public class AtActorCollection implements Serializable {
 	@Excel(name = "用户标识", width = 15)
     @ApiModelProperty(value = "用户标识")
     private java.lang.String userId;
+	/**联系方式*/
+	@Excel(name = "联系方式", width = 15)
+    @ApiModelProperty(value = "联系方式")
+    private java.lang.String phone;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.lang.String money;
+	/**联系方式是否收费*/
+	@Excel(name = "联系方式是否收费", width = 15)
+    @ApiModelProperty(value = "联系方式是否收费")
+    private java.lang.String phonePay;
+	/**演员介绍*/
+	@Excel(name = "演员介绍", width = 15)
+    @ApiModelProperty(value = "演员介绍")
+    private java.lang.String photographerContent;
+	/**地点*/
+	@Excel(name = "地点", width = 15)
+    @ApiModelProperty(value = "地点")
+    private java.lang.String address;
+	/**是否本人发布*/
+	@Excel(name = "是否本人发布", width = 15)
+    @ApiModelProperty(value = "是否本人发布")
+    private java.lang.String isUser;
+	/**是否置顶*/
+	@Excel(name = "是否置顶", width = 15)
+    @ApiModelProperty(value = "是否置顶")
+    private java.lang.String isTop;
+	/**代表作*/
+	@Excel(name = "代表作", width = 15)
+    @ApiModelProperty(value = "代表作")
+    private java.lang.String isImage;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
+	/**是否验证*/
+	@Excel(name = "是否验证", width = 15)
+    @ApiModelProperty(value = "是否验证")
+    private java.lang.String isState;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 演员集表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface AtActorCollectionMapper extends BaseMapper<AtActorCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 演员集表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface IAtActorCollectionService extends IService<AtActorCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 演员集表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AtActorCollectionModal from './modules/AtActorCollectionModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'AtActorCollectionList',
@@ -142,6 +143,60 @@
             align:"center",
             dataIndex: 'userId'
           },
+          {
+            title:'联系方式',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'联系方式是否收费',
+            align:"center",
+            dataIndex: 'phonePay'
+          },
+          {
+            title:'演员介绍',
+            align:"center",
+            dataIndex: 'photographerContent'
+          },
+          {
+            title:'地点',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'是否本人发布',
+            align:"center",
+            dataIndex: 'isUser',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUser'], text) : ''),
+          },
+          {
+            title:'是否置顶',
+            align:"center",
+            dataIndex: 'isTop',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isTop'], text) : ''),
+          },
+          {
+            title:'代表作',
+            align:"center",
+            dataIndex: 'isImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'是否验证',
+            align:"center",
+            dataIndex: 'isState',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isState'], text) : ''),
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -164,6 +219,9 @@
       }
     },
     created() {
+      this.$set(this.dictOptions, 'isUser', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isTop', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isState', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -180,6 +238,16 @@
         fieldList.push({type:'string',value:'photographerName',text:'摄影师名称',dictCode:''})
         fieldList.push({type:'string',value:'image',text:'图',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
+        fieldList.push({type:'string',value:'money',text:'价格',dictCode:''})
+        fieldList.push({type:'string',value:'phonePay',text:'联系方式是否收费',dictCode:''})
+        fieldList.push({type:'Text',value:'photographerContent',text:'演员介绍',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地点',dictCode:''})
+        fieldList.push({type:'switch',value:'isUser',text:'是否本人发布'})
+        fieldList.push({type:'switch',value:'isTop',text:'是否置顶'})
+        fieldList.push({type:'string',value:'isImage',text:'代表作',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'switch',value:'isState',text:'是否验证'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue

@@ -23,6 +23,56 @@
               <a-input v-model="model.userId" placeholder="请输入用户标识"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系方式"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
+              <a-input v-model="model.money" placeholder="请输入价格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系方式是否收费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phonePay">
+              <a-input v-model="model.phonePay" placeholder="请输入联系方式是否收费"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="演员介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="photographerContent">
+              <a-input v-model="model.photographerContent" placeholder="请输入演员介绍"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否本人发布" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isUser">
+              <j-switch v-model="model.isUser"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否置顶" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isTop">
+              <j-switch v-model="model.isTop"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="代表作" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isImage">
+              <j-image-upload isMultiple  v-model="model.isImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否验证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isState">
+              <j-switch v-model="model.isState"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts

@@ -25,6 +25,66 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId'
    },
+   {
+    title: '联系方式',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'money'
+   },
+   {
+    title: '联系方式是否收费',
+    align:"center",
+    dataIndex: 'phonePay'
+   },
+   {
+    title: '演员介绍',
+    align:"center",
+    dataIndex: 'photographerContent'
+   },
+   {
+    title: '地点',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '是否本人发布',
+    align:"center",
+    dataIndex: 'isUser',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '是否置顶',
+    align:"center",
+    dataIndex: 'isTop',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '代表作',
+    align:"center",
+    dataIndex: 'isImage',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '是否验证',
+    align:"center",
+    dataIndex: 'isState',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -53,4 +113,62 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'Input',
   },
+  {
+    label: '联系方式',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '价格',
+    field: 'money',
+    component: 'Input',
+  },
+  {
+    label: '联系方式是否收费',
+    field: 'phonePay',
+    component: 'Input',
+  },
+  {
+    label: '演员介绍',
+    field: 'photographerContent',
+    component: 'Input',
+  },
+  {
+    label: '地点',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '是否本人发布',
+    field: 'isUser',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '是否置顶',
+    field: 'isTop',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '代表作',
+    field: 'isImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '是否验证',
+    field: 'isState',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/controller/AtPromotionController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 推广记录表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Api(tags="推广记录表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/entity/AtPromotion.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 推广记录表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Data
@@ -63,4 +63,9 @@ public class AtPromotion implements Serializable {
 	@Excel(name = "推广时效", width = 15)
     @ApiModelProperty(value = "推广时效")
     private java.lang.Integer goTiime;
+	/**用户*/
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/mapper/AtPromotionMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 推广记录表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface AtPromotionMapper extends BaseMapper<AtPromotion> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/service/IAtPromotionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 推广记录表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface IAtPromotionService extends IService<AtPromotion> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/service/impl/AtPromotionServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 推广记录表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/vue/AtPromotionList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AtPromotionModal from './modules/AtPromotionModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'AtPromotionList',
@@ -142,6 +143,11 @@
             align:"center",
             dataIndex: 'goTiime'
           },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -180,6 +186,7 @@
         fieldList.push({type:'string',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'int',value:'goTiime',text:'推广时效',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/vue/modules/AtPromotionForm.vue

@@ -23,6 +23,11 @@
               <a-input-number v-model="model.goTiime" placeholder="请输入推广时效" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPromotion/vue3/AtPromotion.data.ts

@@ -25,6 +25,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'goTiime'
    },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -53,4 +58,12 @@ export const formSchema: FormSchema[] = [
     field: 'goTiime',
     component: 'InputNumber',
   },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/controller/AtTrendsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 动态帖子表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Api(tags="动态帖子表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/entity/AtTrends.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 动态帖子表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Data
@@ -56,11 +56,28 @@ public class AtTrends implements Serializable {
     @ApiModelProperty(value = "图片")
     private java.lang.String image;
 	/**发布人*/
-	@Excel(name = "发布人", width = 15)
+	@Excel(name = "发布人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "发布人")
     private java.lang.String userId;
 	/**点赞数*/
 	@Excel(name = "点赞数", width = 15)
     @ApiModelProperty(value = "点赞数")
     private java.lang.Integer dropNum;
+	/**动态详情*/
+	@Excel(name = "动态详情", width = 15)
+    @ApiModelProperty(value = "动态详情")
+    private java.lang.String content;
+	/**是否置顶*/
+	@Excel(name = "是否置顶", width = 15)
+    @ApiModelProperty(value = "是否置顶")
+    private java.lang.String isTop;
+	/**是否付费*/
+	@Excel(name = "是否付费", width = 15)
+    @ApiModelProperty(value = "是否付费")
+    private java.lang.String isPay;
+	/**名片/帖子*/
+	@Excel(name = "名片/帖子", width = 15)
+    @ApiModelProperty(value = "名片/帖子")
+    private java.lang.String isCard;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/mapper/AtTrendsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 动态帖子表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface AtTrendsMapper extends BaseMapper<AtTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 动态帖子表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface IAtTrendsService extends IService<AtTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 动态帖子表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/AtTrendsList.vue

@@ -4,6 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题" v-model="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="发布人">
+              <j-search-select-tag placeholder="请选择发布人" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -99,6 +119,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import AtTrendsModal from './modules/AtTrendsModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'AtTrendsList',
@@ -135,13 +156,36 @@
           {
             title:'发布人',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'点赞数',
             align:"center",
             dataIndex: 'dropNum'
           },
+          {
+            title:'动态详情',
+            align:"center",
+            dataIndex: 'content'
+          },
+          {
+            title:'是否置顶',
+            align:"center",
+            dataIndex: 'isTop',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isTop'], text) : ''),
+          },
+          {
+            title:'是否付费',
+            align:"center",
+            dataIndex: 'isPay',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPay'], text) : ''),
+          },
+          {
+            title:'名片/帖子',
+            align:"center",
+            dataIndex: 'isCard',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isCard'], text) : ''),
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -164,6 +208,9 @@
       }
     },
     created() {
+      this.$set(this.dictOptions, 'isTop', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isPay', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+      this.$set(this.dictOptions, 'isCard', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -178,8 +225,12 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'发布人',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'int',value:'dropNum',text:'点赞数',dictCode:''})
+        fieldList.push({type:'string',value:'content',text:'动态详情',dictCode:''})
+        fieldList.push({type:'switch',value:'isTop',text:'是否置顶'})
+        fieldList.push({type:'switch',value:'isPay',text:'是否付费'})
+        fieldList.push({type:'switch',value:'isCard',text:'名片/帖子'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue

@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="发布人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入发布人"  ></a-input>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -23,6 +23,26 @@
               <a-input-number v-model="model.dropNum" placeholder="请输入点赞数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="动态详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
+              <a-input v-model="model.content" placeholder="请输入动态详情"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否置顶" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isTop">
+              <j-switch v-model="model.isTop"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否付费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPay">
+              <j-switch v-model="model.isPay"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="名片/帖子" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isCard">
+              <j-switch v-model="model.isCard"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue3/AtTrends.data.ts

@@ -18,16 +18,60 @@ export const columns: BasicColumn[] = [
    {
     title: '发布人',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '点赞数',
     align:"center",
     dataIndex: 'dropNum'
    },
+   {
+    title: '动态详情',
+    align:"center",
+    dataIndex: 'content'
+   },
+   {
+    title: '是否置顶',
+    align:"center",
+    dataIndex: 'isTop',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '是否付费',
+    align:"center",
+    dataIndex: 'isPay',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '名片/帖子',
+    align:"center",
+    dataIndex: 'isCard',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "发布人",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -46,11 +90,40 @@ export const formSchema: FormSchema[] = [
   {
     label: '发布人',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '点赞数',
     field: 'dropNum',
     component: 'InputNumber',
   },
+  {
+    label: '动态详情',
+    field: 'content',
+    component: 'Input',
+  },
+  {
+    label: '是否置顶',
+    field: 'isTop',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '是否付费',
+    field: 'isPay',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '名片/帖子',
+    field: 'isCard',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/controller/HanHaiBankController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 银行卡列表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Api(tags="银行卡列表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/entity/HanHaiBank.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 银行卡列表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Data
@@ -59,4 +59,13 @@ public class HanHaiBank implements Serializable {
 	@Excel(name = "身份证号码", width = 15)
     @ApiModelProperty(value = "身份证号码")
     private java.lang.String card;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String bankAddress;
+	/**用户*/
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/mapper/HanHaiBankMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 银行卡列表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface HanHaiBankMapper extends BaseMapper<HanHaiBank> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/service/IHanHaiBankService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 银行卡列表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface IHanHaiBankService extends IService<HanHaiBank> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/service/impl/HanHaiBankServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 银行卡列表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/vue/HanHaiBankList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiBankModal from './modules/HanHaiBankModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiBankList',
@@ -136,6 +137,16 @@
             align:"center",
             dataIndex: 'card'
           },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankAddress'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -173,6 +184,8 @@
         fieldList.push({type:'string',value:'bankId',text:'卡号',dictCode:''})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'card',text:'身份证号码',dictCode:''})
+        fieldList.push({type:'string',value:'bankAddress',text:'开户行',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/vue/modules/HanHaiBankForm.vue

@@ -18,6 +18,16 @@
               <a-input v-model="model.card" placeholder="请输入身份证号码"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankAddress">
+              <a-input v-model="model.bankAddress" placeholder="请输入开户行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBank/vue3/HanHaiBank.data.ts

@@ -19,6 +19,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'card'
    },
+   {
+    title: '开户行',
+    align:"center",
+    dataIndex: 'bankAddress'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -40,4 +50,17 @@ export const formSchema: FormSchema[] = [
     field: 'card',
     component: 'Input',
   },
+  {
+    label: '开户行',
+    field: 'bankAddress',
+    component: 'Input',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/controller/HanHaiWaterController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 流水信息表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Api(tags="流水信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/entity/HanHaiWater.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 流水信息表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Data
@@ -48,11 +48,24 @@ public class HanHaiWater implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**用户标识*/
-	@Excel(name = "用户标识", width = 15)
+	@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户标识")
     private java.lang.String userId;
 	/**金额*/
 	@Excel(name = "金额", width = 15)
     @ApiModelProperty(value = "金额")
     private java.math.BigDecimal price;
+	/**类型0充值1提现*/
+	@Excel(name = "类型0充值1提现", width = 15)
+    @ApiModelProperty(value = "类型0充值1提现")
+    private java.lang.Integer type;
+	/**状态0审核中1已到账*/
+	@Excel(name = "状态0审核中1已到账", width = 15)
+    @ApiModelProperty(value = "状态0审核中1已到账")
+    private java.lang.Integer state;
+	/**到账时间*/
+	@Excel(name = "到账时间", width = 15)
+    @ApiModelProperty(value = "到账时间")
+    private java.util.Date successTime;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/mapper/HanHaiWaterMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 流水信息表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface HanHaiWaterMapper extends BaseMapper<HanHaiWater> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/service/IHanHaiWaterService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 流水信息表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 public interface IHanHaiWaterService extends IService<HanHaiWater> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/service/impl/HanHaiWaterServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 流水信息表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-09-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/vue/HanHaiWaterList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiWaterModal from './modules/HanHaiWaterModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiWaterList',
@@ -124,13 +125,28 @@
           {
             title:'用户标识',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'金额',
             align:"center",
             dataIndex: 'price'
           },
+          {
+            title:'类型0充值1提现',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'状态0审核中1已到账',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'到账时间',
+            align:"center",
+            dataIndex: 'successTime'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -165,8 +181,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'BigDecimal',value:'price',text:'金额',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型0充值1提现',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态0审核中1已到账',dictCode:''})
+        fieldList.push({type:'datetime',value:'successTime',text:'到账时间'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/vue/modules/HanHaiWaterForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户标识"  ></a-input>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -13,6 +13,21 @@
               <a-input-number v-model="model.price" placeholder="请输入金额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型0充值1提现" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input-number v-model="model.type" placeholder="请输入类型0充值1提现" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态0审核中1已到账" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入状态0审核中1已到账" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="到账时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successTime">
+              <j-date placeholder="请选择到账时间"  v-model="model.successTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiWater/vue3/HanHaiWater.data.ts

@@ -7,13 +7,28 @@ export const columns: BasicColumn[] = [
     {
     title: '用户标识',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '金额',
     align:"center",
     dataIndex: 'price'
    },
+   {
+    title: '类型0充值1提现',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '状态0审核中1已到账',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '到账时间',
+    align:"center",
+    dataIndex: 'successTime'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -23,11 +38,29 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户标识',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '金额',
     field: 'price',
     component: 'InputNumber',
   },
+  {
+    label: '类型0充值1提现',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '状态0审核中1已到账',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '到账时间',
+    field: 'successTime',
+    component: 'Input',
+  },
 ];