ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckScore.java
@@ -6,14 +6,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.system.entity.BaseEntity; import lombok.Data; import lombok.experimental.Accessors; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; import java.util.Map; /** * 考核积分明细对象 t_check_score @@ -69,4 +64,10 @@ @TableField(exist = false) private String date; @TableField(exist = false) private Date startDate; @TableField(exist = false) private Date endDate; } ycl-server/src/main/java/com/ycl/platform/mapper/CheckScoreMapper.java
@@ -73,4 +73,5 @@ void saveBatch(List<CheckScore> scoreList); List<CheckScore> selectCheckScoreMap(CheckScore checkScore); } ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -2,8 +2,6 @@ import annotation.DataScope; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.base.BaseSelect; import com.ycl.platform.base.CheckIndex; import com.ycl.platform.domain.dto.CheckScoreDTO; import com.ycl.platform.domain.dto.CheckScoreIndexDTO; import com.ycl.platform.domain.dto.ScoreIndexDTO; @@ -17,14 +15,11 @@ import com.ycl.platform.service.ICheckIndexFaceService; import com.ycl.platform.service.ICheckIndexVideoService; import com.ycl.platform.service.ICheckScoreService; import com.ycl.system.Result; import com.ycl.system.entity.SysRole; import com.ycl.system.service.ISysDeptService; import com.ycl.utils.DateUtils; import com.ycl.utils.SecurityUtils; import com.ycl.utils.StringUtils; import com.ycl.utils.poi.ExcelUtil; import constant.CheckConstants; import enumeration.general.CheckScoreType; import enumeration.general.PublishType; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -32,16 +27,13 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import pojo.ExcelExp; import utils.DateUtils; import utils.poi.ExcelUtilManySheet; import java.io.IOException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; /** * 考核积分明细Service业务层处理 @@ -137,21 +129,24 @@ //区县只能看已发布 roleControl(checkScore); //查询成绩 String date = checkScore.getDate(); if(StringUtils.isEmpty(date)){ //如果为空查本月的数据 Calendar now = Calendar.getInstance(); //取昨天 now.add(Calendar.DATE, -1); Date yesterday = now.getTime(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); date = simpleDateFormat.format(yesterday); checkScore.setDate(date); // 获取数据日期时间 Calendar calendar = Calendar.getInstance(); // 一号查询之前的数据 if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); } // 0 省厅月度 1 市局月度 2 省厅季度 3 市局季度 switch (checkScore.getExamineTag()) { case 0, 1: checkScore.setEndDate(calendar.getTime()); calendar.set(Calendar.DAY_OF_MONTH, 1); checkScore.setStartDate(calendar.getTime()); break; case 2, 3: checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime()); checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime()); checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1); break; } List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore); Map<Long, List<CheckScore>> deptMap = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); return deptMap; return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); }
@@ -8,6 +8,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; import java.util.Calendar; import java.util.Date; import java.util.Objects; @@ -227,4 +228,34 @@ LocalDateTime of = LocalDateTime.of(localDateTime.getYear(), localDateTime.getMonth(), localDateTime.getDayOfMonth(), 23, 59, 59); return Timestamp.valueOf(of); } /** * 获取指定Calendar的季度开始日期 * @param calendar 日历 * @return 季度第一天 */ public static Calendar getQuarterStart(Calendar calendar) { Calendar quarterStart = (Calendar) calendar.clone(); // 设置为当前季度的第一个月的第一天 quarterStart.set(Calendar.DAY_OF_MONTH, 1); int month = quarterStart.get(Calendar.MONTH); quarterStart.set(Calendar.MONTH, (month / 3) * 3); return quarterStart; } /** * 获取指定Calendar的季度结束日期 * @param calendar 日历 * @return 季度最后一天 */ public static Calendar getQuarterEnd(Calendar calendar) { Calendar quarterEnd = getQuarterStart(calendar); // 将月份设置为下一个季度的第一个月 quarterEnd.add(Calendar.MONTH, 3); // 设置为那个月的最后一天 quarterEnd.add(Calendar.DAY_OF_MONTH, -1); return quarterEnd; } } ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -114,4 +114,23 @@ (#{score.score},#{score.deptId},#{score.templateId},#{score.examineTag},#{score.examineCategory},#{score.createTime}) </foreach> </insert> <select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore"> SELECT tcs.dept_id, examine_category, AVG(score) AS score, #{startDate} AS startDate, #{endDate} AS endDate FROM t_check_score tcs LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id WHERE examine_tag = #{examineTag} AND tcs.create_time BETWEEN #{startDate} AND #{endDate} GROUP BY tcs.dept_id, examine_category </select> </mapper>
