更改

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

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 {
+
+}

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;
 
 }

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.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo;
-import com.yxt.anrui.oa.biz.oaform.FormCommon;
 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(非驻外人员申请宿舍) <br/>
- * File: AdNoexpatriatesHostelApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyVo <br/>
- * Description: 非驻外人员申请宿舍申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-24 15:12:38 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "非驻外人员申请宿舍申请 视图数据详情", description = "非驻外人员申请宿舍申请 视图数据详情")
 public class AdNoexpatriatesHostelApplyDetailsVo implements Vo {
 
-    @ApiModelProperty("申请人岗位")
+    @ApiModelProperty("备注")
-    private String jobValue;
-    @ApiModelProperty("申请事由及详情")
     private String remarks;
 
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
     @ApiModelProperty("附件")
     private List<String> appes = new ArrayList<>();
+
+    private List<AdNoexpatriatesHostelListDetailVo> list = new ArrayList<>();
 }

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("申请人岗位")
+    @ApiModelProperty("备注")
-    private FormCommon jobObj;
-    private String jobKey;
-    private String jobValue;
-    @ApiModelProperty("申请事由及详情")
     private String remarks;
     @ApiModelProperty("基础表单sid")
     private String formSid; // 基础表单sid
@@ -69,4 +67,6 @@ public class AdNoexpatriatesHostelApplyDto extends OaFormDto {
     private List<String> files = new ArrayList<>();
     @ApiModelProperty("文件")
     private List<String> appes = new ArrayList<>();
+
+    private List<AdNoexpatriatesHostelDetailVo> list = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml

@@ -7,9 +7,23 @@
     <select id="details"
             resultType="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
         select sid,
-               remarks,
+               remarks
-               postName jobValue
+        from ad_noexpatriates_hostel_apply
-        from ad_expatriates_home_apply
         where sid = #{sid}
     </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo">
+        select sid,
+               postName jobValue,
+               remarks
+        from ad_noexpatriates_hostel_detail
+        where mainSid = #{sid}
+    </select>
 </mapper>

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<AdNoex
     private OaFormService oaFormService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private AdNoexpatriatesHostelDetailService adNoexpatriatesHostelDetailService;
 
     public ResultBean<AdNoexpatriatesHostelApplyVo> getSaveInit(String userSid, String orgPath) {
         ResultBean<AdNoexpatriatesHostelApplyVo> rb = ResultBean.fireFail();
@@ -80,10 +85,14 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
         adNoexpatriatesHostelApplyVo.setOrgSidPath(orgSidPath);
         adNoexpatriatesHostelApplyVo.setCreateBySid(oaForm.getCreateBySid());
         BeanUtil.copyProperties(adNoexpatriatesHostelApply, adNoexpatriatesHostelApplyVo);
-        adNoexpatriatesHostelApplyVo.setJobKey(adNoexpatriatesHostelApply.getPostSid());
+        List<AdNoexpatriatesHostelDetailVo> list = adNoexpatriatesHostelDetailService.getUpdateInit(sid);
-        adNoexpatriatesHostelApplyVo.setJobValue(adNoexpatriatesHostelApply.getPostName());
+        list.removeAll(Collections.singleton(null));
-        FormCommon jobObj = FormCommon.of(adNoexpatriatesHostelApplyVo.getJobKey(), adNoexpatriatesHostelApplyVo.getJobValue());
+        if (!list.isEmpty()) {
-        adNoexpatriatesHostelApplyVo.setJobObj(jobObj);
+            list.stream().forEach(details -> {
+                FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue());
+                details.setJobObj(jobObj);
+            });
+        }
         List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
         adNoexpatriatesHostelApplyVo.setFiles(files);
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
@@ -97,6 +106,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
         String sid = dto.getSid();
         List<String> files = dto.getFiles();
         List<String> appes = dto.getAppes();
+        List<AdNoexpatriatesHostelDetailVo> list = dto.getList();
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdNoexpatriatesHostelApply entity = new AdNoexpatriatesHostelApply();
@@ -119,6 +129,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             baseMapper.updateById(entity);
         }
+        adNoexpatriatesHostelDetailService.saveDetails(list, sid);
         // 处理附件
         saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
         saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyVo.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
 
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
+import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo;
 import com.yxt.anrui.oa.biz.oaform.FormCommon;
 import com.yxt.common.core.vo.Vo;
 
@@ -45,11 +47,7 @@ public class AdNoexpatriatesHostelApplyVo implements Vo {
     private String orgSidPath;
     private String createBySid;
 
-    @ApiModelProperty("申请人岗位")
+    @ApiModelProperty("备注")
-    private FormCommon jobObj;
-    private String jobKey;
-    private String jobValue;
-    @ApiModelProperty("申请事由及详情")
     private String remarks;
 
     @ApiModelProperty("图片")
@@ -57,6 +55,8 @@ public class AdNoexpatriatesHostelApplyVo implements Vo {
     @ApiModelProperty("附件")
     private List<String> appes = new ArrayList<>();
 
+    private List<AdNoexpatriatesHostelDetailVo> list = new ArrayList<>();
+
     private String taskId;
     @ApiModelProperty("流程实例id")
     private String procInsId;

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; // 申请人岗位名称
+
+}

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;
+}

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<AdNoexpatriatesHostelDetail> {
+
+    List<AdNoexpatriatesHostelDetailVo> getUpdateInit(String sid);
+
+    @Select("select * from ad_expatriates_detail where mainSid = #{mainSid}")
+    List<AdNoexpatriatesHostelDetail> selectByMainSid(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="getUpdateInit"
+            resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo">
+        select sid,
+               postSid  jobKey,
+               postName jobValue,
+               remarks
+        from ad_noexpatriates_hostel_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

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<AdNoexpatriatesHostelDetailMapper, AdNoexpatriatesHostelDetail> {
+
+    public List<AdNoexpatriatesHostelDetailVo> getUpdateInit(String sid) {
+        return baseMapper.getUpdateInit(sid);
+    }
+
+    public void saveDetails(List<AdNoexpatriatesHostelDetailVo> list, String sid) {
+        //根据sid查询明细并删除
+        List<AdNoexpatriatesHostelDetail> 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);
+            });
+        }
+    }
+}

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;
+}

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;
+}