From 192ea636a6a8c74aa9b4de341d565418870b3287 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 5 Feb 2025 11:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/api/AdNoexpatriatesHostelApplyRest.java | 1 + .../AdNoexpatriatesHostelApplyDto.java | 3 ++- .../AdNoexpatriatesHostelApplyMapper.xml | 15 ++++++++++----- .../AdNoexpatriatesHostelApplyService.java | 7 ++++++- .../AdNoexpatriatesHostelDetail.java | 16 ++++++++++++---- .../AdNoexpatriatesHostelDetailDto.java | 10 +++++++++- .../AdNoexpatriatesHostelDetailMapper.xml | 4 ++++ .../AdNoexpatriatesHostelDetailService.java | 6 +++++- .../AdNoexpatriatesHostelDetailVo.java | 10 +++++++++- .../AdNoexpatriatesHostelListDetailVo.java | 9 +++++++-- 10 files changed, 65 insertions(+), 16 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java index 5589e45413..a4fe928cff 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java @@ -95,6 +95,7 @@ public class AdNoexpatriatesHostelApplyRest { public ResultBean reject(@Valid @RequestBody TaskDto dto) { return adNoexpatriatesHostelApplyService.reject(dto); } + @ApiOperation("获取流程操作标题") @GetMapping("/getFlowOperateTitle") @ResponseBody diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java index 8d352f4a4f..35e8b5cda5 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java @@ -27,6 +27,7 @@ package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; +import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailDto; import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo; import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.anrui.oa.biz.oaform.OaFormDto; @@ -68,5 +69,5 @@ public class AdNoexpatriatesHostelApplyDto extends OaFormDto { @ApiModelProperty("文件") private List appes = new ArrayList<>(); - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml index eb0116b51e..52090cbe47 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml @@ -1,8 +1,8 @@ - - + + - + - - select sid, + userName userValue, + deptName deptValue, postName jobValue, remarks from ad_noexpatriates_hostel_detail diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java index 2a8b5e4bec..715a071374 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java @@ -27,6 +27,7 @@ package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo; +import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailDto; import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailService; import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; @@ -89,6 +90,10 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService { + FormCommon userObj = FormCommon.of(details.getUserKey(), details.getUserValue()); + details.setUserObj(userObj); + FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue()); + details.setDeptObj(deptObj); FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue()); details.setJobObj(jobObj); }); @@ -106,7 +111,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService files = dto.getFiles(); List appes = dto.getAppes(); - List list = dto.getList(); + List list = dto.getList(); if (StringUtils.isBlank(sid)) { // 新建操作 AdNoexpatriatesHostelApply entity = new AdNoexpatriatesHostelApply(); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java index 529c28deb9..823852e29f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java @@ -38,9 +38,17 @@ public class AdNoexpatriatesHostelDetail extends BaseEntity { @ApiModelProperty("申请sid") private String mainSid; - @ApiModelProperty("申请人岗位sid") - private String postSid; // 申请人岗位sid - @ApiModelProperty("申请人岗位名称") - private String postName; // 申请人岗位名称 + @ApiModelProperty("人员sid") + private String userSid; + @ApiModelProperty("人员姓名") + private String userName; + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门名称") + private String deptName; + @ApiModelProperty("岗位sid") + private String postSid; + @ApiModelProperty("岗位名称") + private String postName; } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java index 13f48fb2cd..8ac399ce3e 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java @@ -38,7 +38,15 @@ public class AdNoexpatriatesHostelDetailDto implements Dto { @ApiModelProperty("申请事由及详情") private String remarks; - @ApiModelProperty("申请人职位") + @ApiModelProperty("人员") + private FormCommon userObj; + private String userKey; + private String userValue; + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("岗位") private FormCommon jobObj; private String jobKey; private String jobValue; diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml index b114b5b467..4618783da7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml @@ -7,6 +7,10 @@