MVP1.4

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/BusinessEmployeeExtendListVO.java

@@ -20,12 +20,18 @@ import java.time.LocalDateTime;
 @ToString
 public class BusinessEmployeeExtendListVO implements Serializable {
     /**
-     * 人员表主键
+     * 项目人员表主键
      */
-    @Schema(description = "人员表主键", name = "id")
+    @Schema(description = "项目人员表主键", name = "id")
     private String id;
 
     /**
+     * 人员表主键
+     */
+    @Schema(description = "人员表主键", name = "empId")
+    private String empId;
+
+	/**
      * 人员拓展表主键
      */
     @Schema(description = "人员拓展表主键", name = "extendId")

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeBusinessVo.java

@@ -31,6 +31,11 @@ public class EmployeeBusinessVo {
     @ExcelAttribute(name = "主键", maxLength = 32)
     @Schema(description = "主键", name = "id")
     private String id;
+	/**
+	 * 人员表主键
+	 */
+	@Schema(description = "人员表主键", name = "empId")
+	private String empId;
     /**
      * 姓名
      */

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1622,6 +1622,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 	private void initEmpBusinessInfo(TEmployeeProject employeeInfo, TEmployeeInfo employee
 			, EmployeeBusinessVo businessVo, TBusinessEmployeeExtendInfo tBusinessEmployeeExtendInfo) {
+		businessVo.setEmpId(employeeInfo.getEmpId());
 		businessVo.setSettleDomain(employeeInfo.getDeptId());
 		businessVo.setBelongUnit(employeeInfo.getUnitId());
 		if (employee != null) {

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -879,6 +879,7 @@
 	<select id="getTEmployeeBusinessPage" resultMap="businessEmployeeExtendListVO">
 		SELECT
 		a.ID,
+		a.EMP_ID as empId,
 		b.ID as extendId,
 		a.EMP_NAME,
 		a.EMP_IDCARD,