Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/ArchivesConstants.java

@@ -163,4 +163,9 @@ public class ArchivesConstants {
 	 * 合同之前
 	**/
 	public static final String CONTRACT_CREATE_TYPE="合同之后";
+
+	public static final String CONTRACT_CHECK_CONSTANTS_IDCARD_1="身份证";
+	public static final String CONTRACT_CHECK_CONSTANTS_IDCARD_2=" | 身份证";
+
+	public static final String CONTRACT_CHECK_CONSTANTS_NO="合同申请编号：";
 }

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 人员档案表excel导出对应的实体
+ *
+ * @author hgw
+ * @date 2022-6-24 15:15:24
+ */
+@Data
+@ColumnWidth(10)
+public class EmployeeContractCheckVO extends RowIndex implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "身份证号")
+	private String empIdcard;
+}

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

@@ -197,7 +197,7 @@ public class TEmpContractAlertController {
 	 * 获取反馈日志详情
 	 *
 	 * @author wzb
-	 * @param id
+	 * @param applyNo
 	 * @return {@link R}
 	 */
 	@Operation(summary = "获取反馈日志详情", description = "获取反馈日志详情")
@@ -223,4 +223,17 @@ public class TEmpContractAlertController {
 	}
 
 
+	/**
+	 * 员工合同续签原因排查
+	 *
+	 * @author fxj
+	 * @date 2023-09-01 17:31:05
+	 **/
+	@SneakyThrows
+	@Operation(description = "员工合同续签原因排查")
+	@SysLog("员工合同续签原因排查")
+	@PostMapping("/importListAdd")
+	public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file) {
+		return tEmpContractAlertService.importDiy(file.getInputStream());
+	}
 }

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

@@ -66,4 +66,6 @@ public interface TEmpContractAlertService extends IService<TEmpContractAlert> {
 	 **/
 	R<List<EmpContractAlertUpdateVO>> batchUpdate(InputStream inputStream);
 
+	R<List<ErrorMessage>> importDiy(InputStream inputStream);
+
 }

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java

@@ -145,4 +145,16 @@ public class SysMenu extends BaseEntity {
 	 */
 	@Schema(description = "是否开关（0开、1关）")
 	private String isOpen;
+
+	/**
+	 * 表名，用来先查结果集
+	 */
+	@Schema(description = "表名，用来先查结果集")
+	private String tableName;
+	/**
+	 * 查询字段维度，如果fdId超长，则使用本字段
+	 */
+	@Schema(description = "查询字段维度，如果fdId超长，则使用本字段")
+	private String queryFields;
+
 }

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml

@@ -28,6 +28,8 @@
     <result property="createTime" column="CREATE_TIME"/>
     <result property="updateTime" column="UPDATE_TIME"/>
     <result property="isOpen" column="IS_OPEN"/>
+    <result property="tableName" column="TABLE_NAME"/>
+    <result property="queryFields" column="QUERY_FIELDS"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -49,7 +51,9 @@
                 a.DEPT_ID,
                 a.IS_OPEN,
                 a.VIEW_ID,
-                a.CREATE_TIME
+                a.CREATE_TIME,
+				a.TABLE_NAME,
+				a.QUERY_FIELDS
     </sql>
     <sql id="sysMenu_where">
         <if test="sysMenu != null">