From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改，查询季度写死“2024年一季度”
---
finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
index 984e34b..8060fbc 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbBasicDataServiceImpl.java
@@ -154,10 +154,13 @@
LocalDate quarterStartLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
LocalDate now = LocalDate.now();
- vo.setQuarter(DateUtils.getNowQuarter());
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = "2024年一季度";
+ DateUtils.getQuarterDate(previousQuarter);
+ vo.setQuarter(previousQuarter);
vo.setStatus(ReportingStatusEnum.UNFILLED);
- // 如果当前时间不在规定范围内：季度初1-15号 TODO
- /* if (now.isBefore(quarterStartLocalDate) || now.isAfter(fifteenDaysLimit)) {
+ // 如果当前时间不在规定范围内：季度初1-15号
+ /*if (now.isBefore(quarterStartLocalDate) || now.isAfter(fifteenDaysLimit)) {
return R.ok(vo, "请于季度初1-15号上传季度数据。");
}*/
// 查询是否有当前季度的填报记录
@@ -165,10 +168,10 @@
this.getOne(
Wrappers.<TbBasicData>lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, dept.getAreaCode())
- .between(TbBasicData::getReportingTime, quarterStart, quarterEnd));
+ .eq(TbBasicData::getQuarter, previousQuarter));
if (Objects.nonNull(basicData)) {
vo.setCreateTime(basicData.getCreateTime());
- vo.setUpdateTime(basicData.getUpdateTime());
+ vo.setFinishedTime(basicData.getUpdateTime());
}
// 查询需要填写的字段
List<TbField> list =
@@ -193,7 +196,7 @@
vo.setFields(roots);
}
if (Objects.isNull(basicData)) {
- vo.setQuarter(DateUtils.getNowQuarter());
+ vo.setQuarter(previousQuarter);
vo.setStatus(ReportingStatusEnum.UNFILLED);
return R.ok(vo);
} else {
@@ -226,7 +229,8 @@
if (Objects.isNull(dto) || CollUtils.isEmpty(dto.getFields())) {
return;
}
- String nowQuarter = DateUtils.getNowQuarter();
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = "2024年一季度";
// 查询需要填写的动态字段
List<TbField> fieldList =
tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
@@ -234,7 +238,7 @@
fieldList.stream().collect(Collectors.toMap(TbField::getId, e -> e));
Optional<TbBasicData> basicDataOpt = this.lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, areaCode)
- .eq(TbBasicData::getQuarter, nowQuarter).oneOpt();
+ .eq(TbBasicData::getQuarter, previousQuarter).oneOpt();
TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
if (basicDataOpt.isPresent()) {
tbBasicData.setId(basicDataOpt.get().getId());
@@ -251,8 +255,8 @@
} else {
tbBasicData.setDeptAreaCode(areaCode);
tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
- tbBasicData.setQuarter(nowQuarter);
- tbBasicData.setReportingTime(DateUtils.getQuarterDate(nowQuarter));
+ tbBasicData.setQuarter(previousQuarter);
+ tbBasicData.setReportingTime(DateUtils.getQuarterDate(previousQuarter));
this.save(tbBasicData);
}
// 保存基础数据动态字段数据
@@ -329,6 +333,7 @@
&& StringUtils.isNotEmpty(dto.getCurrentGdp()));
if (flag) {
tbBasicData.setStatus(ReportingStatusEnum.FILLED);
+ tbBasicData.setFinishedTime(new Date());
this.updateById(tbBasicData);
}
/*if (ReportingStatusEnum.FILLED.equals(tbBasicData.getStatus())) {
@@ -486,7 +491,8 @@
}*/
LoginUser loginUser = SecurityUtils.getLoginUser();
String areaCode = loginUser.getUser().getAreaCode();
- String nowQuarter = DateUtils.getNowQuarter();
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = "2024年一季度";
EasyExcel.read(
file.getInputStream(),
new BasicDataListener(
@@ -496,7 +502,7 @@
tbBasicDataFieldService,
tbBasicDataConfigService,
tbBasicDataConfigDetailService,
- tbScoreService, tbDataScreenScoreService, nowQuarter,
+ tbScoreService, tbDataScreenScoreService, previousQuarter,
tbDataScreenConfigService,
asyncService))
.sheet()
@@ -598,19 +604,21 @@
}
@Override
- public PageDTO<ScoreVO> pageScore(ScoreQuery query) {
+ public PageDTO<ScoreVO> pageScore(ScoreQuery query) throws Exception {
Page<ScoreVO> page = new Page<>(query.getPageNum(), query.getPageSize());
SysUser user = SecurityUtils.getLoginUser().getUser();
String areaCode = user.getAreaCode();
Date date = new Date();
Date quarterStart = DateUtil.beginOfQuarter(date);
Date quarterEnd = DateUtil.endOfQuarter(date);
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = "2024年一季度";
// 查询是否有当前季度的填报记录
TbBasicData basicData =
this.getOne(
Wrappers.<TbBasicData>lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, areaCode)
- .between(TbBasicData::getReportingTime, quarterStart, quarterEnd));
+ .eq(TbBasicData::getQuarter, previousQuarter));
if (Objects.isNull(basicData)) {
return PageDTO.empty(page);
}
@@ -774,11 +782,12 @@
remark.setName("备注");
roots.add(remark);
vo.setFields(roots);
- String nowQuarter = DateUtils.getNowQuarter();
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = "2024年一季度";
// 查询上报的基础数据
List<TbBasicData> basicDataList =
this.lambdaQuery()
- .eq(TbBasicData::getQuarter, nowQuarter)
+ .eq(TbBasicData::getQuarter, previousQuarter)
.eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
.list();
if (CollUtils.isNotEmpty(basicDataList)) {
@@ -1127,7 +1136,6 @@
if (Objects.isNull(basicData)) {
throw new ServiceException("非法参数");
}
- String nowQuarter = DateUtils.getNowQuarter();
this.updateById(basicData);
// 查询该基础数据的动态字端
// 查询需要填写的动态字段
@@ -1144,7 +1152,7 @@
BeanUtils.copyBean(dto, BasicDataDTO.class),
fieldMap));
TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
-
+ tbBasicData.setQuarter(basicData.getQuarter());
// 保存基础数据动态字段数据
List<TbBasicDataField> tbBasicDataFields =
BeanUtils.copyList(dto.getFields(), TbBasicDataField.class);
@@ -1382,7 +1390,7 @@
@Override
public List<FieldAndScoreDataVO> getFieldAndScoreData(String areaCode, String nowQuarter,
- Integer yearType) {
- return baseMapper.getFieldAndScoreData(areaCode, nowQuarter, yearType);
+ Integer yearType, Integer isAll) {
+ return baseMapper.getFieldAndScoreData(areaCode, nowQuarter, yearType, isAll);
}
}
--
Gitblit v1.7.1