更改

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

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<String> appes = new ArrayList<>();
 
-    private List<AdNoexpatriatesHostelDetailVo> list = new ArrayList<>();
+    private List<AdNoexpatriatesHostelDetailDto> list = new ArrayList<>();
 }

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

@@ -1,8 +1,8 @@
 <?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.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
 
     <select id="details"
             resultType="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
@@ -12,15 +12,20 @@
         where sid = #{sid}
     </select>
 
-    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
+    <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"
+        <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 id="selectList"
+            resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo">
         select sid,
+               userName userValue,
+               deptName deptValue,
                postName jobValue,
                remarks
         from ad_noexpatriates_hostel_detail

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<AdNoex
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             list.stream().forEach(details -> {
+                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<AdNoex
         String sid = dto.getSid();
         List<String> files = dto.getFiles();
         List<String> appes = dto.getAppes();
-        List<AdNoexpatriatesHostelDetailVo> list = dto.getList();
+        List<AdNoexpatriatesHostelDetailDto> list = dto.getList();
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdNoexpatriatesHostelApply entity = new AdNoexpatriatesHostelApply();

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

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;

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

@@ -7,6 +7,10 @@
     <select id="getUpdateInit"
             resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo">
         select sid,
+               userSid  userKey,
+               userName userValue,
+               deptSid  deptKey,
+               deptName deptValue,
                postSid  jobKey,
                postName jobValue,
                remarks

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

@@ -40,7 +40,7 @@ public class AdNoexpatriatesHostelDetailService extends MybatisBaseService<AdNoe
         return baseMapper.getUpdateInit(sid);
     }
 
-    public void saveDetails(List<AdNoexpatriatesHostelDetailVo> list, String sid) {
+    public void saveDetails(List<AdNoexpatriatesHostelDetailDto> list, String sid) {
         //根据sid查询明细并删除
         List<AdNoexpatriatesHostelDetail> list2 = baseMapper.selectByMainSid(sid);
         list2.removeAll(Collections.singleton(null));
@@ -54,6 +54,10 @@ public class AdNoexpatriatesHostelDetailService extends MybatisBaseService<AdNoe
             list.stream().forEach(details -> {
                 AdNoexpatriatesHostelDetail adNoexpatriatesHostelDetail = new AdNoexpatriatesHostelDetail();
                 BeanUtil.copyProperties(details, adNoexpatriatesHostelDetail);
+                adNoexpatriatesHostelDetail.setUserSid(details.getUserKey());
+                adNoexpatriatesHostelDetail.setUserName(details.getUserValue());
+                adNoexpatriatesHostelDetail.setDeptSid(details.getDeptKey());
+                adNoexpatriatesHostelDetail.setDeptName(details.getDeptValue());
                 adNoexpatriatesHostelDetail.setPostSid(details.getJobKey());
                 adNoexpatriatesHostelDetail.setPostName(details.getJobValue());
                 adNoexpatriatesHostelDetail.setMainSid(sid);

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

@@ -40,7 +40,15 @@ public class AdNoexpatriatesHostelDetailVo implements Vo {
 
     @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;

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

@@ -25,6 +25,7 @@
  *********************************************************/
 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.ApiModelProperty;
 import lombok.Data;
@@ -36,6 +37,10 @@ public class AdNoexpatriatesHostelListDetailVo implements Vo {
 
     @ApiModelProperty("申请事由及详情")
     private String remarks;
-    @ApiModelProperty("申请人岗位")
-    private String JobValue;
+    @ApiModelProperty("人员")
+    private String userValue;
+    @ApiModelProperty("部门")
+    private String deptValue;
+    @ApiModelProperty("岗位")
+    private String jobValue;
 }