moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改工会查询

Browse Source
This commit is contained in:
liaozetao
2023-12-21 20:03:36 +08:00
parent a9c970aa87
commit 224b11eb6f
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/stats/HallLaborStatsMapper.java
View File

@@ -1,7 +1,12 @@
package com.accompany.admin.mapper.stats;
import com.accompany.admin.model.stats.HallLaborStats;
import com.accompany.admin.vo.stats.LaborStatsVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* @author: liaozetao
@@ -9,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description:
*/
public interface HallLaborStatsMapper extends BaseMapper<HallLaborStats> {
List<HallLaborStats> getLaborStats(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("erBanNoList") List<String> erBanNoList);
}

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java
View File

@@ -54,9 +54,7 @@ public class LaborStatsAdminService extends BaseService {
List<LaborStatsVo> data = new ArrayList<>();
String[] erBanNoArray = erBanNoStr.split(StrUtil.COMMA);
Map<Long, Long> erBanNoMap = Arrays.stream(erBanNoArray).map(v -> usersService.getUserByErbanNo(Long.valueOf(v))).filter(Objects::nonNull).collect(Collectors.toMap(Users::getErbanNo, Users::getUid, (v1, v2) -> v1));
List<HallLaborStats> hallLaborStats = hallLaborStatsMapper.selectList(Wrappers.<HallLaborStats>lambdaQuery()
.in(HallLaborStats::getErbanNo, erBanNoArray)
.between(HallLaborStats::getDate, startTime, endTime));
List<HallLaborStats> hallLaborStats = hallLaborStatsMapper.getLaborStats(startTime, endTime, Arrays.asList(erBanNoArray));
while (DateTimeUtil.compareTime(endTime, dateTime) >= 0) {
for (String erBanNo : erBanNoArray) {
String dateStr = DateTimeUtil.convertDate(dateTime, DateTimeUtil.DEFAULT_DATE_PATTERN);

10
accompany-admin/accompany-admin-service/src/main/resources/mapper/HallLaborStatsMapper.xml
View File

@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.accompany.admin.mapper.stats.HallLaborStatsMapper">
<select id="getLaborStats" resultType="com.accompany.admin.model.stats.HallLaborStats">
select * from hall_labor_stats where date between #{startTime} and #{endTime}
<if test="erBanNoList != null and erBanNoList.size > 0">
and erban_no in
<foreach collection="erBanNoList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>