diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java index 5f0514e..232580f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java @@ -146,4 +146,10 @@ public class EmployJob implements Serializable { @TableField(exist = false) private List employOrder; + + + @TableField(exist = false) + private java.lang.String categoryOneName; + @TableField(exist = false) + private java.lang.String categoryTwoName; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/JobController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/JobController.java index afb5aa9..4c7b295 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/JobController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/JobController.java @@ -36,8 +36,8 @@ public class JobController { //工作信息-根据Id查看工作详情id @ApiOperation(value="工作信息-根据Id查看工作详情", notes="工作信息-根据Id查看工作详情") @RequestMapping(value = "/queryJobById", method = {RequestMethod.GET}) - public Result queryJobById(@RequestHeader("X-Access-Token")String token, String id){ - return jobService.queryJobById(token, id); + public Result queryJobById(@RequestHeader("X-Access-Token")String token, String id, String edit){ + return jobService.queryJobById(token, id, edit); } //工作信息-我的招工 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java index 43f87da..2c1f768 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java @@ -14,7 +14,7 @@ public interface JobService { public Result queryJobList(EmployJob employJob, PageBean pageBean); //工作信息-根据Id查看工作详情 - public Result queryJobById(String token, String jobId); + public Result queryJobById(String token, String jobId, String edit); public Result stop(String token, String jobId); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java index 481ab61..a5f31db 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -157,7 +157,7 @@ public class JobServiceImpl implements JobService { //工作信息-根据Id查看工作详情 @Override - public Result queryJobById(String token, String jobId) { + public Result queryJobById(String token, String jobId, String edit) { // //权限验证 // HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -174,9 +174,16 @@ public class JobServiceImpl implements JobService { //分类信息 EmployCategory categoryOne = employCategoryService.getById(job.getCategoryOne()); - job.setCategoryOne(categoryOne.getName()); + EmployCategory categoryTwo = employCategoryService.getById(job.getCategoryTwo()); - job.setCategoryTwo(categoryTwo.getName()); + + if (edit != null){ + job.setCategoryTwoName(categoryTwo.getName()); + job.setCategoryOneName(categoryOne.getName()); + }else { + job.setCategoryOne(categoryOne.getName()); + job.setCategoryTwo(categoryTwo.getName()); + } //结算方式