tangweijie/xlcp-backend
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(prison): 修复刑期总天数计算错误

Browse Source 
- 使用 ChronoUnit.DAYS.between 计算入监日期到释放日期的总天数
- 修复后：2024-01-15 到 2027-07-14 = 1276天（原错误计算为743天）
- 确保与其他日期计算逻辑一致
This commit is contained in:
tangweijie 2026-01-27 12:11:42 +08:00
parent 653e55a075
commit 182b7a7b43
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/dashboard/vo/PrisonerDashboardStatsRespVO.java
View File

@ -72,6 +72,9 @@ public class PrisonerDashboardStatsRespVO {
@Schema(description = "剩余刑期天数", example = "1000") @Schema(description = "剩余刑期天数", example = "1000")
private Integer remainingDays; private Integer remainingDays;
@Schema(description = "刑期总天数", example = "1276")
private Integer sentenceDays;
@Schema(description = "累计违规次数", example = "5") @Schema(description = "累计违规次数", example = "5")
private Integer violationCount; private Integer violationCount;

21
yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java
View File

@ -200,17 +200,28 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService {
} }
// 入狱和出狱时间 // 入狱和出狱时间
if (prisoner.getImprisonmentDate() != null) { if (prisoner.getImprisonmentDate() != null && prisoner.getReleaseDate() != null) {
vo.setImprisonmentDate(prisoner.getImprisonmentDate().toString()); vo.setImprisonmentDate(prisoner.getImprisonmentDate().toString());
vo.setServedDays((int) ChronoUnit.DAYS.between(prisoner.getImprisonmentDate(), LocalDate.now()));
}
if (prisoner.getReleaseDate() != null) {
vo.setReleaseDate(prisoner.getReleaseDate().toString()); vo.setReleaseDate(prisoner.getReleaseDate().toString());
// 计算剩余刑期天数 // 计算刑期总天数（从入监日期到释放日期）
long sentenceDays = ChronoUnit.DAYS.between(prisoner.getImprisonmentDate(), prisoner.getReleaseDate());
vo.setSentenceDays((int) sentenceDays);
// 计算已服刑天数（从入监日期到当前日期）
vo.setServedDays((int) ChronoUnit.DAYS.between(prisoner.getImprisonmentDate(), LocalDate.now()));
// 计算剩余刑期天数（从当前日期到释放日期）
long remainingDays = ChronoUnit.DAYS.between(LocalDate.now(), prisoner.getReleaseDate()); long remainingDays = ChronoUnit.DAYS.between(LocalDate.now(), prisoner.getReleaseDate());
vo.setRemainingDays(remainingDays > 0 ? (int) remainingDays : 0); vo.setRemainingDays(remainingDays > 0 ? (int) remainingDays : 0);
} else if (prisoner.getImprisonmentDate() != null) {
vo.setImprisonmentDate(prisoner.getImprisonmentDate().toString());
vo.setServedDays((int) ChronoUnit.DAYS.between(prisoner.getImprisonmentDate(), LocalDate.now()));
if (prisoner.getReleaseDate() != null) {
vo.setReleaseDate(prisoner.getReleaseDate().toString());
long remainingDays = ChronoUnit.DAYS.between(LocalDate.now(), prisoner.getReleaseDate());
vo.setRemainingDays(remainingDays > 0 ? (int) remainingDays : 0);
}
} else { } else {
vo.setRemainingDays(null); vo.setRemainingDays(null);
vo.setSentenceDays(null);
} }
// 监区信息（查询实际监区名称） // 监区信息（查询实际监区名称）