From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java | 494 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 401 insertions(+), 93 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java
index 91d061c..5668a77 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,10 +13,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.CalculateTypeEnum;
+import com.ruoyi.common.enums.DataScreenConfigEnum;
+import com.ruoyi.common.enums.FieldInputTypeEnum;
+import com.ruoyi.common.enums.FieldTypeEnum;
import com.ruoyi.common.enums.ReportingStatusEnum;
import com.ruoyi.common.enums.ShowStatusEnum;
import com.ruoyi.common.enums.UserTypeEnum;
+import com.ruoyi.common.enums.ValueTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanUtils;
import com.ruoyi.common.utils.CalculateUtil;
@@ -28,15 +34,18 @@
import com.ruoyi.system.domain.TbBasicDataConfig;
import com.ruoyi.system.domain.TbBasicDataConfigDetail;
import com.ruoyi.system.domain.TbBasicDataField;
-import com.ruoyi.system.domain.TbDept;
+import com.ruoyi.system.domain.TbDataScreenScore;
import com.ruoyi.system.domain.TbField;
+import com.ruoyi.system.domain.TbOperLog;
import com.ruoyi.system.domain.TbScore;
import com.ruoyi.system.dto.BasicDataDTO;
+import com.ruoyi.system.dto.BasicDataFieldDTO;
+import com.ruoyi.system.dto.CalculateItemDTO;
+import com.ruoyi.system.dto.update.BasicDataUpdDTO;
import com.ruoyi.system.handler.CustomCellWriteHandler;
import com.ruoyi.system.listener.BasicDataListener;
import com.ruoyi.system.listener.HistoryDataListener;
import com.ruoyi.system.mapper.TbBasicDataMapper;
-import com.ruoyi.system.mapper.TbDeptMapper;
import com.ruoyi.system.query.CurrentFieldsQuery;
import com.ruoyi.system.query.ScoreCalculateQuery;
import com.ruoyi.system.query.ScoreQuery;
@@ -45,16 +54,22 @@
import com.ruoyi.system.service.TbBasicDataConfigService;
import com.ruoyi.system.service.TbBasicDataFieldService;
import com.ruoyi.system.service.TbBasicDataService;
+import com.ruoyi.system.service.TbDataScreenConfigService;
+import com.ruoyi.system.service.TbDataScreenScoreService;
import com.ruoyi.system.service.TbFieldService;
+import com.ruoyi.system.service.TbOperLogService;
import com.ruoyi.system.service.TbScoreService;
import com.ruoyi.system.utils.FieldBuildUtil;
import com.ruoyi.system.vo.BasicDataReportingVO;
import com.ruoyi.system.vo.CurrentFieldsAllVO;
import com.ruoyi.system.vo.CurrentFieldsDetailVO;
import com.ruoyi.system.vo.CurrentFieldsVO;
+import com.ruoyi.system.vo.DataScreenConfigVO;
+import com.ruoyi.system.vo.FieldAndScoreDataVO;
import com.ruoyi.system.vo.FieldsTreeVO;
import com.ruoyi.system.vo.ScoreCalculateVO;
import com.ruoyi.system.vo.ScoreVO;
+import com.ruoyi.system.vo.TransferPaymentScaleVO;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.Instant;
@@ -62,12 +77,12 @@
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
@@ -89,7 +104,6 @@
public class TbBasicDataServiceImpl extends ServiceImpl<TbBasicDataMapper, TbBasicData>
implements TbBasicDataService {
- private final TbDeptMapper tbDeptMapper;
private final HttpServletResponse response;
private final TbFieldService tbFieldService;
private final TbBasicDataFieldService tbBasicDataFieldService;
@@ -97,6 +111,10 @@
private final TbBasicDataConfigDetailService tbBasicDataConfigDetailService;
private final TbScoreService tbScoreService;
private final ISysUserService sysUserService;
+ private final TbOperLogService tbOperLogService;
+ private final TbDataScreenScoreService tbDataScreenScoreService;
+ private final TbDataScreenConfigService tbDataScreenConfigService;
+
public static void setFieldValues(
List<FieldsTreeVO> fields, Map<Long, TbBasicDataField> fieldMap) {
@@ -104,7 +122,7 @@
TbBasicDataField tbBasicDataField = fieldMap.get(field.getId());
if (tbBasicDataField != null) {
field.setValue(
- FieldBuildUtil.formatNumberWithCommas(tbBasicDataField.getFieldValue()));
+ tbBasicDataField.getFieldValue());
}
if (field.getChildren() != null && !field.getChildren().isEmpty()) {
setFieldValues(field.getChildren(), fieldMap);
@@ -118,35 +136,31 @@
String deptAreaCode = user.getAreaCode();
BasicDataReportingVO vo = new BasicDataReportingVO();
// 校验区划代码
- TbDept dept =
- tbDeptMapper.selectOne(
- Wrappers.<TbDept>lambdaQuery().eq(TbDept::getAreaCode, deptAreaCode));
+ SysUser dept =
+ sysUserService.getOne(
+ Wrappers.<SysUser>lambdaQuery().eq(SysUser::getAreaCode, deptAreaCode));
if (Objects.isNull(dept)) {
throw new ServiceException(String.format("区划代码%s不存在", deptAreaCode));
}
Date date = new Date();
- Map<String, Date> quarterDate = DateUtils.getQuarterDate(date);
- // 当前季度开始
- Date quarterStart = quarterDate.get("first");
- // 当前季度结束
- Date quarterEnd = quarterDate.get("last");
- // 判断当前时间是否在季度初1-15号
+ Date quarterStart = DateUtil.beginOfQuarter(date);
+ Date quarterEnd = DateUtil.endOfQuarter(date);
Instant instant = quarterStart.toInstant();
LocalDate quarterStartLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
- LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(15);
+ LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
LocalDate now = LocalDate.now();
vo.setQuarter(DateUtils.getNowQuarter());
vo.setStatus(ReportingStatusEnum.UNFILLED);
- // 如果当前时间不在规定范围内：季度初1-15号
- if (now.isBefore(quarterStartLocalDate) || now.isAfter(fifteenDaysLimit)) {
+ // 如果当前时间不在规定范围内：季度初1-15号 TODO
+ /* if (now.isBefore(quarterStartLocalDate) || now.isAfter(fifteenDaysLimit)) {
return R.ok(vo, "请于季度初1-15号上传季度数据。");
- }
+ }*/
// 查询是否有当前季度的填报记录
TbBasicData basicData =
this.getOne(
Wrappers.<TbBasicData>lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, dept.getAreaCode())
- .between(TbBasicData::getCreateTime, quarterStart, quarterEnd));
+ .between(TbBasicData::getReportingTime, quarterStart, quarterEnd));
// 查询需要填写的字段
List<TbField> list =
tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
@@ -204,26 +218,71 @@
return;
}
String nowQuarter = DateUtils.getNowQuarter();
- TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
- tbBasicData.setDeptAreaCode(areaCode);
- tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
- tbBasicData.setQuarter(nowQuarter);
- tbBasicData.setReportingTime(DateUtils.getQuarterDate(nowQuarter));
- this.saveOrUpdate(tbBasicData);
- // 保存基础数据动态字段数据
- List<TbBasicDataField> tbBasicDataFields =
- BeanUtils.copyList(dto.getFields(), TbBasicDataField.class);
// 查询需要填写的动态字段
List<TbField> fieldList =
tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
Map<Long, TbField> fieldMap =
fieldList.stream().collect(Collectors.toMap(TbField::getId, e -> e));
+ Optional<TbBasicData> basicDataOpt = this.lambdaQuery()
+ .eq(TbBasicData::getDeptAreaCode, areaCode)
+ .eq(TbBasicData::getQuarter, nowQuarter).oneOpt();
+ TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
+ if (basicDataOpt.isPresent()) {
+ tbBasicData.setId(basicDataOpt.get().getId());
+ tbBasicData.setDeptAreaCode(areaCode);
+ this.updateById(tbBasicData);
+ //查询该基础数据的动态字端
+ List<TbBasicDataField> originFields = tbBasicDataFieldService.lambdaQuery()
+ .eq(TbBasicDataField::getBasicDataId, tbBasicData.getId()).list();
+ CompletableFuture.runAsync(
+ () -> saveExchangeLog(loginUser, basicDataOpt.get(), originFields, dto,
+ fieldMap));
+ } else {
+ tbBasicData.setDeptAreaCode(areaCode);
+ tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
+ tbBasicData.setQuarter(nowQuarter);
+ tbBasicData.setReportingTime(DateUtils.getQuarterDate(nowQuarter));
+ this.save(tbBasicData);
+ }
+ // 保存基础数据动态字段数据
+ List<TbBasicDataField> tbBasicDataFieldsOrg =
+ BeanUtils.copyList(dto.getFields(), TbBasicDataField.class);
+ List<TbBasicDataField> tbBasicDataFields = tbBasicDataFieldsOrg.stream()
+ .filter(item -> Objects.nonNull(item.getFieldValue())).collect(
+ Collectors.toList());
tbBasicDataFields.forEach(
item -> {
item.setBasicDataId(tbBasicData.getId());
TbField tbField = fieldMap.get(item.getFieldId());
if (Objects.nonNull(tbField)) {
item.setFieldName(tbField.getFieldName());
+ }
+ Integer numMax = tbField.getNumMax();
+ Integer numMin = tbField.getNumMin();
+ Integer textMaxNum = tbField.getTextMaxNum();
+ Integer textMinNum = tbField.getTextMinNum();
+ if (FieldTypeEnum.NUMBER.equals(tbField.getFieldType()) && Objects.nonNull(
+ numMax) && Objects.nonNull(numMin)) {
+ double fieldValue = Double.parseDouble(item.getFieldValue());
+ if (fieldValue < numMin || fieldValue > numMax) {
+ throw new ServiceException(
+ String.format("字段%s的值不在范围%d-%d内",
+ tbField.getFieldName(),
+ numMin, numMax));
+ }
+ }
+ if (FieldTypeEnum.TEXT.equals(tbField.getFieldType())
+ && FieldInputTypeEnum.MANUAL_INPUT.equals(
+ tbField.getTextInputType())
+ && Objects.nonNull(
+ textMaxNum) && Objects.nonNull(textMinNum)) {
+ String fieldValue = item.getFieldValue();
+ if (fieldValue.length() < numMin || fieldValue.length() > numMax) {
+ throw new ServiceException(
+ String.format("字段%s的值的长度不在范围%d-%d内",
+ tbField.getFieldName(),
+ textMinNum, textMaxNum));
+ }
}
});
// 添加固定字段 转移支付规模、当期GDP
@@ -262,13 +321,157 @@
this.updateById(tbBasicData);
}
if (ReportingStatusEnum.FILLED.equals(tbBasicData.getStatus())) {
- calculateScore(tbBasicData);
+ CompletableFuture.runAsync(() -> {
+ calculateScore(tbBasicData, tbBasicDataFields);
+ calculateScreenScore(tbBasicData, tbBasicDataFields);
+ });
}
}
+ private void calculateScreenScore(TbBasicData tbBasicData,
+ List<TbBasicDataField> tbBasicDataFields) {
+ Map<Long, TbBasicDataField> basicDataFieldMap = tbBasicDataFields.stream()
+ .collect(Collectors.toMap(TbBasicDataField::getFieldId, e -> e));
+ DataScreenConfigVO riskLevel = tbDataScreenConfigService.getRiskLevel();
+ List<DataScreenConfigVO> dataIndicatorsConfig = tbDataScreenConfigService.getIndicatorsConfig(
+ DataScreenConfigEnum.DATA_INDICATORS);
+ List<DataScreenConfigVO> formalIndicatorsConfig = tbDataScreenConfigService.getIndicatorsConfig(
+ DataScreenConfigEnum.FORMAL_INDICATORS);
+ handleScoreCalculate(tbBasicData, riskLevel, basicDataFieldMap);
+ for (DataScreenConfigVO config : dataIndicatorsConfig) {
+ handleScoreCalculate(tbBasicData, config, basicDataFieldMap);
+ }
+ for (DataScreenConfigVO config : formalIndicatorsConfig) {
+ handleScoreCalculate(tbBasicData, config, basicDataFieldMap);
+ }
+ }
+
+ private void handleScoreCalculate(TbBasicData tbBasicData, DataScreenConfigVO vo,
+ Map<Long, TbBasicDataField> basicDataFieldMap) {
+ TbDataScreenScore tbDataScreenScore = tbDataScreenScoreService.lambdaQuery()
+ .eq(TbDataScreenScore::getBasicDataId, tbBasicData.getId()).eq(
+ TbDataScreenScore::getDataScreenConfigId, vo.getId()).one();
+ if (Objects.isNull(tbDataScreenScore)) {
+ tbDataScreenScore = new TbDataScreenScore();
+ tbDataScreenScore.setDataScreenConfigId(vo.getId());
+ tbDataScreenScore.setBasicDataId(tbBasicData.getId());
+ tbDataScreenScore.setDeptAreaCode(tbBasicData.getDeptAreaCode());
+ }
+ List<CalculateItemDTO> scoreCalculateList = vo.getScoreCalculateList();
+ for (CalculateItemDTO item : scoreCalculateList) {
+ if (item.getValueType().equals(ValueTypeEnum.FIELD)) {
+ TbBasicDataField basicDataField = basicDataFieldMap.get(
+ Long.valueOf(item.getContent()));
+ if (Objects.nonNull(basicDataField)) {
+ item.setContent(basicDataField.getFieldValue());
+ }
+ }
+ }
+ String calculateFormulaStr = scoreCalculateList.stream()
+ .map(CalculateItemDTO::getContent).collect(Collectors.joining());
+ double score = CalculateUtil.calculate(calculateFormulaStr);
+ tbDataScreenScore.setScore(score);
+ if (vo.getType().equals(DataScreenConfigEnum.DATA_INDICATORS)) {
+ List<CalculateItemDTO> rateCalculateList = vo.getRateCalculateList();
+ for (CalculateItemDTO calculateItemDTO : rateCalculateList) {
+ if (calculateItemDTO.getValueType().equals(ValueTypeEnum.FIELD)) {
+ TbBasicDataField basicDataField = basicDataFieldMap.get(
+ Long.valueOf(calculateItemDTO.getContent()));
+ if (Objects.nonNull(basicDataField)) {
+ calculateItemDTO.setContent(basicDataField.getFieldValue());
+ }
+ }
+ }
+ String calculateRateFormulaStr = rateCalculateList.stream()
+ .map(CalculateItemDTO::getContent).collect(Collectors.joining());
+ double scoreRate = CalculateUtil.calculate(calculateRateFormulaStr);
+ tbDataScreenScore.setScoreRate(scoreRate);
+ }
+ tbDataScreenScoreService.saveOrUpdate(tbDataScreenScore);
+ }
+
+ private void saveExchangeLog(LoginUser loginUser, TbBasicData tbBasicData,
+ List<TbBasicDataField> originFields,
+ BasicDataDTO dto, Map<Long, TbField> fieldMap) {
+ List<TbOperLog> tbOperlogList = new ArrayList<>();
+ String transferPaymentScale = tbBasicData.getTransferPaymentScale();
+ String currentGdp = tbBasicData.getCurrentGdp();
+ String remark = tbBasicData.getRemark();
+ String transferPaymentScaleEdit = dto.getTransferPaymentScale();
+ String currentGdpEdit = dto.getCurrentGdp();
+ String remarkEdit = dto.getRemark();
+ if (!transferPaymentScale.equals(transferPaymentScaleEdit)) {
+ wrapOperLog(loginUser, tbBasicData, transferPaymentScale, transferPaymentScaleEdit,
+ tbOperlogList, "转移支付规模");
+ }
+ if (!currentGdp.equals(currentGdpEdit)) {
+ wrapOperLog(loginUser, tbBasicData, currentGdp, currentGdpEdit, tbOperlogList,
+ "当期GDP");
+ }
+ if (!remark.equals(remarkEdit)) {
+ wrapOperLog(loginUser, tbBasicData, remark, remarkEdit, tbOperlogList, "备注");
+ }
+ Map<Long, TbBasicDataField> basicDataFieldMap = originFields.stream()
+ .collect(Collectors.toMap(TbBasicDataField::getFieldId, e -> e));
+ for (BasicDataFieldDTO field : dto.getFields()) {
+ TbBasicDataField tbBasicDataField = basicDataFieldMap.get(field.getFieldId());
+ TbField tbField = fieldMap.get(field.getFieldId());
+ if (Objects.nonNull(tbBasicDataField) && Objects.nonNull(tbField)
+ && !tbBasicDataField.getFieldValue().equals(field.getFieldValue())) {
+ String levelOneCategory = tbField.getLevelOneCategory();
+ String levelTwoCategory = tbField.getLevelTwoCategory();
+ String levelThreeCategory = tbField.getLevelThreeCategory();
+ String fieldName = tbField.getFieldName();
+ StringBuilder result = new StringBuilder();
+ result.append(levelOneCategory).append("-");
+ if (StringUtils.isNotBlank(levelTwoCategory)) {
+ result.append(levelTwoCategory).append("-");
+ if (StringUtils.isNotBlank(levelThreeCategory)) {
+ result.append(levelThreeCategory).append("-").append(fieldName);
+ } else {
+ result.append(fieldName);
+ }
+ } else {
+ result.append(field);
+ }
+ wrapOperLog(loginUser, tbBasicData, tbBasicDataField.getFieldValue(),
+ field.getFieldValue(), tbOperlogList, result.toString());
+ }
+ }
+ }
+
+ private static void wrapOperLog(LoginUser loginUser, TbBasicData tbBasicData, String before,
+ String after, List<TbOperLog> tbOperlogList, String fieldName) {
+ SysUser user = loginUser.getUser();
+ TbOperLog tbOperLog = new TbOperLog();
+ tbOperLog.setOperation(tbBasicData.getQuarter());
+ tbOperLog.setStaffName(
+ user.getUserType() == UserTypeEnum.PLATFORM ? user
+ .getUserName()
+ : user.getNickName());
+ tbOperLog.setAreaName(
+ user.getUserType() == UserTypeEnum.PLATFORM ? "平台" : user.getAreaName());
+ tbOperLog.setFieldName(fieldName);
+ tbOperLog.setBusinessType(BusinessType.UPDBASICDATA.ordinal());
+ tbOperLog.setBeforeEdit(before);
+ tbOperLog.setAfterEdit(after);
+ tbOperlogList.add(tbOperLog);
+ }
+
@Override
- @Transactional(rollbackFor = Exception.class)
public void importBasicData(MultipartFile file) throws Exception {
+ Date date = new Date();
+ Date quarterStart = DateUtil.beginOfQuarter(date);
+ Date quarterEnd = DateUtil.endOfQuarter(date);
+ // 判断当前时间是否在季度初1-15号
+ Instant instant = quarterStart.toInstant();
+ LocalDate quarterStartLocalDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate fifteenDaysLimit = quarterStartLocalDate.plusDays(14);
+ LocalDate now = LocalDate.now();
+ //TODO
+ /* if (now.isBefore(quarterStartLocalDate) || now.isAfter(fifteenDaysLimit)) {
+ throw new ServiceException("请于季度初1-15号上传季度数据。");
+ }*/
LoginUser loginUser = SecurityUtils.getLoginUser();
String areaCode = loginUser.getUser().getAreaCode();
EasyExcel.read(
@@ -280,19 +483,19 @@
tbBasicDataFieldService,
tbBasicDataConfigService,
tbBasicDataConfigDetailService,
- tbScoreService))
+ tbScoreService, tbDataScreenScoreService, tbDataScreenConfigService))
.sheet()
.doRead();
}
- private void calculateScore(TbBasicData tbBasicData) {
+ private void calculateScore(TbBasicData tbBasicData, List<TbBasicDataField> fields) {
// 计算得分
List<TbBasicDataConfig> list =
tbBasicDataConfigService
.lambdaQuery()
.eq(TbBasicDataConfig::getStatus, ShowStatusEnum.SHOW)
.list();
- if (CollectionUtils.isEmpty(list)) {
+ if (CollUtils.isEmpty(list)) {
throw new ServiceException("计算得分失败，平台未配置得分计算规则");
}
List<TbBasicDataConfig> numCalculates =
@@ -303,36 +506,33 @@
list.stream()
.filter(item -> !CalculateTypeEnum.NUMBER.equals(item.getCalculateType()))
.collect(Collectors.toList());
- if (CollectionUtils.isNotEmpty(numCalculates)) {
- numCalculates.forEach(
- item -> {
- Map<String, Object> valueMap = new HashMap<>();
- String numberCalculateFormula = item.getNumberCalculateFormula();
- Map<String, Integer> fieldsAndValue =
- CalculateUtil.getFieldsAndValue(numberCalculateFormula);
- for (Map.Entry<String, Integer> stringIntegerEntry : fieldsAndValue.entrySet()) {
- Optional<TbBasicDataField> tbBasicDataField =
- tbBasicDataFieldService
- .lambdaQuery()
- .eq(TbBasicDataField::getBasicDataId,
- tbBasicData.getId())
- .eq(TbBasicDataField::getFieldId,
- stringIntegerEntry.getValue())
- .oneOpt();
- tbBasicDataField.ifPresent(
- basicDataField ->
- valueMap.put(stringIntegerEntry.getKey(),
- basicDataField.getFieldValue()));
+ Map<Long, TbBasicDataField> basicDataFieldMap = fields.stream()
+ .collect(Collectors.toMap(TbBasicDataField::getFieldId, e -> e));
+ if (CollUtils.isNotEmpty(numCalculates)) {
+ for (TbBasicDataConfig item : numCalculates) {
+ String numberCalculateFormula = item.getNumberCalculateFormula();
+ List<CalculateItemDTO> calculateItemDTOS = JSONArray.parseArray(
+ numberCalculateFormula, CalculateItemDTO.class);
+ for (CalculateItemDTO dto : calculateItemDTOS) {
+ if (ValueTypeEnum.FIELD.equals(dto.getValueType())) {
+ TbBasicDataField tbBasicDataField = basicDataFieldMap.get(
+ Long.valueOf(dto.getContent()));
+ if (Objects.nonNull(tbBasicDataField)) {
+ dto.setContent(tbBasicDataField.getFieldValue());
}
- double score = CalculateUtil.calculate(numberCalculateFormula, valueMap);
- TbScore tbScore = new TbScore();
- tbScore.setBasicDataId(tbBasicData.getId());
- tbScore.setScore(score);
- tbScore.setBasicDataConfigId(item.getId());
- tbScoreService.save(tbScore);
- });
+ }
+ }
+ String numberCalculateFormulaStr = calculateItemDTOS.stream()
+ .map(CalculateItemDTO::getContent).collect(Collectors.joining());
+ double score = CalculateUtil.calculate(numberCalculateFormulaStr);
+ TbScore tbScore = new TbScore();
+ tbScore.setBasicDataId(tbBasicData.getId());
+ tbScore.setScore(score);
+ tbScore.setBasicDataConfigId(item.getId());
+ tbScoreService.save(tbScore);
+ }
}
- if (CollectionUtils.isNotEmpty(textAndPercentages)) {
+ if (CollUtils.isNotEmpty(textAndPercentages)) {
for (TbBasicDataConfig textAndPercentage : textAndPercentages) {
TbScore tbScore = new TbScore();
List<TbBasicDataConfigDetail> details =
@@ -347,18 +547,12 @@
Collectors.toMap(
TbBasicDataConfigDetail::getKey,
TbBasicDataConfigDetail::getValue));
- if (CollectionUtils.isNotEmpty(details)) {
- Optional<TbBasicDataField> tbBasicDataFieldOptional =
- tbBasicDataFieldService
- .lambdaQuery()
- .eq(TbBasicDataField::getBasicDataId, tbBasicData.getId())
- .eq(TbBasicDataField::getFieldId,
- textAndPercentage.getFieldIdStr())
- .oneOpt();
- if (tbBasicDataFieldOptional.isPresent()) {
- TbBasicDataField tbBasicDataField = tbBasicDataFieldOptional.get();
+ if (CollUtils.isNotEmpty(details)) {
+ TbBasicDataField textAndPercentageData = basicDataFieldMap.get(
+ Long.valueOf(textAndPercentage.getFieldIdStr()));
+ if (Objects.nonNull(textAndPercentageData)) {
if (CalculateTypeEnum.TEXT.equals(textAndPercentage.getCalculateType())) {
- String score = scoreMap.get(tbBasicDataField.getFieldValue());
+ String score = scoreMap.get(textAndPercentageData.getFieldValue());
tbScore.setBasicDataId(tbBasicData.getId());
tbScore.setScore(Double.parseDouble(score));
tbScore.setBasicDataConfigId(textAndPercentage.getId());
@@ -367,8 +561,9 @@
if (CalculateTypeEnum.PERCENTAGE.equals(
textAndPercentage.getCalculateType())) {
for (Map.Entry<String, String> stringStringEntry : scoreMap.entrySet()) {
- String[] split = stringStringEntry.getKey().split("-");
- double v = Double.parseDouble(tbBasicDataField.getFieldValue());
+ String[] split = stringStringEntry.getKey().split("_");
+ double v = Double.parseDouble(
+ textAndPercentageData.getFieldValue());
double min = Double.parseDouble(split[0]);
double max = Double.parseDouble(split[1]);
if (v >= min && v <= max) {
@@ -391,17 +586,15 @@
Page<ScoreVO> page = new Page<>(query.getPageNum(), query.getPageSize());
SysUser user = SecurityUtils.getLoginUser().getUser();
String areaCode = user.getAreaCode();
- Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
- // 当前季度开始
- Date quarterStart = quarterDate.get("first");
- // 当前季度结束
- Date quarterEnd = quarterDate.get("last");
+ Date date = new Date();
+ Date quarterStart = DateUtil.beginOfQuarter(date);
+ Date quarterEnd = DateUtil.endOfQuarter(date);
// 查询是否有当前季度的填报记录
TbBasicData basicData =
this.getOne(
Wrappers.<TbBasicData>lambdaQuery()
.eq(TbBasicData::getDeptAreaCode, areaCode)
- .between(TbBasicData::getCreateTime, quarterStart, quarterEnd));
+ .between(TbBasicData::getReportingTime, quarterStart, quarterEnd));
if (Objects.isNull(basicData)) {
return PageDTO.empty(page);
}
@@ -419,6 +612,7 @@
throw new ServiceException("非法参数");
}
CurrentFieldsDetailVO vo = BeanUtils.copyBean(basicData, CurrentFieldsDetailVO.class);
+ vo.setId(basicData.getId());
// 查询用户信息
sysUserService
.lambdaQuery()
@@ -544,17 +738,18 @@
.collect(Collectors.toMap(SysUser::getAreaCode, e -> e));
Set<Long> basicDataIds =
basicDataList.stream().map(TbBasicData::getId).collect(Collectors.toSet());
- Map<Long, TbBasicDataField> basicDataFieldMap =
- tbBasicDataFieldService
- .lambdaQuery()
- .in(TbBasicDataField::getBasicDataId, basicDataIds)
- .list()
- .stream()
- .collect(Collectors.toMap(TbBasicDataField::getFieldId, e -> e));
+
+ List<TbBasicDataField> tbBasicDataFieldList = tbBasicDataFieldService
+ .lambdaQuery()
+ .in(TbBasicDataField::getBasicDataId, basicDataIds)
+ .list();
// 值
List<Object> result = new ArrayList<>();
for (TbBasicData tbBasicData : basicDataList) {
SysUser user = userMap.get(tbBasicData.getDeptAreaCode());
+ Map<Long, TbBasicDataField> basicDataFieldMap = tbBasicDataFieldList.stream()
+ .filter(field -> field.getBasicDataId().equals(tbBasicData.getId()))
+ .collect(Collectors.toMap(TbBasicDataField::getFieldId, e -> e));
List<String> item = new ArrayList<>();
item.add(Objects.nonNull(user) ? user.getAreaName() : "");
item.add(tbBasicData.getQuarter());
@@ -564,8 +759,7 @@
TbBasicDataField tbBasicDataField = basicDataFieldMap.get(tbField.getId());
item.add(
Objects.nonNull(tbBasicDataField)
- ? FieldBuildUtil.formatNumberWithCommas(
- tbBasicDataField.getFieldValue())
+ ? tbBasicDataField.getFieldValue()
: "");
}
item.add(tbBasicData.getRemark());
@@ -672,8 +866,7 @@
TbBasicDataField tbBasicDataField = basicDataFieldMap.get(tbField.getId());
item.add(
Objects.nonNull(tbBasicDataField)
- ? FieldBuildUtil.formatNumberWithCommas(
- tbBasicDataField.getFieldValue())
+ ? tbBasicDataField.getFieldValue()
: "");
}
item.add(tbBasicData.getRemark());
@@ -705,7 +898,8 @@
tbBasicDataFieldService,
tbBasicDataConfigService,
tbBasicDataConfigDetailService,
- tbScoreService, sysUserService, quarter))
+ tbScoreService, sysUserService, quarter, tbDataScreenScoreService,
+ tbDataScreenConfigService))
.sheet()
.doRead();
}
@@ -847,4 +1041,118 @@
headTitles.add(Lists.newArrayList("备注"));
return headTitles;
}
+
+ @Override
+ public Page<TransferPaymentScaleVO> transferPaymentScalePage(Page<TransferPaymentScaleVO> page,
+ String quarter) {
+ Page<TransferPaymentScaleVO> pageVO = baseMapper.transferPaymentScalePage(
+ page, quarter);
+ int rank = 1;
+ for (TransferPaymentScaleVO record : pageVO.getRecords()) {
+ record.setRank(rank++);
+ }
+ return pageVO;
+ }
+
+ @Override
+ public List<FieldAndScoreDataVO> selectBasicDataFieldsConfig(String areaCode,
+ String nowQuarter) {
+ return baseMapper.selectBasicDataFieldsConfig(areaCode, nowQuarter);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void editBasicData(BasicDataUpdDTO dto) throws Exception {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ // 数据校验
+ if (Objects.isNull(dto)) {
+ return;
+ }
+ //查询基础数据
+ TbBasicData basicData = this.getById(dto.getId());
+ if (Objects.isNull(basicData)) {
+ throw new ServiceException("非法参数");
+ }
+ String nowQuarter = DateUtils.getNowQuarter();
+ this.updateById(basicData);
+ //查询该基础数据的动态字端
+ List<TbBasicDataField> originFields = tbBasicDataFieldService.lambdaQuery()
+ .eq(TbBasicDataField::getBasicDataId, basicData.getId()).list();
+ Set<Long> fieldIdList = originFields.stream().map(TbBasicDataField::getFieldId)
+ .collect(Collectors.toSet());
+ Map<Long, TbField> fieldMap = tbFieldService.lambdaQuery().in(TbField::getId, fieldIdList)
+ .list().stream().collect(Collectors.toMap(TbField::getId, e -> e));
+ CompletableFuture.runAsync(
+ () -> saveExchangeLog(loginUser, basicData, originFields,
+ BeanUtils.copyBean(dto, BasicDataDTO.class),
+ fieldMap));
+ TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
+
+ // 保存基础数据动态字段数据
+ List<TbBasicDataField> tbBasicDataFields =
+ BeanUtils.copyList(dto.getFields(), TbBasicDataField.class);
+
+ for (TbBasicDataField item : tbBasicDataFields) {
+ TbField tbField = fieldMap.get(item.getFieldId());
+ Integer numMax = tbField.getNumMax();
+ Integer numMin = tbField.getNumMin();
+ Integer textMaxNum = tbField.getTextMaxNum();
+ Integer textMinNum = tbField.getTextMinNum();
+ if (FieldTypeEnum.NUMBER.equals(tbField.getFieldType()) && Objects.nonNull(
+ numMax) && Objects.nonNull(numMin)) {
+ double fieldValue = Double.parseDouble(item.getFieldValue());
+ if (fieldValue < numMin || fieldValue > numMax) {
+ throw new ServiceException(
+ String.format("字段%s的值不在范围%d-%d内", tbField.getFieldName(),
+ numMin, numMax));
+ }
+ }
+ if (FieldTypeEnum.TEXT.equals(tbField.getFieldType())
+ && FieldInputTypeEnum.MANUAL_INPUT.equals(tbField.getTextInputType())
+ && Objects.nonNull(
+ textMaxNum) && Objects.nonNull(textMinNum)) {
+ String fieldValue = item.getFieldValue();
+ if (fieldValue.length() < numMin || fieldValue.length() > numMax) {
+ throw new ServiceException(
+ String.format("字段%s的值的长度不在范围%d-%d内", tbField.getFieldName(),
+ textMinNum, textMaxNum));
+ }
+ }
+ }
+ tbBasicDataFields.forEach(
+ item -> {
+ item.setBasicDataId(tbBasicData.getId());
+ TbField tbField = fieldMap.get(item.getFieldId());
+ if (Objects.nonNull(tbField)) {
+ item.setFieldName(tbField.getFieldName());
+ }
+ });
+ // 添加固定字段 转移支付规模、当期GDP
+ TbBasicDataField transferPaymentScale = new TbBasicDataField();
+ transferPaymentScale.setBasicDataId(tbBasicData.getId());
+ transferPaymentScale.setFieldId(-1L);
+ transferPaymentScale.setFieldValue(tbBasicData.getTransferPaymentScale());
+ tbBasicDataFields.add(transferPaymentScale);
+ TbBasicDataField currentGdp = new TbBasicDataField();
+ currentGdp.setBasicDataId(tbBasicData.getId());
+ currentGdp.setFieldId(-2L);
+ currentGdp.setFieldValue(tbBasicData.getCurrentGdp());
+ tbBasicDataFields.add(currentGdp);
+ TbBasicDataField remark = new TbBasicDataField();
+ remark.setBasicDataId(tbBasicData.getId());
+ remark.setFieldId(-3L);
+ remark.setFieldValue(tbBasicData.getRemark());
+ tbBasicDataFields.add(remark);
+ // 将该基础数据的动态字段数据全部删除
+ tbBasicDataFieldService.remove(
+ Wrappers.<TbBasicDataField>lambdaQuery()
+ .eq(TbBasicDataField::getBasicDataId, tbBasicData.getId()));
+ tbBasicDataFieldService.saveBatch(tbBasicDataFields);
+ if (ReportingStatusEnum.FILLED.equals(tbBasicData.getStatus())) {
+ CompletableFuture.runAsync(() -> {
+ calculateScore(tbBasicData, tbBasicDataFields);
+ calculateScreenScore(tbBasicData, tbBasicDataFields);
+ });
+ }
+ }
}
--
Gitblit v1.7.1