From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataServiceImpl.java | 198 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 165 insertions(+), 33 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 d755803..77e4182 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,23 +1,25 @@
package com.ruoyi.system.service.impl;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.enums.ReportingStatusEnum;
-import com.ruoyi.common.enums.ShowStatusEnum;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.*;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.BeanUtils;
-import com.ruoyi.common.utils.CollUtils;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.NumberDisplaceChineseUtil;
+import com.ruoyi.common.utils.*;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.BasicDataDTO;
+import com.ruoyi.system.handler.CustomerHandler;
+import com.ruoyi.system.handler.SelectedSheetWriteHandler;
import com.ruoyi.system.listener.BasicDataListener;
import com.ruoyi.system.mapper.TbBasicDataMapper;
+import com.ruoyi.system.mapper.TbDeptMapper;
import com.ruoyi.system.query.ScoreQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.BasicDataReportingVO;
@@ -51,18 +53,19 @@
@RequiredArgsConstructor
public class TbBasicDataServiceImpl extends ServiceImpl<TbBasicDataMapper, TbBasicData> implements TbBasicDataService {
- private final TbDeptService tbDeptService;
+ private final TbDeptMapper tbDeptMapper;
private final HttpServletResponse response;
private final TbFieldService tbFieldService;
private final TbBasicDataFieldService tbBasicDataFieldService;
private final TbBasicDataConfigService tbBasicDataConfigService;
private final TbBasicDataConfigDetailService tbBasicDataConfigDetailService;
- private final TbScoreService scoreService;
+ private final TbScoreService tbScoreService;
+
@Override
public R<BasicDataReportingVO> getBasicFields(String deptAreaCode) throws Exception {
BasicDataReportingVO vo = new BasicDataReportingVO();
//校验区划代码
- TbDept dept = tbDeptService.getOne(Wrappers.<TbDept>lambdaQuery().eq(TbDept::getAreaCode, deptAreaCode));
+ TbDept dept = tbDeptMapper.selectOne(Wrappers.<TbDept>lambdaQuery().eq(TbDept::getAreaCode, deptAreaCode));
if (Objects.isNull(dept)) {
throw new ServiceException(String.format("区划代码%s不存在", deptAreaCode));
}
@@ -106,7 +109,7 @@
List<TbBasicDataField> basicDataFields = tbBasicDataFieldService.lambdaQuery()
.eq(TbBasicDataField::getBasicDataId, basicData.getId()).list();
if (CollUtils.isNotEmpty(basicDataFields)) {
- Map<Integer, TbBasicDataField> fieldMap = basicDataFields.stream()
+ Map<Long, TbBasicDataField> fieldMap = basicDataFields.stream()
.collect(Collectors.toMap(TbBasicDataField::getFieldId, Function.identity()));
vo.getFields().forEach(item -> {
TbBasicDataField tbBasicDataField = fieldMap.get(item.getId());
@@ -123,21 +126,47 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveBasicData(BasicDataDTO dto) {
- //TODO
- //LoginUser loginUser = SecurityUtils.getLoginUser();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String areaCode = loginUser.getUser().getAreaCode();
//数据校验
if (Objects.isNull(dto) || CollUtils.isEmpty(dto.getFields())) {
return;
}
-
TbBasicData tbBasicData = BeanUtils.copyBean(dto, TbBasicData.class);
+ tbBasicData.setDeptAreaCode(areaCode);
+ tbBasicData.setStatus(ReportingStatusEnum.MISSING_DATA);
this.saveOrUpdate(tbBasicData);
//保存基础数据动态字段数据
List<TbBasicDataField> tbBasicDataFields = BeanUtils.copyList(dto.getFields(), TbBasicDataField.class);
tbBasicDataFields.forEach(item -> item.setBasicDataId(tbBasicData.getId()));
+ //查询需要填写的动态字段
+ List<TbField> fieldList = tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
+ //添加固定字段 转移支付规模、当期GDP
+ TbBasicDataField transferPaymentScale = new TbBasicDataField();
+ transferPaymentScale.setBasicDataId(tbBasicData.getId());
+ transferPaymentScale.setFieldId(-1L);
+ transferPaymentScale.setFieldValue(tbBasicData.getTransferPaymentScale());
+ tbBasicDataFields.add(transferPaymentScale);
+ TbBasicDataField currentGdp = new TbBasicDataField();
+ transferPaymentScale.setBasicDataId(tbBasicData.getId());
+ transferPaymentScale.setFieldId(-2L);
+ transferPaymentScale.setFieldValue(tbBasicData.getCurrentGdp());
+ tbBasicDataFields.add(currentGdp);
//将该基础数据的动态字段数据全部删除
- tbBasicDataFieldService.remove(null);
+ tbBasicDataFieldService.remove(Wrappers.<TbBasicDataField>lambdaQuery().eq(TbBasicDataField::getBasicDataId, tbBasicData.getId()));
tbBasicDataFieldService.saveBatch(tbBasicDataFields);
+ //需要填写的动态字段
+ Set<Long> fieldIds = fieldList.stream().map(TbField::getId).collect(Collectors.toSet());
+ //用户填写的动态字段
+ Set<Long> deptFieldIds = tbBasicDataFields.stream().map(TbBasicDataField::getFieldId).collect(Collectors.toSet());
+ boolean flag = deptFieldIds.containsAll(fieldIds) && (StringUtils.isNotEmpty(dto.getTransferPaymentScale())&& StringUtils.isNotEmpty(dto.getCurrentGdp()));
+ if (flag) {
+ tbBasicData.setStatus(ReportingStatusEnum.FILLED);
+ this.updateById(tbBasicData);
+ }
+ if (ReportingStatusEnum.FILLED.equals(tbBasicData.getStatus())) {
+ calculateScore(tbBasicData);
+ }
}
@Override
@@ -149,16 +178,47 @@
response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
//查询需要填写的动态字段
List<TbField> list = tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
+ List<List<String>> head = head(list);
+ List<TbField> collect = list.stream()
+ .filter(item -> FieldTypeEnum.TEXT.equals(item.getFieldType()))
+ .filter(item -> FieldInputTypeEnum.FIXED_CONTENT.equals(item.getTextInputType()))
+ .collect(Collectors.toList());
+ Map<Integer, String[]> selectedMap = new HashMap<>();
+ if (CollUtils.isNotEmpty(collect)) {
+ selectedMap = new HashMap<>();
+ for (TbField tbField : collect) {
+ int outerListIndex = getOuterListIndex(head, tbField.getFieldName());
+ String[] selectStr = tbField.getTextContent().split(",");
+ selectedMap.put(outerListIndex, selectStr);
+ }
+ }
// 这里需要设置不关闭流
- EasyExcel.write(response.getOutputStream()).head(head(list))
- .autoCloseStream(Boolean.FALSE).sheet("模板")
+ EasyExcel.write(response.getOutputStream()).head(head)
+ .autoCloseStream(Boolean.TRUE).sheet("模板")
+ .registerWriteHandler(new SelectedSheetWriteHandler(selectedMap))
+ .registerWriteHandler(new CustomerHandler())
+ .registerWriteHandler(EasyExcelUtil.getStyleStrategy())
.doWrite(dataList(list));
}
+ /**
+ * 根据字段名获取该字段下标
+ * @param list 表头
+ * @param value 字段名
+ * @return 下标
+ */
+ public int getOuterListIndex(List<List<String>> list, String value) {
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).contains(value)) {
+ return i;
+ }
+ }
+ return -1; // 返回-1表示未找到
+ }
private List<List<Object>> dataList(List<TbField> list) throws Exception {
- //TODO
- //LoginUser loginUser = SecurityUtils.getLoginUser();
- TbDept dept = tbDeptService.getById(44);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String areaName = loginUser.getUser().getAreaName();
+
//当前所在季度
int quarterOfYear = DateUtils.getQuarterOfYear(new Date());
String quarterOfYearStr = NumberDisplaceChineseUtil.numberToChinese(quarterOfYear);
@@ -169,7 +229,7 @@
columnNo.add(String.valueOf(i));
}
excellist.add(columnNo);
- excellist.add(Lists.newArrayList(dept.getAreaName(), String.format("%s季度",quarterOfYearStr)));
+ excellist.add(Lists.newArrayList(areaName, String.format("%s季度",quarterOfYearStr)));
return excellist;
}
@@ -181,31 +241,103 @@
headTitles.add(Lists.newArrayList("转移支付规模"));
headTitles.add(Lists.newArrayList("当期GDP"));
list.forEach(item ->{
- headTitles.add(Lists.newArrayList(item.getLevelOneCategory(), item.getLevelTwoCategory(), item.getLevelThreeCategory(), item.getFieldName()));
+ String levelOneCategory = item.getLevelOneCategory();
+ String levelTwoCategory = item.getLevelTwoCategory();
+ String levelThreeCategory = item.getLevelThreeCategory();
+ String fieldName = item.getFieldName();
+ headTitles.add(Lists.newArrayList(levelOneCategory,StringUtils.isBlank(levelTwoCategory) ? fieldName : levelTwoCategory, StringUtils.isBlank(levelThreeCategory) ? fieldName : levelThreeCategory, fieldName));
});
headTitles.add(Lists.newArrayList("备注"));
return headTitles;
}
-
@Override
@Transactional(rollbackFor = Exception.class)
public void importBasicData(MultipartFile file) throws Exception {
- //TODO
- //LoginUser loginUser = SecurityUtils.getLoginUser();
- TbDept dept = tbDeptService.getById(44);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String areaCode = loginUser.getUser().getAreaCode();
//查询需要填写的动态字段
List<TbField> fieldList = tbFieldService.lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW).list();
EasyExcel.read(file.getInputStream(), new BasicDataListener(this,fieldList,
- tbFieldService,dept,tbBasicDataFieldService,tbBasicDataConfigService,
- tbBasicDataConfigDetailService,scoreService)).sheet().doRead();
+ tbFieldService,areaCode,tbBasicDataFieldService,tbBasicDataConfigService,
+ tbBasicDataConfigDetailService,tbScoreService)).sheet().doRead();
}
-
+ private void calculateScore(TbBasicData tbBasicData) {
+ //计算得分
+ List<TbBasicDataConfig> list = tbBasicDataConfigService.lambdaQuery().eq(TbBasicDataConfig::getStatus, ShowStatusEnum.SHOW).list();
+ if (CollectionUtils.isEmpty(list)) {
+ throw new ServiceException("计算得分失败，平台未配置得分计算规则");
+ }
+ List<TbBasicDataConfig> numCalculates = list.stream()
+ .filter(item -> CalculateTypeEnum.NUMBER.equals(item.getCalculateType()))
+ .collect(Collectors.toList());
+ List<TbBasicDataConfig> textAndPercentages = 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()));
+ }
+ double score = CalculateUtil.calculate(numberCalculateFormula, valueMap);
+ TbScore tbScore = new TbScore();
+ tbScore.setBasicDataId(tbBasicData.getId());
+ tbScore.setScore(score);
+ tbScore.setBasicDataConfigId(item.getId());
+ tbScoreService.save(tbScore);
+ });
+ }
+ if (CollectionUtils.isNotEmpty(textAndPercentages)) {
+ for (TbBasicDataConfig textAndPercentage : textAndPercentages) {
+ TbScore tbScore = new TbScore();
+ List<TbBasicDataConfigDetail> details = tbBasicDataConfigDetailService.lambdaQuery()
+ .eq(TbBasicDataConfigDetail::getBasicDataConfigId, textAndPercentage.getId())
+ .list();
+ Map<String, String> scoreMap = details.stream().collect(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 (CalculateTypeEnum.TEXT.equals(textAndPercentage.getCalculateType())) {
+ String score = scoreMap.get(tbBasicDataField.getFieldValue());
+ tbScore.setBasicDataId(tbBasicData.getId());
+ tbScore.setScore(Double.parseDouble(score));
+ tbScore.setBasicDataConfigId(textAndPercentage.getId());
+ tbScoreService.save(tbScore);
+ }
+ 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());
+ double min = Double.parseDouble(split[0]);
+ double max = Double.parseDouble(split[1]);
+ if (v >= min && v <= max) {
+ tbScore.setScore(Double.parseDouble(stringStringEntry.getValue()));
+ }
+ }
+ tbScore.setBasicDataId(tbBasicData.getId());
+ tbScore.setBasicDataConfigId(textAndPercentage.getId());
+ tbScoreService.save(tbScore);
+ }
+ }
+ }
+ }
+ }
+ }
@Override
public PageDTO<ScoreVO> pageScore(ScoreQuery query) {
Page<ScoreVO> page = new Page<>(query.getPageNum(), query.getPageSize());
- //todo 获取当前登录部门
- //校验区划代码
- TbDept dept = tbDeptService.getById(44);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ String areaCode = user.getAreaCode();
Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
//当前季度开始
Date quarterStart = quarterDate.get("first");
@@ -213,14 +345,14 @@
Date quarterEnd = quarterDate.get("last");
//查询是否有当前季度的填报记录
TbBasicData basicData = this.getOne(Wrappers.<TbBasicData>lambdaQuery()
- .eq(TbBasicData::getDeptAreaCode, dept.getAreaCode())
+ .eq(TbBasicData::getDeptAreaCode, areaCode)
.between(TbBasicData::getCreateTime, quarterStart,quarterEnd));
if (Objects.isNull(basicData)) {
return PageDTO.empty(page);
}
query.setBasicDataId(basicData.getId());
//查询对应的基础数据配置
- List<ScoreVO> vos = scoreService.pageScore(query,page);
+ List<ScoreVO> vos = tbScoreService.pageScore(query,page);
return PageDTO.of(page, vos);
}
}
--
Gitblit v1.7.1