From 5d54fd5b22be58ccdc88c3f78fd3c80a14e261c1 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Thu, 17 Oct 2024 21:31:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=95=B0=E6=8D=AE=E5=BA=93=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=202=E3=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployBillInfoController.java | 2 +- .../employBillInfo/entity/EmployBillInfo.java | 5 +- .../mapper/EmployBillInfoMapper.java | 2 +- .../service/IEmployBillInfoService.java | 2 +- .../service/impl/EmployBillInfoServiceImpl.java | 2 +- .../employBillInfo/vue/EmployBillInfoList.vue | 5 +- .../vue/modules/EmployBillInfoForm.vue | 4 +- .../employBillInfo/vue3/EmployBillInfo.data.ts | 12 +- .../controller/EmployCheckJobController.java | 171 ++++++++++++++++++ .../employCheckJob/entity/EmployCheckJob.java | 60 +++++++ .../mapper/EmployCheckJobMapper.java | 17 ++ .../mapper/xml/EmployCheckJobMapper.xml | 5 + .../service/IEmployCheckJobService.java | 14 ++ .../service/impl/EmployCheckJobServiceImpl.java | 19 ++ .../employCheckJob/vue/EmployCheckJobList.vue | 178 +++++++++++++++++++ .../vue/modules/EmployCheckJobForm.vue | 109 ++++++++++++ .../modules/EmployCheckJobModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployCheckJobModal.vue | 60 +++++++ .../employCheckJob/vue3/EmployCheckJob.api.ts | 61 +++++++ .../employCheckJob/vue3/EmployCheckJob.data.ts | 39 ++++ .../employCheckJob/vue3/EmployCheckJobList.vue | 162 +++++++++++++++++ .../vue3/components/EmployCheckJobModal.vue | 58 ++++++ .../controller/EmployCheckResumeController.java | 171 ++++++++++++++++++ .../entity/EmployCheckResume.java | 60 +++++++ .../mapper/EmployCheckResumeMapper.java | 17 ++ .../mapper/xml/EmployCheckResumeMapper.xml | 5 + .../service/IEmployCheckResumeService.java | 14 ++ .../service/impl/EmployCheckResumeServiceImpl.java | 19 ++ .../vue/EmployCheckResumeList.vue | 178 +++++++++++++++++++ .../vue/modules/EmployCheckResumeForm.vue | 109 ++++++++++++ .../EmployCheckResumeModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployCheckResumeModal.vue | 60 +++++++ .../vue3/EmployCheckResume.api.ts | 61 +++++++ .../vue3/EmployCheckResume.data.ts | 39 ++++ .../vue3/EmployCheckResumeList.vue | 162 +++++++++++++++++ .../vue3/components/EmployCheckResumeModal.vue | 58 ++++++ .../controller/EmployCollectionJobController.java | 171 ++++++++++++++++++ .../entity/EmployCollectionJob.java | 60 +++++++ .../mapper/EmployCollectionJobMapper.java | 17 ++ .../mapper/xml/EmployCollectionJobMapper.xml | 5 + .../service/IEmployCollectionJobService.java | 14 ++ .../impl/EmployCollectionJobServiceImpl.java | 19 ++ .../vue/EmployCollectionJobList.vue | 178 +++++++++++++++++++ .../vue/modules/EmployCollectionJobForm.vue | 109 ++++++++++++ .../EmployCollectionJobModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployCollectionJobModal.vue | 60 +++++++ .../vue3/EmployCollectionJob.api.ts | 61 +++++++ .../vue3/EmployCollectionJob.data.ts | 39 ++++ .../vue3/EmployCollectionJobList.vue | 162 +++++++++++++++++ .../vue3/components/EmployCollectionJobModal.vue | 58 ++++++ .../EmployCollectionResumeController.java | 171 ++++++++++++++++++ .../entity/EmployCollectionResume.java | 60 +++++++ .../mapper/EmployCollectionResumeMapper.java | 17 ++ .../mapper/xml/EmployCollectionResumeMapper.xml | 5 + .../service/IEmployCollectionResumeService.java | 14 ++ .../impl/EmployCollectionResumeServiceImpl.java | 19 ++ .../vue/EmployCollectionResumeList.vue | 178 +++++++++++++++++++ .../vue/modules/EmployCollectionResumeForm.vue | 109 ++++++++++++ .../EmployCollectionResumeModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployCollectionResumeModal.vue | 60 +++++++ .../vue3/EmployCollectionResume.api.ts | 61 +++++++ .../vue3/EmployCollectionResume.data.ts | 39 ++++ .../vue3/EmployCollectionResumeList.vue | 162 +++++++++++++++++ .../components/EmployCollectionResumeModal.vue | 58 ++++++ .../controller/EmployContractController.java | 171 ++++++++++++++++++ .../employContract/entity/EmployContract.java | 72 ++++++++ .../mapper/EmployContractMapper.java | 17 ++ .../mapper/xml/EmployContractMapper.xml | 5 + .../service/IEmployContractService.java | 14 ++ .../service/impl/EmployContractServiceImpl.java | 19 ++ .../employContract/vue/EmployContractList.vue | 197 +++++++++++++++++++++ .../vue/modules/EmployContractForm.vue | 124 +++++++++++++ .../modules/EmployContractModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployContractModal.vue | 60 +++++++ .../employContract/vue3/EmployContract.api.ts | 61 +++++++ .../employContract/vue3/EmployContract.data.ts | 72 ++++++++ .../employContract/vue3/EmployContractList.vue | 162 +++++++++++++++++ .../vue3/components/EmployContractModal.vue | 58 ++++++ .../controller/EmployNotebookController.java | 2 +- .../employNotebook/entity/EmployNotebook.java | 9 +- .../mapper/EmployNotebookMapper.java | 2 +- .../service/IEmployNotebookService.java | 2 +- .../service/impl/EmployNotebookServiceImpl.java | 2 +- .../employNotebook/vue/EmployNotebookList.vue | 8 +- .../vue/modules/EmployNotebookForm.vue | 7 +- .../employNotebook/vue3/EmployNotebook.data.ts | 17 +- .../controller/EmployResumeController.java | 2 +- .../modules/employResume/entity/EmployResume.java | 6 +- .../employResume/mapper/EmployResumeMapper.java | 2 +- .../employResume/service/IEmployResumeService.java | 2 +- .../service/impl/EmployResumeServiceImpl.java | 2 +- .../modules/employResume/vue/EmployResumeList.vue | 20 ++- .../employResume/vue/modules/EmployResumeForm.vue | 7 +- .../modules/employResume/vue3/EmployResume.data.ts | 15 +- .../controller/EmployWorkInfoController.java | 2 +- .../employWorkInfo/entity/EmployWorkInfo.java | 11 +- .../mapper/EmployWorkInfoMapper.java | 2 +- .../service/IEmployWorkInfoService.java | 2 +- .../service/impl/EmployWorkInfoServiceImpl.java | 2 +- .../employWorkInfo/vue/EmployWorkInfoList.vue | 11 +- .../vue/modules/EmployWorkInfoForm.vue | 7 +- .../employWorkInfo/vue3/EmployWorkInfo.data.ts | 20 ++- .../api/employController/BossApiController.java | 36 ++++ .../api/employController/CommonApiController.java | 75 +++----- .../employController/EmployeeApiController.java | 34 ++++ .../jeecg/modules/apiService/BossApiService.java | 17 ++ .../jeecg/modules/apiService/CommonApiService.java | 17 ++ .../modules/apiService/EmployeeApiService.java | 16 ++ .../apiService/impl/BossApiServiceImpl.java | 124 ++++++++++++- .../apiService/impl/CommonApiServiceImpl.java | 107 ++++++++++- .../apiService/impl/EmployeeApiServiceImpl.java | 126 +++++++++++++ 111 files changed, 5907 insertions(+), 105 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/controller/EmployCheckJobController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/EmployCheckJobMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/xml/EmployCheckJobMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/IEmployCheckJobService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/impl/EmployCheckJobServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/EmployCheckJobList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJobList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/components/EmployCheckJobModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/controller/EmployCheckResumeController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/EmployCheckResumeMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/xml/EmployCheckResumeMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/IEmployCheckResumeService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/impl/EmployCheckResumeServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/EmployCheckResumeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResumeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/components/EmployCheckResumeModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/controller/EmployCollectionJobController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/EmployCollectionJobMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/xml/EmployCollectionJobMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/IEmployCollectionJobService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/impl/EmployCollectionJobServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/EmployCollectionJobList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJobList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/components/EmployCollectionJobModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/controller/EmployCollectionResumeController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/EmployCollectionResumeMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/xml/EmployCollectionResumeMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/IEmployCollectionResumeService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/impl/EmployCollectionResumeServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/EmployCollectionResumeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResumeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/components/EmployCollectionResumeModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/xml/EmployContractMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContractList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/components/EmployContractModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/controller/EmployBillInfoController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/controller/EmployBillInfoController.java index 158c3cc..1799743 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/controller/EmployBillInfoController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/controller/EmployBillInfoController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 记账信息表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Api(tags="记账信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/entity/EmployBillInfo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/entity/EmployBillInfo.java index c839eb9..147b8ec 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/entity/EmployBillInfo.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/entity/EmployBillInfo.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 记账信息表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Data @@ -66,7 +66,8 @@ public class EmployBillInfo implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String remarks; /**关联账本id*/ - @Excel(name = "关联账本id", width = 15) + @Excel(name = "关联账本id", width = 15, dictTable = "employ_notebook", dicText = "title", dicCode = "id") + @Dict(dictTable = "employ_notebook", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联账本id") private java.lang.String notebookId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/mapper/EmployBillInfoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/mapper/EmployBillInfoMapper.java index 25c8ed1..bf6c0a9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/mapper/EmployBillInfoMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/mapper/EmployBillInfoMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 记账信息表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface EmployBillInfoMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/IEmployBillInfoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/IEmployBillInfoService.java index d577933..0c223d2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/IEmployBillInfoService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/IEmployBillInfoService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 记账信息表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface IEmployBillInfoService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/impl/EmployBillInfoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/impl/EmployBillInfoServiceImpl.java index a1a7b8c..1c51ef0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/impl/EmployBillInfoServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/service/impl/EmployBillInfoServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 记账信息表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/EmployBillInfoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/EmployBillInfoList.vue index 876fdb4..b166acd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/EmployBillInfoList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/EmployBillInfoList.vue @@ -143,12 +143,13 @@ { title:'备注', align:"center", - dataIndex: 'remarks' + dataIndex: 'remarks', + scopedSlots: {customRender: 'htmlSlot'} }, { title:'关联账本id', align:"center", - dataIndex: 'notebookId' + dataIndex: 'notebookId_dictText' }, { title: '操作', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/modules/EmployBillInfoForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/modules/EmployBillInfoForm.vue index 396f8a6..7879828 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/modules/EmployBillInfoForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue/modules/EmployBillInfoForm.vue @@ -20,12 +20,12 @@ - + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue3/EmployBillInfo.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue3/EmployBillInfo.data.ts index 184608c..e3d0e35 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue3/EmployBillInfo.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employBillInfo/vue3/EmployBillInfo.data.ts @@ -25,12 +25,13 @@ export const columns: BasicColumn[] = [ { title: '备注', align:"center", - dataIndex: 'remarks' + dataIndex: 'remarks', + slots: { customRender: 'htmlSlot' }, }, { title: '关联账本id', align:"center", - dataIndex: 'notebookId' + dataIndex: 'notebookId_dictText' }, ]; //查询数据 @@ -56,11 +57,14 @@ export const formSchema: FormSchema[] = [ { label: '备注', field: 'remarks', - component: 'Input', + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '关联账本id', field: 'notebookId', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_notebook,title,id" + }, }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/controller/EmployCheckJobController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/controller/EmployCheckJobController.java new file mode 100644 index 0000000..4f75f15 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/controller/EmployCheckJobController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employCheckJob.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 工作查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Api(tags="工作查看表") +@RestController +@RequestMapping("/employCheckJob/employCheckJob") +@Slf4j +public class EmployCheckJobController extends JeecgController { + @Autowired + private IEmployCheckJobService employCheckJobService; + + /** + * 分页列表查询 + * + * @param employCheckJob + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "工作查看表-分页列表查询") + @ApiOperation(value="工作查看表-分页列表查询", notes="工作查看表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployCheckJob employCheckJob, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employCheckJob, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employCheckJobService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employCheckJob + * @return + */ + @AutoLog(value = "工作查看表-添加") + @ApiOperation(value="工作查看表-添加", notes="工作查看表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployCheckJob employCheckJob) { + employCheckJobService.save(employCheckJob); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employCheckJob + * @return + */ + @AutoLog(value = "工作查看表-编辑") + @ApiOperation(value="工作查看表-编辑", notes="工作查看表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployCheckJob employCheckJob) { + employCheckJobService.updateById(employCheckJob); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "工作查看表-通过id删除") + @ApiOperation(value="工作查看表-通过id删除", notes="工作查看表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employCheckJobService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "工作查看表-批量删除") + @ApiOperation(value="工作查看表-批量删除", notes="工作查看表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employCheckJobService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "工作查看表-通过id查询") + @ApiOperation(value="工作查看表-通过id查询", notes="工作查看表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployCheckJob employCheckJob = employCheckJobService.getById(id); + if(employCheckJob==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employCheckJob); + } + + /** + * 导出excel + * + * @param request + * @param employCheckJob + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployCheckJob employCheckJob) { + return super.exportXls(request, employCheckJob, EmployCheckJob.class, "工作查看表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployCheckJob.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java new file mode 100644 index 0000000..f6cbbe3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employCheckJob.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 工作查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Data +@TableName("employ_check_job") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_check_job对象", description="工作查看表") +public class EmployCheckJob implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联工作id*/ + @Excel(name = "关联工作id", width = 15, dictTable = "employ_job", dicText = "title", dicCode = "id") + @Dict(dictTable = "employ_job", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联工作id") + private java.lang.String jobId; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/EmployCheckJobMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/EmployCheckJobMapper.java new file mode 100644 index 0000000..66924d2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/EmployCheckJobMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employCheckJob.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工作查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface EmployCheckJobMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/xml/EmployCheckJobMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/xml/EmployCheckJobMapper.xml new file mode 100644 index 0000000..8cea051 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/mapper/xml/EmployCheckJobMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/IEmployCheckJobService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/IEmployCheckJobService.java new file mode 100644 index 0000000..9f5b918 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/IEmployCheckJobService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employCheckJob.service; + +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 工作查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface IEmployCheckJobService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/impl/EmployCheckJobServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/impl/EmployCheckJobServiceImpl.java new file mode 100644 index 0000000..ce99860 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/service/impl/EmployCheckJobServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employCheckJob.service.impl; + +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import org.jeecg.modules.employCheckJob.mapper.EmployCheckJobMapper; +import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 工作查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Service +public class EmployCheckJobServiceImpl extends ServiceImpl implements IEmployCheckJobService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/EmployCheckJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/EmployCheckJobList.vue new file mode 100644 index 0000000..0523af9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/EmployCheckJobList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobForm.vue new file mode 100644 index 0000000..e14794c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.Style#Drawer.vue new file mode 100644 index 0000000..a4f6795 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.vue new file mode 100644 index 0000000..86bed26 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue/modules/EmployCheckJobModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.api.ts new file mode 100644 index 0000000..b219e4f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employCheckJob/employCheckJob/list', + save='/employCheckJob/employCheckJob/add', + edit='/employCheckJob/employCheckJob/edit', + deleteOne = '/employCheckJob/employCheckJob/delete', + deleteBatch = '/employCheckJob/employCheckJob/deleteBatch', + importExcel = '/employCheckJob/employCheckJob/importExcel', + exportXls = '/employCheckJob/employCheckJob/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.data.ts new file mode 100644 index 0000000..e9a4e8e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJob.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联工作id', + align:"center", + dataIndex: 'jobId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联工作id', + field: 'jobId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_job,title,id" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJobList.vue new file mode 100644 index 0000000..771c991 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/EmployCheckJobList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/components/EmployCheckJobModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/components/EmployCheckJobModal.vue new file mode 100644 index 0000000..077f3ed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/vue3/components/EmployCheckJobModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/controller/EmployCheckResumeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/controller/EmployCheckResumeController.java new file mode 100644 index 0000000..b905b4e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/controller/EmployCheckResumeController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employCheckResume.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 简历查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Api(tags="简历查看表") +@RestController +@RequestMapping("/employCheckResume/employCheckResume") +@Slf4j +public class EmployCheckResumeController extends JeecgController { + @Autowired + private IEmployCheckResumeService employCheckResumeService; + + /** + * 分页列表查询 + * + * @param employCheckResume + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "简历查看表-分页列表查询") + @ApiOperation(value="简历查看表-分页列表查询", notes="简历查看表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployCheckResume employCheckResume, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employCheckResume, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employCheckResumeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employCheckResume + * @return + */ + @AutoLog(value = "简历查看表-添加") + @ApiOperation(value="简历查看表-添加", notes="简历查看表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployCheckResume employCheckResume) { + employCheckResumeService.save(employCheckResume); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employCheckResume + * @return + */ + @AutoLog(value = "简历查看表-编辑") + @ApiOperation(value="简历查看表-编辑", notes="简历查看表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployCheckResume employCheckResume) { + employCheckResumeService.updateById(employCheckResume); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "简历查看表-通过id删除") + @ApiOperation(value="简历查看表-通过id删除", notes="简历查看表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employCheckResumeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "简历查看表-批量删除") + @ApiOperation(value="简历查看表-批量删除", notes="简历查看表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employCheckResumeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "简历查看表-通过id查询") + @ApiOperation(value="简历查看表-通过id查询", notes="简历查看表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployCheckResume employCheckResume = employCheckResumeService.getById(id); + if(employCheckResume==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employCheckResume); + } + + /** + * 导出excel + * + * @param request + * @param employCheckResume + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployCheckResume employCheckResume) { + return super.exportXls(request, employCheckResume, EmployCheckResume.class, "简历查看表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployCheckResume.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java new file mode 100644 index 0000000..44496de --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employCheckResume.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 简历查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Data +@TableName("employ_check_resume") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_check_resume对象", description="简历查看表") +public class EmployCheckResume implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联简历id*/ + @Excel(name = "关联简历id", width = 15, dictTable = "employ_resume", dicText = "title", dicCode = "id") + @Dict(dictTable = "employ_resume", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联简历id") + private java.lang.String resumeId; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/EmployCheckResumeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/EmployCheckResumeMapper.java new file mode 100644 index 0000000..432595f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/EmployCheckResumeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employCheckResume.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 简历查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface EmployCheckResumeMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/xml/EmployCheckResumeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/xml/EmployCheckResumeMapper.xml new file mode 100644 index 0000000..8146cda --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/mapper/xml/EmployCheckResumeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/IEmployCheckResumeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/IEmployCheckResumeService.java new file mode 100644 index 0000000..af4c8ad --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/IEmployCheckResumeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employCheckResume.service; + +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 简历查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface IEmployCheckResumeService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/impl/EmployCheckResumeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/impl/EmployCheckResumeServiceImpl.java new file mode 100644 index 0000000..6b989fb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/service/impl/EmployCheckResumeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employCheckResume.service.impl; + +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import org.jeecg.modules.employCheckResume.mapper.EmployCheckResumeMapper; +import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 简历查看表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Service +public class EmployCheckResumeServiceImpl extends ServiceImpl implements IEmployCheckResumeService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/EmployCheckResumeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/EmployCheckResumeList.vue new file mode 100644 index 0000000..b762f00 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/EmployCheckResumeList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeForm.vue new file mode 100644 index 0000000..a7adeff --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.Style#Drawer.vue new file mode 100644 index 0000000..47cf7cc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.vue new file mode 100644 index 0000000..156963a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue/modules/EmployCheckResumeModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.api.ts new file mode 100644 index 0000000..3a8829a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employCheckResume/employCheckResume/list', + save='/employCheckResume/employCheckResume/add', + edit='/employCheckResume/employCheckResume/edit', + deleteOne = '/employCheckResume/employCheckResume/delete', + deleteBatch = '/employCheckResume/employCheckResume/deleteBatch', + importExcel = '/employCheckResume/employCheckResume/importExcel', + exportXls = '/employCheckResume/employCheckResume/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.data.ts new file mode 100644 index 0000000..8d61917 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResume.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联简历id', + align:"center", + dataIndex: 'resumeId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联简历id', + field: 'resumeId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_resume,title,id" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResumeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResumeList.vue new file mode 100644 index 0000000..5ed3fef --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/EmployCheckResumeList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/components/EmployCheckResumeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/components/EmployCheckResumeModal.vue new file mode 100644 index 0000000..a242dd4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/vue3/components/EmployCheckResumeModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/controller/EmployCollectionJobController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/controller/EmployCollectionJobController.java new file mode 100644 index 0000000..ab6d941 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/controller/EmployCollectionJobController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employCollectionJob.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 工作收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Api(tags="工作收藏表") +@RestController +@RequestMapping("/employCollectionJob/employCollectionJob") +@Slf4j +public class EmployCollectionJobController extends JeecgController { + @Autowired + private IEmployCollectionJobService employCollectionJobService; + + /** + * 分页列表查询 + * + * @param employCollectionJob + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "工作收藏表-分页列表查询") + @ApiOperation(value="工作收藏表-分页列表查询", notes="工作收藏表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployCollectionJob employCollectionJob, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employCollectionJob, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employCollectionJobService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employCollectionJob + * @return + */ + @AutoLog(value = "工作收藏表-添加") + @ApiOperation(value="工作收藏表-添加", notes="工作收藏表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployCollectionJob employCollectionJob) { + employCollectionJobService.save(employCollectionJob); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employCollectionJob + * @return + */ + @AutoLog(value = "工作收藏表-编辑") + @ApiOperation(value="工作收藏表-编辑", notes="工作收藏表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployCollectionJob employCollectionJob) { + employCollectionJobService.updateById(employCollectionJob); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "工作收藏表-通过id删除") + @ApiOperation(value="工作收藏表-通过id删除", notes="工作收藏表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employCollectionJobService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "工作收藏表-批量删除") + @ApiOperation(value="工作收藏表-批量删除", notes="工作收藏表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employCollectionJobService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "工作收藏表-通过id查询") + @ApiOperation(value="工作收藏表-通过id查询", notes="工作收藏表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployCollectionJob employCollectionJob = employCollectionJobService.getById(id); + if(employCollectionJob==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employCollectionJob); + } + + /** + * 导出excel + * + * @param request + * @param employCollectionJob + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployCollectionJob employCollectionJob) { + return super.exportXls(request, employCollectionJob, EmployCollectionJob.class, "工作收藏表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployCollectionJob.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java new file mode 100644 index 0000000..08a50a6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employCollectionJob.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 工作收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Data +@TableName("employ_collection_job") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_collection_job对象", description="工作收藏表") +public class EmployCollectionJob implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联工作id*/ + @Excel(name = "关联工作id", width = 15, dictTable = "employ_job", dicText = "title", dicCode = "id") + @Dict(dictTable = "employ_job", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联工作id") + private java.lang.String jobId; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/EmployCollectionJobMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/EmployCollectionJobMapper.java new file mode 100644 index 0000000..93164c9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/EmployCollectionJobMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employCollectionJob.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工作收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface EmployCollectionJobMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/xml/EmployCollectionJobMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/xml/EmployCollectionJobMapper.xml new file mode 100644 index 0000000..1bb1ed4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/mapper/xml/EmployCollectionJobMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/IEmployCollectionJobService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/IEmployCollectionJobService.java new file mode 100644 index 0000000..0fb2a6c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/IEmployCollectionJobService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employCollectionJob.service; + +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 工作收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface IEmployCollectionJobService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/impl/EmployCollectionJobServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/impl/EmployCollectionJobServiceImpl.java new file mode 100644 index 0000000..431435a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/service/impl/EmployCollectionJobServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employCollectionJob.service.impl; + +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import org.jeecg.modules.employCollectionJob.mapper.EmployCollectionJobMapper; +import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 工作收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Service +public class EmployCollectionJobServiceImpl extends ServiceImpl implements IEmployCollectionJobService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/EmployCollectionJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/EmployCollectionJobList.vue new file mode 100644 index 0000000..7febc20 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/EmployCollectionJobList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobForm.vue new file mode 100644 index 0000000..d46ade3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.Style#Drawer.vue new file mode 100644 index 0000000..a0dae85 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.vue new file mode 100644 index 0000000..85bee9f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue/modules/EmployCollectionJobModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.api.ts new file mode 100644 index 0000000..920e8bb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employCollectionJob/employCollectionJob/list', + save='/employCollectionJob/employCollectionJob/add', + edit='/employCollectionJob/employCollectionJob/edit', + deleteOne = '/employCollectionJob/employCollectionJob/delete', + deleteBatch = '/employCollectionJob/employCollectionJob/deleteBatch', + importExcel = '/employCollectionJob/employCollectionJob/importExcel', + exportXls = '/employCollectionJob/employCollectionJob/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.data.ts new file mode 100644 index 0000000..e9a4e8e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJob.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联工作id', + align:"center", + dataIndex: 'jobId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联工作id', + field: 'jobId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_job,title,id" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJobList.vue new file mode 100644 index 0000000..a36edff --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/EmployCollectionJobList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/components/EmployCollectionJobModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/components/EmployCollectionJobModal.vue new file mode 100644 index 0000000..af107e3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/vue3/components/EmployCollectionJobModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/controller/EmployCollectionResumeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/controller/EmployCollectionResumeController.java new file mode 100644 index 0000000..9edbb6f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/controller/EmployCollectionResumeController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employCollectionResume.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 简历收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Api(tags="简历收藏表") +@RestController +@RequestMapping("/employCollectionResume/employCollectionResume") +@Slf4j +public class EmployCollectionResumeController extends JeecgController { + @Autowired + private IEmployCollectionResumeService employCollectionResumeService; + + /** + * 分页列表查询 + * + * @param employCollectionResume + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "简历收藏表-分页列表查询") + @ApiOperation(value="简历收藏表-分页列表查询", notes="简历收藏表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployCollectionResume employCollectionResume, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employCollectionResume, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employCollectionResumeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employCollectionResume + * @return + */ + @AutoLog(value = "简历收藏表-添加") + @ApiOperation(value="简历收藏表-添加", notes="简历收藏表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployCollectionResume employCollectionResume) { + employCollectionResumeService.save(employCollectionResume); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employCollectionResume + * @return + */ + @AutoLog(value = "简历收藏表-编辑") + @ApiOperation(value="简历收藏表-编辑", notes="简历收藏表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployCollectionResume employCollectionResume) { + employCollectionResumeService.updateById(employCollectionResume); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "简历收藏表-通过id删除") + @ApiOperation(value="简历收藏表-通过id删除", notes="简历收藏表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employCollectionResumeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "简历收藏表-批量删除") + @ApiOperation(value="简历收藏表-批量删除", notes="简历收藏表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employCollectionResumeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "简历收藏表-通过id查询") + @ApiOperation(value="简历收藏表-通过id查询", notes="简历收藏表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployCollectionResume employCollectionResume = employCollectionResumeService.getById(id); + if(employCollectionResume==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employCollectionResume); + } + + /** + * 导出excel + * + * @param request + * @param employCollectionResume + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployCollectionResume employCollectionResume) { + return super.exportXls(request, employCollectionResume, EmployCollectionResume.class, "简历收藏表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployCollectionResume.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java new file mode 100644 index 0000000..df30519 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employCollectionResume.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 简历收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Data +@TableName("employ_collection_resume") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_collection_resume对象", description="简历收藏表") +public class EmployCollectionResume implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联简历id*/ + @Excel(name = "关联简历id", width = 15, dictTable = "employ_resume", dicText = "title", dicCode = "id") + @Dict(dictTable = "employ_resume", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联简历id") + private java.lang.String resumeId; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/EmployCollectionResumeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/EmployCollectionResumeMapper.java new file mode 100644 index 0000000..c027efb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/EmployCollectionResumeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employCollectionResume.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 简历收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface EmployCollectionResumeMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/xml/EmployCollectionResumeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/xml/EmployCollectionResumeMapper.xml new file mode 100644 index 0000000..dcda3e3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/mapper/xml/EmployCollectionResumeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/IEmployCollectionResumeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/IEmployCollectionResumeService.java new file mode 100644 index 0000000..ee70ce3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/IEmployCollectionResumeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employCollectionResume.service; + +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 简历收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface IEmployCollectionResumeService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/impl/EmployCollectionResumeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/impl/EmployCollectionResumeServiceImpl.java new file mode 100644 index 0000000..3540ad9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/service/impl/EmployCollectionResumeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employCollectionResume.service.impl; + +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employCollectionResume.mapper.EmployCollectionResumeMapper; +import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 简历收藏表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Service +public class EmployCollectionResumeServiceImpl extends ServiceImpl implements IEmployCollectionResumeService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/EmployCollectionResumeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/EmployCollectionResumeList.vue new file mode 100644 index 0000000..20088be --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/EmployCollectionResumeList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeForm.vue new file mode 100644 index 0000000..6bf6a34 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.Style#Drawer.vue new file mode 100644 index 0000000..e2b097c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.vue new file mode 100644 index 0000000..29cc49c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue/modules/EmployCollectionResumeModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.api.ts new file mode 100644 index 0000000..393cbed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employCollectionResume/employCollectionResume/list', + save='/employCollectionResume/employCollectionResume/add', + edit='/employCollectionResume/employCollectionResume/edit', + deleteOne = '/employCollectionResume/employCollectionResume/delete', + deleteBatch = '/employCollectionResume/employCollectionResume/deleteBatch', + importExcel = '/employCollectionResume/employCollectionResume/importExcel', + exportXls = '/employCollectionResume/employCollectionResume/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.data.ts new file mode 100644 index 0000000..8d61917 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResume.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联简历id', + align:"center", + dataIndex: 'resumeId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联简历id', + field: 'resumeId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_resume,title,id" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResumeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResumeList.vue new file mode 100644 index 0000000..b876350 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/EmployCollectionResumeList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/components/EmployCollectionResumeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/components/EmployCollectionResumeModal.vue new file mode 100644 index 0000000..5963cbf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/vue3/components/EmployCollectionResumeModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java new file mode 100644 index 0000000..13ef829 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employContract.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employContract.entity.EmployContract; +import org.jeecg.modules.employContract.service.IEmployContractService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 电子合同表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Api(tags="电子合同表") +@RestController +@RequestMapping("/employContract/employContract") +@Slf4j +public class EmployContractController extends JeecgController { + @Autowired + private IEmployContractService employContractService; + + /** + * 分页列表查询 + * + * @param employContract + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "电子合同表-分页列表查询") + @ApiOperation(value="电子合同表-分页列表查询", notes="电子合同表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployContract employContract, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employContract, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employContractService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employContract + * @return + */ + @AutoLog(value = "电子合同表-添加") + @ApiOperation(value="电子合同表-添加", notes="电子合同表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployContract employContract) { + employContractService.save(employContract); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employContract + * @return + */ + @AutoLog(value = "电子合同表-编辑") + @ApiOperation(value="电子合同表-编辑", notes="电子合同表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployContract employContract) { + employContractService.updateById(employContract); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "电子合同表-通过id删除") + @ApiOperation(value="电子合同表-通过id删除", notes="电子合同表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employContractService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "电子合同表-批量删除") + @ApiOperation(value="电子合同表-批量删除", notes="电子合同表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employContractService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "电子合同表-通过id查询") + @ApiOperation(value="电子合同表-通过id查询", notes="电子合同表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployContract employContract = employContractService.getById(id); + if(employContract==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employContract); + } + + /** + * 导出excel + * + * @param request + * @param employContract + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployContract employContract) { + return super.exportXls(request, employContract, EmployContract.class, "电子合同表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployContract.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java new file mode 100644 index 0000000..769119e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java @@ -0,0 +1,72 @@ +package org.jeecg.modules.employContract.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 电子合同表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Data +@TableName("employ_contract") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_contract对象", description="电子合同表") +public class EmployContract implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**合同文件*/ + @Excel(name = "合同文件", width = 15) + @ApiModelProperty(value = "合同文件") + private java.lang.String fileContract; + /**公司签署(0-未签 1-已签)*/ + @Excel(name = "公司签署(0-未签 1-已签)", width = 15) + @ApiModelProperty(value = "公司签署(0-未签 1-已签)") + private java.lang.String signCompany; + /**求职者签署(0-未签 1-已签)*/ + @Excel(name = "求职者签署(0-未签 1-已签)", width = 15) + @ApiModelProperty(value = "求职者签署(0-未签 1-已签)") + private java.lang.String signPerson; + /**关联招聘者id*/ + @Excel(name = "关联招聘者id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联招聘者id") + private java.lang.String companyId; + /**关联求职者id*/ + @Excel(name = "关联求职者id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联求职者id") + private java.lang.String personId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java new file mode 100644 index 0000000..5ebfd45 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employContract.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employContract.entity.EmployContract; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 电子合同表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface EmployContractMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/xml/EmployContractMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/xml/EmployContractMapper.xml new file mode 100644 index 0000000..55eb68d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/xml/EmployContractMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java new file mode 100644 index 0000000..1ad7b75 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employContract.service; + +import org.jeecg.modules.employContract.entity.EmployContract; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 电子合同表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +public interface IEmployContractService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java new file mode 100644 index 0000000..76b3167 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employContract.service.impl; + +import org.jeecg.modules.employContract.entity.EmployContract; +import org.jeecg.modules.employContract.mapper.EmployContractMapper; +import org.jeecg.modules.employContract.service.IEmployContractService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 电子合同表 + * @Author: jeecg-boot + * @Date: 2024-10-17 + * @Version: V1.0 + */ +@Service +public class EmployContractServiceImpl extends ServiceImpl implements IEmployContractService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue new file mode 100644 index 0000000..9f80d40 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue @@ -0,0 +1,197 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue new file mode 100644 index 0000000..2a43b74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.Style#Drawer.vue new file mode 100644 index 0000000..06ffe7b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.vue new file mode 100644 index 0000000..10fe297 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.api.ts new file mode 100644 index 0000000..312e638 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employContract/employContract/list', + save='/employContract/employContract/add', + edit='/employContract/employContract/edit', + deleteOne = '/employContract/employContract/delete', + deleteBatch = '/employContract/employContract/deleteBatch', + importExcel = '/employContract/employContract/importExcel', + exportXls = '/employContract/employContract/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts new file mode 100644 index 0000000..6ab9894 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts @@ -0,0 +1,72 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '合同文件', + align:"center", + dataIndex: 'fileContract', + slots: { customRender: 'fileSlot' }, + }, + { + title: '公司签署(0-未签 1-已签)', + align:"center", + dataIndex: 'signCompany' + }, + { + title: '求职者签署(0-未签 1-已签)', + align:"center", + dataIndex: 'signPerson' + }, + { + title: '关联招聘者id', + align:"center", + dataIndex: 'companyId_dictText' + }, + { + title: '关联求职者id', + align:"center", + dataIndex: 'personId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '合同文件', + field: 'fileContract', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '公司签署(0-未签 1-已签)', + field: 'signCompany', + component: 'Input', + }, + { + label: '求职者签署(0-未签 1-已签)', + field: 'signPerson', + component: 'Input', + }, + { + label: '关联招聘者id', + field: 'companyId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, + { + label: '关联求职者id', + field: 'personId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContractList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContractList.vue new file mode 100644 index 0000000..599f4af --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContractList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/components/EmployContractModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/components/EmployContractModal.vue new file mode 100644 index 0000000..3d85758 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/components/EmployContractModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/controller/EmployNotebookController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/controller/EmployNotebookController.java index 73d8dda..ea93061 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/controller/EmployNotebookController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/controller/EmployNotebookController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 账本表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Api(tags="账本表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/entity/EmployNotebook.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/entity/EmployNotebook.java index 5426491..25c489b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/entity/EmployNotebook.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/entity/EmployNotebook.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 账本表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Data @@ -55,8 +55,13 @@ public class EmployNotebook implements Serializable { @Excel(name = "账本类型(0-个人 1-班组)", width = 15) @ApiModelProperty(value = "账本类型(0-个人 1-班组)") private java.lang.String type; + /**账本状态(0-在建 1-已结束)*/ + @Excel(name = "账本状态(0-在建 1-已结束)", width = 15) + @ApiModelProperty(value = "账本状态(0-在建 1-已结束)") + private java.lang.String status; /**关联用户id*/ - @Excel(name = "关联用户id", width = 15) + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户id") private java.lang.String userId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/mapper/EmployNotebookMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/mapper/EmployNotebookMapper.java index 4399587..440e0c2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/mapper/EmployNotebookMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/mapper/EmployNotebookMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 账本表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface EmployNotebookMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/IEmployNotebookService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/IEmployNotebookService.java index 10b1210..0c3a198 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/IEmployNotebookService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/IEmployNotebookService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 账本表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface IEmployNotebookService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/impl/EmployNotebookServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/impl/EmployNotebookServiceImpl.java index 2fb96cf..2940e98 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/impl/EmployNotebookServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/service/impl/EmployNotebookServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 账本表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/EmployNotebookList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/EmployNotebookList.vue index 5a34efb..52db2b7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/EmployNotebookList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/EmployNotebookList.vue @@ -132,10 +132,15 @@ align:"center", dataIndex: 'type' }, + { + title:'账本状态(0-在建 1-已结束)', + align:"center", + dataIndex: 'status' + }, { title:'关联用户id', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' }, { title: '操作', @@ -173,6 +178,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'账本标题',dictCode:''}) fieldList.push({type:'string',value:'type',text:'账本类型(0-个人 1-班组)',dictCode:''}) + fieldList.push({type:'string',value:'status',text:'账本状态(0-在建 1-已结束)',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/modules/EmployNotebookForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/modules/EmployNotebookForm.vue index 9c3c972..53494bb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/modules/EmployNotebookForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue/modules/EmployNotebookForm.vue @@ -13,9 +13,14 @@ + + + + + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue3/EmployNotebook.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue3/EmployNotebook.data.ts index 132d9df..1c46f6e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue3/EmployNotebook.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNotebook/vue3/EmployNotebook.data.ts @@ -14,10 +14,15 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'type' }, + { + title: '账本状态(0-在建 1-已结束)', + align:"center", + dataIndex: 'status' + }, { title: '关联用户id', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' }, ]; //查询数据 @@ -35,9 +40,17 @@ export const formSchema: FormSchema[] = [ field: 'type', component: 'Input', }, + { + label: '账本状态(0-在建 1-已结束)', + field: 'status', + component: 'Input', + }, { label: '关联用户id', field: 'userId', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/controller/EmployResumeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/controller/EmployResumeController.java index 2995bd4..7c8269a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/controller/EmployResumeController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/controller/EmployResumeController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 求职简历表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Api(tags="求职简历表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java index 602454b..8133973 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/entity/EmployResume.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 求职简历表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Data @@ -47,6 +47,10 @@ public class EmployResume implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**求职岗位*/ + @Excel(name = "求职岗位", width = 15) + @ApiModelProperty(value = "求职岗位") + private java.lang.String title; /**头像*/ @Excel(name = "头像", width = 15) @ApiModelProperty(value = "头像") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/mapper/EmployResumeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/mapper/EmployResumeMapper.java index 8cf2a1f..2e78504 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/mapper/EmployResumeMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/mapper/EmployResumeMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 求职简历表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface EmployResumeMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/IEmployResumeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/IEmployResumeService.java index b3c05b8..6bc167d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/IEmployResumeService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/IEmployResumeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 求职简历表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ public interface IEmployResumeService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/impl/EmployResumeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/impl/EmployResumeServiceImpl.java index e61bea8..00d9846 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/impl/EmployResumeServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/service/impl/EmployResumeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 求职简历表 * @Author: jeecg-boot - * @Date: 2024-10-16 + * @Date: 2024-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/EmployResumeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/EmployResumeList.vue index 52a34ec..ab38cad 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/EmployResumeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employResume/vue/EmployResumeList.vue @@ -54,6 +54,9 @@ 无图片 +