diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesHomeApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesHomeApplyRest.java
index f8cabe15e1..7ebe3949a2 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesHomeApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesHomeApplyRest.java
@@ -103,6 +103,7 @@ public class AdExpatriatesHomeApplyRest {
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adExpatriatesHomeApplyService.reject(dto);
}
+
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelDetailRest.java
new file mode 100644
index 0000000000..cc6b46f985
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelDetailRest.java
@@ -0,0 +1,36 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "非驻外人员申请宿舍列表")
+@RestController
+@RequestMapping("v1/adnoexpatriateshosteldetail")
+public class AdNoexpatriatesHostelDetailRest {
+
+}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApply.java
index a8d5113ae3..d7e0af45be 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApply.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApply.java
@@ -37,13 +37,9 @@ import lombok.Data;
public class AdNoexpatriatesHostelApply extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("申请人岗位sid")
- private String postSid; // 申请人岗位sid
- @ApiModelProperty("申请人岗位名称")
- private String postName; // 申请人岗位名称
@ApiModelProperty("基础表单sid")
- private String formSid; // 基础表单sid
+ private String formSid;
@ApiModelProperty("关联审批sid列表,英文逗号分隔")
- private String linkFormSids; // 关联审批sid列表,英文逗号分隔
+ private String linkFormSids;
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDetailsVo.java
index 2f26e6d26d..26d6f9a560 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDetailsVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDetailsVo.java
@@ -25,8 +25,7 @@
*********************************************************/
package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
-
-import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@@ -36,30 +35,17 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
-/**
- * Project: yxt-oa(非驻外人员申请宿舍)
- * File: AdNoexpatriatesHostelApplyVo.java
- * Class: com.yxt.anrui.oa.api.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyVo
- * Description: 非驻外人员申请宿舍申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-24 15:12:38
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "非驻外人员申请宿舍申请 视图数据详情", description = "非驻外人员申请宿舍申请 视图数据详情")
public class AdNoexpatriatesHostelApplyDetailsVo implements Vo {
- @ApiModelProperty("申请人岗位")
- private String jobValue;
- @ApiModelProperty("申请事由及详情")
+ @ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("图片")
private List files = new ArrayList<>();
@ApiModelProperty("附件")
private List appes = 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/AdNoexpatriatesHostelApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java
index fc110d5d86..8d352f4a4f 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
@@ -26,6 +26,8 @@
package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
+import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import com.yxt.common.core.dto.Dto;
@@ -54,11 +56,7 @@ import java.util.List;
@ApiModel(value = "非驻外人员申请宿舍申请 数据传输对象", description = "非驻外人员申请宿舍申请 数据传输对象")
public class AdNoexpatriatesHostelApplyDto extends OaFormDto {
- @ApiModelProperty("申请人岗位")
- private FormCommon jobObj;
- private String jobKey;
- private String jobValue;
- @ApiModelProperty("申请事由及详情")
+ @ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("基础表单sid")
private String formSid; // 基础表单sid
@@ -69,4 +67,6 @@ public class AdNoexpatriatesHostelApplyDto extends OaFormDto {
private List files = new ArrayList<>();
@ApiModelProperty("文件")
private List appes = 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 7318716bbb..eb0116b51e 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
@@ -7,9 +7,23 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
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 c69db17545..2a8b5e4bec 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
@@ -26,6 +26,9 @@
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.AdNoexpatriatesHostelDetailService;
+import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.*;
import com.yxt.anrui.oa.biz.oaform.flowable.*;
@@ -54,6 +57,8 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService getSaveInit(String userSid, String orgPath) {
ResultBean rb = ResultBean.fireFail();
@@ -80,10 +85,14 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService list = adNoexpatriatesHostelDetailService.getUpdateInit(sid);
+ list.removeAll(Collections.singleton(null));
+ if (!list.isEmpty()) {
+ list.stream().forEach(details -> {
+ FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue());
+ details.setJobObj(jobObj);
+ });
+ }
List files = oaAppendixService.selectByLinkSid(sid, "图片");
adNoexpatriatesHostelApplyVo.setFiles(files);
List appes = oaAppendixService.selectByLinkSid(sid, "文件");
@@ -97,6 +106,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService files = dto.getFiles();
List appes = dto.getAppes();
+ List list = dto.getList();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdNoexpatriatesHostelApply entity = new AdNoexpatriatesHostelApply();
@@ -119,6 +129,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService appes = new ArrayList<>();
+ private List list = new ArrayList<>();
+
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
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
new file mode 100644
index 0000000000..529c28deb9
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java
@@ -0,0 +1,46 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("ad_noexpatriates_hostel_detail")
+public class AdNoexpatriatesHostelDetail extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("申请sid")
+ private String mainSid;
+ @ApiModelProperty("申请人岗位sid")
+ private String postSid; // 申请人岗位sid
+ @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
new file mode 100644
index 0000000000..13f48fb2cd
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java
@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "非驻外人员申请宿舍列表 数据传输对象", description = "非驻外人员申请宿舍列表 数据传输对象")
+public class AdNoexpatriatesHostelDetailDto implements Dto {
+
+ @ApiModelProperty("申请事由及详情")
+ private String remarks;
+ @ApiModelProperty("申请人职位")
+ private FormCommon jobObj;
+ private String jobKey;
+ private String jobValue;
+}
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.java
new file mode 100644
index 0000000000..3f1f093cf8
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.java
@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AdNoexpatriatesHostelDetailMapper extends BaseMapper {
+
+ List getUpdateInit(String sid);
+
+ @Select("select * from ad_expatriates_detail where mainSid = #{mainSid}")
+ List selectByMainSid(String sid);
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..b114b5b467
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailService.java
new file mode 100644
index 0000000000..f7f7992937
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailService.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetail;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AdNoexpatriatesHostelDetailService extends MybatisBaseService {
+
+ public List getUpdateInit(String sid) {
+ return baseMapper.getUpdateInit(sid);
+ }
+
+ public void saveDetails(List list, String sid) {
+ //根据sid查询明细并删除
+ List list2 = baseMapper.selectByMainSid(sid);
+ list2.removeAll(Collections.singleton(null));
+ if (!list2.isEmpty()) {
+ list2.stream().forEach(v -> {
+ deleteBySid(v.getSid());
+ });
+ }
+ list.removeAll(Collections.singleton(null));
+ if (!list.isEmpty()) {
+ list.stream().forEach(details -> {
+ AdNoexpatriatesHostelDetail adNoexpatriatesHostelDetail = new AdNoexpatriatesHostelDetail();
+ BeanUtil.copyProperties(details, adNoexpatriatesHostelDetail);
+ adNoexpatriatesHostelDetail.setPostSid(details.getJobKey());
+ adNoexpatriatesHostelDetail.setPostName(details.getJobValue());
+ adNoexpatriatesHostelDetail.setMainSid(sid);
+ baseMapper.insert(adNoexpatriatesHostelDetail);
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailVo.java
new file mode 100644
index 0000000000..a06edce090
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailVo.java
@@ -0,0 +1,47 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "非驻外人员申请宿舍列表 视图数据对象", description = "非驻外人员申请宿舍列表 视图数据对象")
+public class AdNoexpatriatesHostelDetailVo implements Vo {
+
+ private String sid;
+
+ @ApiModelProperty("申请事由及详情")
+ private String remarks;
+ @ApiModelProperty("申请人职位")
+ private FormCommon jobObj;
+ private String jobKey;
+ private String jobValue;
+}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelListDetailVo.java
new file mode 100644
index 0000000000..5fc5fa7d5c
--- /dev/null
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelListDetailVo.java
@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdNoexpatriatesHostelListDetailVo implements Vo {
+
+ private String sid;
+
+ @ApiModelProperty("申请事由及详情")
+ private String remarks;
+ @ApiModelProperty("申请人岗位")
+ private String JobValue;
+}