线上问题修改

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java

@@ -41,12 +41,11 @@ public interface TEmployeeInfoMapper extends BaseMapper<TEmployeeInfo> {
 
 	IPage<TEmployeeInfo> getPage(Page<TEmployeeInfo> page, @Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
 
-	long getLeavePageCount(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo, @Param("idList")List<String> idList);
+	long getLeavePageCount(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
 
-	List<String> getProjectEmpId(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
+	List<TEmployeeInfo> getLeavePage(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo, @Param("page")Long page, @Param("size")Long size);
 
-	List<TEmployeeInfo> getLeavePage(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo,
-									 @Param("page")Long page, @Param("size")Long size);
+	IPage<TEmployeeInfo> getLeaveIPage(Page<TEmployeeInfo> page,@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
 
 	List<TEmployeeInfo> getList(@Param("tEmployeeInfo") TEmployeeInfo tEmployeeInfo);
 

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

@@ -97,16 +97,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 		long leavePageCount;
 		if (Common.isEmpty(employeeInfo.getUnitName()) && Common.isEmpty(employeeInfo.getDeptName())
 				&& Common.isEmpty(employeeInfo.getDeptNo()) && Common.isEmpty(employeeInfo.getAuthSql())) {
-			leavePageCount = baseMapper.getLeavePageCount(employeeInfo, null);
-		} else {
-			List<String> projectList;
-			projectList = baseMapper.getProjectEmpId(employeeInfo);
-			if (projectList.isEmpty()) {
-				leavePageCount = 0L;
-			}else {
-				leavePageCount = baseMapper.getLeavePageCount(employeeInfo, projectList);
-			}
-		}
+			leavePageCount = baseMapper.getLeavePageCount(employeeInfo);
 			page.setTotal(leavePageCount);
 			if (leavePageCount > 0L) {
 				page.setPages((long) Math.ceil(leavePageCount / page.getSize()));
@@ -120,6 +111,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			List<TEmployeeInfo> list = baseMapper.getLeavePage(employeeInfo,(page.getCurrent() - 1) * page.getSize(), page.getSize());
 			page.setRecords(list);
 			return page;
+		} else {
+			return baseMapper.getLeaveIPage(page, employeeInfo);
+		}
 	}
 
 	@Override

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

@@ -576,27 +576,61 @@
 		ORDER BY c.CREATE_TIME DESC
 	</select>
 
-	<select id="getLeavePageCount" resultType="java.lang.Long">
+	<!-- hgw 分页查询 -->
+	<select id="getLeaveIPage" resultMap="tEmployeeExportMap">
 		SELECT
-		count(1)
-		FROM t_employee_info a
-		where 1=1
-		and a.DELETE_FLAG = '0'
+		c.ID,
+		c.EMP_CODE,
+		c.EMP_NATRUE,
+		c.EMP_NAME,
+		c.EMP_IDCARD,
+		c.EMP_PHONE,
+		c.FILE_PROVINCE,
+		c.FILE_CITY,
+		c.FILE_TOWN,
+		c.LEAVE_TIME,
+		c.LEAVE_USER_NAME,
+		c.CREATE_TIME,
+		b.DEPT_ID,
+		b.EMP_ID,
+		b.UNIT_NAME,
+		b.DEPT_NAME,
+		b.DEPT_NO
+		FROM
+		(
+		SELECT
+		a.ID,
+		a.EMP_CODE,
+		a.EMP_NATRUE,
+		a.EMP_NAME,
+		a.EMP_IDCARD,
+		a.EMP_PHONE,
+		a.FILE_PROVINCE,
+		a.FILE_CITY,
+		a.FILE_TOWN,
+		a.LEAVE_TIME,
+		a.LEAVE_USER_NAME,
+		a.CREATE_TIME
+		FROM
+		t_employee_info a
+		WHERE
+		a.DELETE_FLAG = '0'
 		<include refid="employeeInfo_where"/>
-		<if test="idList != null and idList.size>0">
-			AND a.id in
-			<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
-				#{idStr}
-			</foreach>
-		</if>
-	</select>
-
-	<select id="getProjectEmpId" resultType="java.lang.String">
+		) c
+		LEFT JOIN (
 		SELECT
-		b.EMP_ID
-		FROM t_employee_project b
-		where 1=1
-		AND b.DELETE_FLAG = '0'
+		f.DEPT_ID,
+		f.EMP_ID,
+		GROUP_CONCAT(DISTINCT f.UNIT_NAME) UNIT_NAME,
+		GROUP_CONCAT(DISTINCT f.DEPT_NAME) DEPT_NAME,
+		GROUP_CONCAT(DISTINCT f.DEPT_NO) DEPT_NO
+		FROM
+		t_employee_project f
+		WHERE
+		f.DELETE_FLAG = '0'
+		GROUP BY f.EMP_ID
+		) b ON c.id = b.EMP_ID
+		where 1 = 1
 		<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
 			AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
 		</if>
@@ -609,6 +643,16 @@
 		<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''">
 			${tEmployeeInfo.authSql}
 		</if>
+		ORDER BY c.CREATE_TIME DESC
+	</select>
+
+	<select id="getLeavePageCount" resultType="java.lang.Long">
+		SELECT
+		count(1)
+		FROM t_employee_info a
+		where 1=1
+		and a.DELETE_FLAG = '0'
+		<include refid="employeeInfo_where"/>
 	</select>
 
 	<!-- hgw list查询 -->