人员档案附件打包下载开发结束未联调 fxj 2024-09-11

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAttaInfo.java

@@ -80,4 +80,15 @@ public class TAttaInfo  extends BaseEntity {
 	@Schema(description = "地址URL")
 	@TableField(exist = false)
 	private String attaUrl;
+	/**
+	 * 附件变更类型：0 增加  1 减少。 档案编辑附件时需要告知后端是增加还是减少
+	 */
+	@TableField(exist = false)
+	private String handleType;
+
+	/**
+	 * 其他分租名称
+	 */
+	@TableField(exist = false)
+	private String groupName;
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpOtherFile.java

@@ -77,5 +77,10 @@ public class TEmpOtherFile {
 	// 附件
 	@TableField(exist = false)
 	private List<TAttaInfo> attaList;
+	/**
+	 * 档案编辑其他附件分租信息处理类型 0 新增 1 更新 2 删除
+	 */
+	@TableField(exist = false)
+	private String handleType;
 
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java

@@ -561,4 +561,10 @@ public class TEmployeeInfo extends BaseEntity {
 	@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
 	@Schema(description ="是否有职业资格证书:0 是  1 否")
 	private String haveQualification;
+
+	/**
+	 * 其他附件--C段二维码扫码数据
+	 */
+	@TableField(exist = false)
+	private List<TEmpOtherFile> otherFiles;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -142,7 +142,7 @@ public class TEmployeeInfoController {
 	@Operation(summary = "通过id查询", description = "通过id查询")
 	@GetMapping("/{id}")
 	public R<TEmployeeInfo> getById(@PathVariable("id") String id) {
-		return R.ok(tEmployeeInfoService.getById(id));
+		return tEmployeeInfoService.getByIdAssociate(id);
 	}
 
 	/**
@@ -531,4 +531,18 @@ public class TEmployeeInfoController {
 		tEmployeeInfoService.updateEmployeeAgeTask();
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description 人员档案附件信息导出
+	 * @Date 15:15 2024/9/10
+	 * @Param
+	 * @return
+	**/
+	@Operation(summary = "导出人员档案附件信息ZIP包", description = "导出人员档案附件信息ZIP包")
+	@SysLog("导出人员档案附件信息ZIP包")
+	@PostMapping("/exportEmployeeFile/{id}")
+	public void exportEmployeeFile(@PathVariable("id") String id, HttpServletResponse response) throws Exception{
+		tEmployeeInfoService.exportEmployeeFile(id, response);
+	}
+
 }

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

@@ -92,13 +92,13 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	R<String> addNewEmployee(TEmployeeInfo employeeInfo);
 
 	/**
-	 * @param employeeInfo
+	 * @param tEmployeeInfo
 	 * @Description: 更新档案信息
 	 * @Author: hgw
 	 * @Date: 2022/6/21 19:29
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
 	 **/
-	R<Boolean> updateEmployee(TEmployeeInfo employeeInfo);
+	R<Boolean> updateEmployee(TEmployeeInfo tEmployeeInfo);
 
 	/**
 	 * @param id
@@ -256,4 +256,8 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	void updateEmployeeAgeTask();
 
 	IPage<TEmployeeInfo> getPageAsso(Page<TEmployeeInfo> page, TEmployeeInfo tEmployeeInfo);
+
+	R<TEmployeeInfo> getByIdAssociate(String id);
+
+	void exportEmployeeFile(String id, HttpServletResponse response) throws Exception;
 }

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -146,6 +146,16 @@ public interface CommonConstants {
 
 	String SIXTEEN_STRING = "16";
 
+	String TWENTY_TWO_STRING = "22";
+
+	String TWENTY_THREE_STRING = "23";
+
+	String TWENTY_FOUR_STRING = "24";
+
+	String TWENTY_FIVE_STRING = "25";
+
+	String TWENTY_SEVEN_STRING = "27";
+
 	public static final String DEFAULT_PASSWORD = "123456";
 
 	/**
@@ -507,7 +517,7 @@ public interface CommonConstants {
 
 	public static final String TWENTY_STRING = "20";
 
-	public static final int TWENTY_ONE_STRING = 21;
+	public static final String TWENTY_ONE_STRING = "21";
 
 	public static final String ERROR_MSG_PRFIX = "error=";