From 8722ee1bdfde29cf89df74dd8b033bbb4f374291 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Tue, 19 Nov 2024 08:49:56 +0800 Subject: [PATCH] 1 --- .../cityJob/controller/CityJobController.java | 2 +- .../org/jeecg/modules/cityJob/entity/CityJob.java | 15 ++++---- .../modules/cityJob/mapper/CityJobMapper.java | 2 +- .../modules/cityJob/service/ICityJobService.java | 2 +- .../cityJob/service/impl/CityJobServiceImpl.java | 2 +- .../org/jeecg/modules/cityJob/vue/CityJobList.vue | 34 ++--------------- .../modules/cityJob/vue/modules/CityJobForm.vue | 11 ++---- .../org/jeecg/modules/cityJob/vue3/CityJob.data.ts | 43 ++++------------------ .../src/main/resources/application-dev.yml | 2 +- 9 files changed, 28 insertions(+), 85 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java index 6ca1237..160f259 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-13 * @Version: V1.0 */ @Api(tags="工作信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java index e3b45ba..aae8727 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-13 * @Version: V1.0 */ @Data @@ -56,14 +56,14 @@ public class CityJob implements Serializable { @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 minPrice; + /**工资*/ + @Excel(name = "工资", width = 15) + @ApiModelProperty(value = "工资") + private java.lang.String minPrice; /**最高价格*/ @Excel(name = "最高价格", width = 15) @ApiModelProperty(value = "最高价格") - private java.math.BigDecimal maxPrice; + private java.lang.String maxPrice; /**地址*/ @Excel(name = "地址", width = 15) @ApiModelProperty(value = "地址") @@ -121,7 +121,8 @@ public class CityJob implements Serializable { @ApiModelProperty(value = "假日福利") private java.lang.String iconTitle; /**所属乡镇*/ - @Excel(name = "所属乡镇", width = 15) + @Excel(name = "所属乡镇", width = 15, dictTable = "city_addr", dicText = "name", dicCode = "id") + @Dict(dictTable = "city_addr", dicText = "name", dicCode = "id") @ApiModelProperty(value = "所属乡镇") private java.lang.String city; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java index e329f61..ac55df3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-13 * @Version: V1.0 */ public interface CityJobMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java index 151f027..449e1ab 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-13 * @Version: V1.0 */ public interface ICityJobService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java index b86dc3d..018cd7a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-13 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue index 9f443dc..135c475 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue @@ -133,30 +133,15 @@ dataIndex: 'userId_dictText' }, { - title:'最低价格', + title:'工资', align:"center", dataIndex: 'minPrice' }, - { - title:'最高价格', - align:"center", - dataIndex: 'maxPrice' - }, { title:'地址', align:"center", dataIndex: 'address' }, - { - title:'招聘要求', - align:"center", - dataIndex: 'school' - }, - { - title:'岗位详情', - align:"center", - dataIndex: 'jobDetails' - }, { title:'经度', align:"center", @@ -192,11 +177,6 @@ align:"center", dataIndex: 'jobContext' }, - { - title:'公司介绍', - align:"center", - dataIndex: 'gsContext' - }, { title:'招聘公司', align:"center", @@ -207,15 +187,10 @@ align:"center", dataIndex: 'isCardOpen' }, - { - title:'假日福利', - align:"center", - dataIndex: 'iconTitle' - }, { title:'所属乡镇', align:"center", - dataIndex: 'city' + dataIndex: 'city_dictText' }, { title: '操作', @@ -253,8 +228,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) - fieldList.push({type:'BigDecimal',value:'minPrice',text:'最低价格',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'maxPrice',text:'最高价格',dictCode:''}) + fieldList.push({type:'Text',value:'minPrice',text:'工资',dictCode:''}) fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) fieldList.push({type:'Text',value:'school',text:'招聘要求',dictCode:''}) fieldList.push({type:'Text',value:'jobDetails',text:'岗位详情',dictCode:''}) @@ -269,7 +243,7 @@ fieldList.push({type:'string',value:'company',text:'招聘公司',dictCode:''}) fieldList.push({type:'string',value:'isCardOpen',text:'认证情况',dictCode:''}) fieldList.push({type:'string',value:'iconTitle',text:'假日福利',dictCode:''}) - fieldList.push({type:'string',value:'city',text:'所属乡镇',dictCode:''}) + fieldList.push({type:'sel_search',value:'city',text:'所属乡镇',dictTable:"city_addr", dictText:'name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue index 9cf1c80..a63ecea 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue @@ -14,13 +14,8 @@ - - - - - - - + + @@ -95,7 +90,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts index 814aea5..47f7c71 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts @@ -15,30 +15,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'userId_dictText' }, { - title: '最低价格', + title: '工资', align:"center", dataIndex: 'minPrice' }, - { - title: '最高价格', - align:"center", - dataIndex: 'maxPrice' - }, { title: '地址', align:"center", dataIndex: 'address' }, - { - title: '招聘要求', - align:"center", - dataIndex: 'school' - }, - { - title: '岗位详情', - align:"center", - dataIndex: 'jobDetails' - }, { title: '经度', align:"center", @@ -74,11 +59,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'jobContext' }, - { - title: '公司介绍', - align:"center", - dataIndex: 'gsContext' - }, { title: '招聘公司', align:"center", @@ -89,15 +69,10 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'isCardOpen' }, - { - title: '假日福利', - align:"center", - dataIndex: 'iconTitle' - }, { title: '所属乡镇', align:"center", - dataIndex: 'city' + dataIndex: 'city_dictText' }, ]; //查询数据 @@ -119,14 +94,9 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '最低价格', + label: '工资', field: 'minPrice', - component: 'InputNumber', - }, - { - label: '最高价格', - field: 'maxPrice', - component: 'InputNumber', + component: 'Input', }, { label: '地址', @@ -201,6 +171,9 @@ export const formSchema: FormSchema[] = [ { label: '所属乡镇', field: 'city', - component: 'Input', + component: 'JSearchSelect', + componentProps:{ + dict:"city_addr,name,id" + }, }, ]; diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 25370e5..383591b 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8080 tomcat: max-swallow-size: -1 error: