人员花名册

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

@@ -51,4 +51,8 @@ public interface TPersonnelRosterMapper extends BaseMapper<TPersonnelRoster> {
 	List<TPersonnelRoster> getTPersonnelRoster(@Param("tPersonnelRoster") TPersonnelRoster tPersonnelRoster);
 
 	Integer getTPersonnelRosterCount(@Param("tPersonnelRoster") TPersonnelRoster tPersonnelRoster);
+
+	int noPageCountDiy(@Param("tPersonnelRoster")TPersonnelRosterSearchVo searchVo);
+
+	List<TPersonnelRoster> noPageDiy(@Param("tPersonnelRoster")TPersonnelRosterSearchVo searchVo);
 }

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

@@ -150,16 +150,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
 
     @Override
     public List<TPersonnelRoster> noPageDiy(TPersonnelRosterSearchVo searchVo) {
-        LambdaQueryWrapper<TPersonnelRoster> wrapper = buildQueryWrapper(searchVo);
-        List<String> idList = Common.getList(searchVo.getIds());
-        if (Common.isNotNull(idList)){
-            wrapper.in(TPersonnelRoster::getId,idList);
-        }
-        if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
-            wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
-        }
-        wrapper.orderByDesc(BaseEntity::getCreateTime);
-        return baseMapper.selectList(wrapper);
+		return baseMapper.noPageDiy(searchVo);
     }
 
 	@Override
@@ -213,26 +204,8 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
 
 	}
 
-	private  Long noPageCountDiy(TPersonnelRosterSearchVo searchVo) {
-        LambdaQueryWrapper<TPersonnelRoster> wrapper = buildQueryWrapper(searchVo);
-        List<String> idList = Common.getList(searchVo.getIds());
-        if (Common.isNotNull(idList)){
-            wrapper.in(TPersonnelRoster::getId,idList);
-        }
-        return baseMapper.selectCount(wrapper);
-    }
-
-    private LambdaQueryWrapper buildQueryWrapper(TPersonnelRosterSearchVo entity){
-        LambdaQueryWrapper<TPersonnelRoster> wrapper = Wrappers.lambdaQuery();
-        if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-            wrapper.ge(TPersonnelRoster::getCreateTime, entity.getCreateTimes()[0])
-                    .le(TPersonnelRoster::getCreateTime,
-                            entity.getCreateTimes()[1]);
-        }
-        if (Common.isNotNull(entity.getCreateName())){
-            wrapper.eq(TPersonnelRoster::getCreateName,entity.getCreateName());
-        }
-        return wrapper;
+	private  int noPageCountDiy(TPersonnelRosterSearchVo searchVo) {
+		return baseMapper.noPageCountDiy(searchVo);
     }
 
 }

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

@@ -290,4 +290,30 @@
 				INNER JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO
 				INNER JOIN t_employee_contract_info c1 on c1.id=t.id
 	</select>
+	<select id="noPageCountDiy" resultType="java.lang.Integer">
+		select
+		count(1)
+		from t_personnel_roster a
+		<where>
+			1=1
+			<include refid="tPersonnelRoster_where"/>
+		</where>
+	</select>
+
+	<!--tEmployeeInfo人员档案导出查询改造 fxj 2022-11-02-->
+	<select id="noPageDiy" resultMap="tPersonnelRosterMap">
+		select
+		<include refid="Base_Column_List"/>
+		from t_personnel_roster a
+		<where>
+			a.DELETE_FLAG = '0'
+			<include refid="tPersonnelRoster_where"/>
+		</where>
+		order by a.CREATE_TIME desc
+		<if test="tPersonnelRoster != null">
+			<if test="tPersonnelRoster.limitStart != null">
+				limit #{tPersonnelRoster.limitStart},#{tPersonnelRoster.limitEnd}
+			</if>
+		</if>
+	</select>
 </mapper>