更改

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java

@@ -69,7 +69,7 @@ public class AdExpatriatesApplyRest {
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
-        adExpatriatesApplyService.delBySids(sids);
+        adExpatriatesApplyService.delAll(sids);
         return rb.success();
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesDetailRest.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/adexpatriatesdetail")
+public class AdExpatriatesDetailRest {
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.adexpatriatesapply;
 
 
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
 import com.yxt.anrui.oa.biz.oaform.OaFormDto;
 import com.yxt.common.core.dto.Dto;
 
@@ -65,4 +66,6 @@ public class AdExpatriatesApplyDto extends OaFormDto {
     private List<String> files = new ArrayList<>();
     @ApiModelProperty("文件")
     private List<String> appes = new ArrayList<>();
+
+    private List<AdExpatriatesDetailDto> adExpatriatesDetailList = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java

@@ -49,4 +49,6 @@ import org.apache.ibatis.annotations.Param;
 public interface AdExpatriatesApplyMapper extends BaseMapper<AdExpatriatesApply> {
 
 	IPage<AdExpatriatesApplyVo> selectPageVo(IPage<AdExpatriatesApply> page, @Param(Constants.WRAPPER) Wrapper<AdExpatriatesApply> qw);
+
+	int selectBySid(String join);
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml

@@ -6,10 +6,6 @@
 	<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.adexpatriatesapply.AdExpatriatesApplyVo">
 		SELECT ae.sid,
 		ae.remarks,
-		ae.expatriatesPost,
-		ae.expatriatesHomeAddress,
-		ae.expatriatesWorkAddress,
-		ae.expatriatesDate,
 		ae.formSid,
 		ofm.billNo,
 		ofm.createByName,
@@ -33,4 +29,12 @@
 			${ew.sqlSegment}
 		</where>
 	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM ad_expatriates_apply ae
+				 left join oa_form ofm on ae.formSid = ofm.sid
+		WHERE ofm.nodeState != '待提交'
+          and find_in_set(oa.sid, #{list})
+	</select>
 </mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.oa.biz.adexpatriatesapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailService;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
 import com.yxt.anrui.oa.biz.oaform.OaFormService;
@@ -57,6 +60,8 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
     private OaAppendixService oaAppendixService;
     @Autowired
     private OaFormService oaFormService;
+    @Autowired
+    private AdExpatriatesDetailService adExpatriatesDetailService;
 
     public PagerVo<AdExpatriatesApplyVo> listPageVo(PagerQuery<AdExpatriatesApplyQuery> pq) {
         AdExpatriatesApplyQuery query = pq.getParams();
@@ -77,7 +82,7 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
         String sid = dto.getSid();
         List<String> files = dto.getFiles();
         List<String> appes = dto.getAppes();
-
+        List<AdExpatriatesDetailDto> adExpatriatesDetailList = dto.getAdExpatriatesDetailList();
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdExpatriatesApply entity = new AdExpatriatesApply();
@@ -94,11 +99,23 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
             entity.setFormSid(resultBean.getData());
             baseMapper.insert(entity);
             sid = entity.getSid();
+            //保存认定人员列表信息
+            for (AdExpatriatesDetailDto adExpatriatesDetailDto : adExpatriatesDetailList) {
+                adExpatriatesDetailDto.setMainSid(sid);
+                adExpatriatesDetailService.insertByDto(adExpatriatesDetailDto);
+            }
         } else {
             // 更新操作
             AdExpatriatesApply entity = fetchBySid(sid);
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             baseMapper.updateById(entity);
+            //删除相关认定人员列表信息
+            adExpatriatesDetailService.delByMainSid(sid);
+            //保存认定人员列表信息
+            for (AdExpatriatesDetailDto adExpatriatesDetailDto : adExpatriatesDetailList) {
+                adExpatriatesDetailDto.setMainSid(sid);
+                adExpatriatesDetailService.insertByDto(adExpatriatesDetailDto);
+            }
         }
         // 处理附件
         saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
@@ -116,6 +133,8 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
         AdExpatriatesApply entity = fetchBySid(sid);
         AdExpatriatesApplyVo vo = new AdExpatriatesApplyVo();
         BeanUtil.copyProperties(entity, vo);
+        List<AdExpatriatesDetailVo> adExpatriatesDetailList = adExpatriatesDetailService.fetchByMainSid(sid);
+        vo.setAdExpatriatesDetailList(adExpatriatesDetailList);
         return vo;
     }
 
@@ -224,4 +243,15 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
         query.setFormVariables(formVariables);
         return oaFormService.getPreviousNodesForReject(query);
     }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        return rb.success();
+    }
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.oa.biz.adexpatriatesapply;
 
 
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
+import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -96,4 +98,6 @@ public class AdExpatriatesApplyVo implements Vo {
     private List<String> files = new ArrayList<>();
     @ApiModelProperty("附件")
     private List<String> appes = new ArrayList<>();
+
+    private List<AdExpatriatesDetailVo> adExpatriatesDetailList = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+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;
+
+/**
+ * Project: yxt-oa(认定人员) <br/>
+ * File: AdExpatriatesDetail.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail <br/>
+ * Description: 驻外人员认定列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "驻外人员认定列表", description = "驻外人员认定列表")
+@TableName("ad_expatriates_detail")
+public class AdExpatriatesDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("驻外人员sid")
+    private String expatriatesSid; // 驻外人员sid
+    @ApiModelProperty("驻外人员姓名")
+    private String expatriatesName; // 驻外人员姓名
+    @ApiModelProperty("驻外人员部门sid")
+    private String expatriatesDeptSid; // 驻外人员部门sid
+    @ApiModelProperty("驻外人员部门名称")
+    private String expatriatesDeptName; // 驻外人员部门名称
+    @ApiModelProperty("驻外人员职位sid")
+    private String expatriatesPostSid; // 驻外人员职位sid
+    @ApiModelProperty("驻外人员职位名称")
+    private String expatriatesPostName; // 驻外人员职位名称
+    @ApiModelProperty("驻外人员家庭常住地址")
+    private String expatriatesHomeAddress; // 驻外人员家庭常住地址
+    @ApiModelProperty("驻外人员工作地址")
+    private String expatriatesWorkAddress; // 驻外人员工作地址
+    @ApiModelProperty("驻外人员开始驻外时间")
+    private String expatriatesDate; // 驻外人员开始驻外时间
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-oa(认定人员) <br/>
+ * File: AdExpatriatesDetailDto.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto <br/>
+ * Description: 驻外人员认定列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象")
+public class AdExpatriatesDetailDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("驻外人员sid")
+    private String expatriatesSid; // 驻外人员sid
+    @ApiModelProperty("驻外人员姓名")
+    private String expatriatesName; // 驻外人员姓名
+    @ApiModelProperty("驻外人员部门sid")
+    private String expatriatesDeptSid; // 驻外人员部门sid
+    @ApiModelProperty("驻外人员部门名称")
+    private String expatriatesDeptName; // 驻外人员部门名称
+    @ApiModelProperty("驻外人员职位sid")
+    private String expatriatesPostSid; // 驻外人员职位sid
+    @ApiModelProperty("驻外人员职位名称")
+    private String expatriatesPostName; // 驻外人员职位名称
+    @ApiModelProperty("驻外人员家庭常住地址")
+    private String expatriatesHomeAddress; // 驻外人员家庭常住地址
+    @ApiModelProperty("驻外人员工作地址")
+    private String expatriatesWorkAddress; // 驻外人员工作地址
+    @ApiModelProperty("驻外人员开始驻外时间")
+    private String expatriatesDate; // 驻外人员开始驻外时间
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java

@@ -0,0 +1,43 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AdExpatriatesDetailMapper extends BaseMapper<AdExpatriatesDetail> {
+
+    @Delete("delete from ad_expatriates_detail where mainSid = #{mainSid}")
+    void delByMainSid(String mainSid);
+
+    @Select("select * from ad_expatriates_detail where mainSid = #{mainSid}")
+    List<AdExpatriatesDetailVo> fetchByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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.adexpatriatesdetail.AdExpatriatesDetailMapper">
+
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-oa(认定人员) <br/>
+ * File: AdExpatriatesDetailQuery.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailQuery <br/>
+ * Description: 驻外人员认定列表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "驻外人员认定列表 查询条件", description = "驻外人员认定列表 查询条件")
+public class AdExpatriatesDetailQuery implements Query {
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("驻外人员sid")
+    private String expatriatesSid; // 驻外人员sid
+    @ApiModelProperty("驻外人员姓名")
+    private String expatriatesName; // 驻外人员姓名
+    @ApiModelProperty("驻外人员部门sid")
+    private String expatriatesDeptSid; // 驻外人员部门sid
+    @ApiModelProperty("驻外人员部门名称")
+    private String expatriatesDeptName; // 驻外人员部门名称
+    @ApiModelProperty("驻外人员职位sid")
+    private String expatriatesPostSid; // 驻外人员职位sid
+    @ApiModelProperty("驻外人员职位名称")
+    private String expatriatesPostName; // 驻外人员职位名称
+    @ApiModelProperty("驻外人员家庭常住地址")
+    private String expatriatesHomeAddress; // 驻外人员家庭常住地址
+    @ApiModelProperty("驻外人员工作地址")
+    private String expatriatesWorkAddress; // 驻外人员工作地址
+    @ApiModelProperty("驻外人员开始驻外时间")
+    private String expatriatesDate; // 驻外人员开始驻外时间
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java

@@ -0,0 +1,51 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AdExpatriatesDetailService extends MybatisBaseService<AdExpatriatesDetailMapper, AdExpatriatesDetail> {
+
+    public void insertByDto(AdExpatriatesDetailDto dto) {
+        AdExpatriatesDetail entity = new AdExpatriatesDetail();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void delByMainSid(String mainSid) {
+        baseMapper.delByMainSid(mainSid);
+    }
+
+    public List<AdExpatriatesDetailVo> fetchByMainSid(String mainSid) {
+        return baseMapper.fetchByMainSid(mainSid);
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adexpatriatesdetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-oa(认定人员) <br/>
+ * File: AdExpatriatesDetailVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
+ * Description: 驻外人员认定列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
+public class AdExpatriatesDetailVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("驻外人员sid")
+    private String expatriatesSid; // 驻外人员sid
+    @ApiModelProperty("驻外人员姓名")
+    private String expatriatesName; // 驻外人员姓名
+    @ApiModelProperty("驻外人员部门sid")
+    private String expatriatesDeptSid; // 驻外人员部门sid
+    @ApiModelProperty("驻外人员部门名称")
+    private String expatriatesDeptName; // 驻外人员部门名称
+    @ApiModelProperty("驻外人员职位sid")
+    private String expatriatesPostSid; // 驻外人员职位sid
+    @ApiModelProperty("驻外人员职位名称")
+    private String expatriatesPostName; // 驻外人员职位名称
+    @ApiModelProperty("驻外人员家庭常住地址")
+    private String expatriatesHomeAddress; // 驻外人员家庭常住地址
+    @ApiModelProperty("驻外人员工作地址")
+    private String expatriatesWorkAddress; // 驻外人员工作地址
+    @ApiModelProperty("驻外人员开始驻外时间")
+    private String expatriatesDate; // 驻外人员开始驻外时间
+
+}