c029d47e
姜超
feature(*): 考评导入修改
|
1
2
|
package cn.fw.morax.service.biz.eval;
|
99c55e88
姜超
feature(*): 导入分页查询
|
3
|
import cn.fw.common.data.mybatis.pagination.PageData;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
4
|
import cn.fw.common.exception.BusinessException;
|
99c55e88
姜超
feature(*): 导入分页查询
|
5
|
import cn.fw.common.page.AppPage;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
6
|
import cn.fw.common.web.auth.LoginAuthBean;
|
edc57409
姜超
feature(*): 考评奖惩分配
|
7
|
import cn.fw.morax.common.pojo.event.ImportEvalIndicatorEvent;
|
edc57409
姜超
feature(*): 考评奖惩分配
|
8
|
import cn.fw.morax.common.utils.EventBusUtil;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
9
10
|
import cn.fw.morax.common.utils.ExcelDataUtil;
import cn.fw.morax.common.utils.PublicUtil;
|
99c55e88
姜超
feature(*): 导入分页查询
|
11
12
|
import cn.fw.morax.domain.db.eval.*;
import cn.fw.morax.domain.dto.query.EvalIndicatorImportQueryDTO;
|
99c55e88
姜超
feature(*): 导入分页查询
|
13
14
|
import cn.fw.morax.domain.enums.DimensionTypeEnum;
import cn.fw.morax.domain.enums.ImportErrorReasonEnum;
|
99c55e88
姜超
feature(*): 导入分页查询
|
15
16
|
import cn.fw.morax.domain.enums.SettingStatusEnum;
import cn.fw.morax.domain.vo.eval.*;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
17
|
import cn.fw.morax.service.biz.CommonService;
|
99c55e88
姜超
feature(*): 导入分页查询
|
18
|
import cn.fw.morax.service.data.eval.*;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
19
20
|
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
|
dc3c54cf
姜超
feature(*): 修改上传
|
21
|
import com.alibaba.fastjson.JSON;
|
7060fbd3
姜超
feature(*): 修改代码格式
|
22
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
99c55e88
姜超
feature(*): 导入分页查询
|
23
24
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
|
dc3c54cf
姜超
feature(*): 修改上传
|
25
|
import lombok.Getter;
|
c029d47e
姜超
feature(*): 考评导入修改
|
26
27
|
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
|
99c55e88
姜超
feature(*): 导入分页查询
|
28
|
import org.apache.commons.collections4.map.MultiKeyMap;
|
b5babc65
姜超
feature(*): 参数修改
|
29
|
import org.apache.poi.ss.formula.functions.T;
|
dc3c54cf
姜超
feature(*): 修改上传
|
30
31
32
33
|
import org.checkerframework.checker.units.qual.K;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.BoundValueOperations;
import org.springframework.data.redis.core.StringRedisTemplate;
|
c029d47e
姜超
feature(*): 考评导入修改
|
34
|
import org.springframework.stereotype.Service;
|
f692be3a
姜超
feature(*): 查询修改
|
35
|
import org.springframework.transaction.annotation.Transactional;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
36
37
38
39
40
|
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
|
e1778851
姜超
feature(*): 计算考评调整
|
41
|
import java.math.BigDecimal;
|
936e630c
姜超
feature(*): 门店奖惩分配
|
42
|
import java.time.LocalDate;
|
89b6bb5c
姜超
feature(*): 时间处理
|
43
44
|
import java.time.LocalDateTime;
import java.time.LocalTime;
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
45
|
import java.time.YearMonth;
|
e1778851
姜超
feature(*): 计算考评调整
|
46
|
import java.time.format.DateTimeFormatter;
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
47
|
import java.util.*;
|
dc3c54cf
姜超
feature(*): 修改上传
|
48
|
import java.util.concurrent.TimeUnit;
|
99c55e88
姜超
feature(*): 导入分页查询
|
49
50
|
import java.util.function.Function;
import java.util.stream.Collectors;
|
c029d47e
姜超
feature(*): 考评导入修改
|
51
|
|
c029d47e
姜超
feature(*): 考评导入修改
|
52
53
54
55
56
57
58
59
60
|
/**
* @author jiangchao
* @des: 考评指标上报
* @date 2023/2/8 17:04
*/
@Service
@Slf4j
@RequiredArgsConstructor
public class EvalIndicatorReportService {
|
02ed4b17
姜超
feature(*): 考评导入修改
|
61
|
|
99c55e88
姜超
feature(*): 导入分页查询
|
62
63
|
private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
private final EvalIndicatorImportDetailService evalIndicatorImportDetailService;
|
b5babc65
姜超
feature(*): 参数修改
|
64
|
private final EvalIndicatorService evalIndicatorService;
|
99c55e88
姜超
feature(*): 导入分页查询
|
65
|
private final EvalUserPoolService evalUserPoolService;
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
66
|
private final EvalShopPoolService evalShopPoolService;
|
dc3c54cf
姜超
feature(*): 修改上传
|
67
|
private final StringRedisTemplate stringRedisTemplate;
|
99c55e88
姜超
feature(*): 导入分页查询
|
68
69
|
private final EvalGroupService evalGroupService;
private final EvalService evalService;
|
99c55e88
姜超
feature(*): 导入分页查询
|
70
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
71
72
73
74
75
76
77
|
@Value("${spring.cache.custom.global-prefix}:eval-import:")
@Getter
private String evalImport;
@Value("${spring.cache.custom.global-prefix}:eval-import-detail:")
@Getter
private String evalImportDetail;
|
02ed4b17
姜超
feature(*): 考评导入修改
|
78
|
public void staffTemplateFile(HttpServletRequest request, HttpServletResponse response) {
|
99c55e88
姜超
feature(*): 导入分页查询
|
79
|
String fileName = "人员导入标准模板.xlsx";
|
02ed4b17
姜超
feature(*): 考评导入修改
|
80
|
String encodeFileName = CommonService.getEncodeName(request, fileName);
|
5a834c50
姜超
feature(*): 考评模板导出
|
81
|
CommonService.downloadExcel(response, staffTemplateData(), encodeFileName, StaffIndicatorValueVO.class);
|
02ed4b17
姜超
feature(*): 考评导入修改
|
82
83
|
}
|
99c55e88
姜超
feature(*): 导入分页查询
|
84
85
86
|
public void shopTemplateFile(HttpServletRequest request, HttpServletResponse response) {
String fileName = "门店导入标准模板.xlsx";
String encodeFileName = CommonService.getEncodeName(request, fileName);
|
5a834c50
姜超
feature(*): 考评模板导出
|
87
|
CommonService.downloadExcel(response, shopTemplateData(), encodeFileName, ShopIndicatorValueVO.class);
|
99c55e88
姜超
feature(*): 导入分页查询
|
88
89
|
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
90
91
92
93
94
95
96
|
/**
* 分页查询
*
* @param dto
* @return
*/
public AppPage<EvalIndicatorImportRecordVO> importPage(EvalIndicatorImportQueryDTO dto) {
|
d83a50ee
姜超
feature(*): 查询修改
|
97
98
|
LocalDateTime startTime = (PublicUtil.isNotEmpty(dto.getStartTime())) ? LocalDateTime.of(dto.getStartTime(), LocalTime.MIN) : null;
LocalDateTime endTime = (PublicUtil.isNotEmpty(dto.getEndTime())) ? LocalDateTime.of(dto.getEndTime(), LocalTime.MAX) : null;
|
936e630c
姜超
feature(*): 门店奖惩分配
|
99
100
101
102
|
PageData<EvalIndicatorImportRecord> pageData = evalIndicatorImportRecordService.page(new PageData<>(dto.getCurrent(), dto.getPageSize()),
Wrappers.<EvalIndicatorImportRecord>lambdaQuery()
.eq(PublicUtil.isNotEmpty(dto.getUserId()), EvalIndicatorImportRecord::getImportUserId, dto.getUserId())
.eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportRecord::getIndicatorCode, dto.getIndicatorCode())
|
89b6bb5c
姜超
feature(*): 时间处理
|
103
104
|
.ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime)
.le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime)
|
936e630c
姜超
feature(*): 门店奖惩分配
|
105
106
|
.eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
.orderByDesc(EvalIndicatorImportRecord::getCreateTime)
|
99c55e88
姜超
feature(*): 导入分页查询
|
107
|
);
|
936e630c
姜超
feature(*): 门店奖惩分配
|
108
109
110
111
112
|
return PublicUtil.toPage(pageData, importRecord -> {
EvalIndicatorImportRecordVO importRecordVO = PublicUtil.copy(importRecord, EvalIndicatorImportRecordVO.class);
return importRecordVO;
});
}
|
99c55e88
姜超
feature(*): 导入分页查询
|
113
|
|
7060fbd3
姜超
feature(*): 修改代码格式
|
114
115
|
public List<EvalIndicatorImportDetailVO> importDetail(Long id, Boolean querySuccess) {
LambdaQueryWrapper wrappers = Wrappers.<EvalIndicatorImportDetail>lambdaQuery()
|
db4579e4
姜超
feature(*): 新增台阶类型
|
116
|
.eq(EvalIndicatorImportDetail::getRecordId, id)
|
7060fbd3
姜超
feature(*): 修改代码格式
|
117
|
.eq(EvalIndicatorImportDetail::getYn, Boolean.TRUE);
|
7060fbd3
姜超
feature(*): 修改代码格式
|
118
119
120
121
122
123
124
125
|
if (PublicUtil.isNotEmpty(querySuccess)) {
if (querySuccess) {
wrappers.isNotNull("error_type");
}else {
wrappers.isNull("error_type");
}
}
List<EvalIndicatorImportDetail> details = evalIndicatorImportDetailService.list(wrappers);
|
936e630c
姜超
feature(*): 门店奖惩分配
|
126
127
|
if (PublicUtil.isEmpty(details)) {
return new ArrayList<>();
|
99c55e88
姜超
feature(*): 导入分页查询
|
128
129
|
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
130
131
132
|
List<EvalIndicatorImportDetailVO> detailVOS = Lists.newArrayListWithCapacity(details.size());
for (EvalIndicatorImportDetail detail : details) {
EvalIndicatorImportDetailVO detailVO = PublicUtil.copy(detail, EvalIndicatorImportDetailVO.class);
|
554c0be5
姜超
feature(*): 修改属性
|
133
|
detailVO.convertToPercent();
|
936e630c
姜超
feature(*): 门店奖惩分配
|
134
135
136
137
|
detailVOS.add(detailVO);
}
return detailVOS;
}
|
99c55e88
姜超
feature(*): 导入分页查询
|
138
|
|
f692be3a
姜超
feature(*): 查询修改
|
139
|
@Transactional(rollbackFor = Exception.class)
|
dc3c54cf
姜超
feature(*): 修改上传
|
140
|
public EvalIndicatorImportRecordVO uploadStaffIndicator(MultipartFile file, LoginAuthBean user) {
|
936e630c
姜超
feature(*): 门店奖惩分配
|
141
|
MultiKeyMap<String, EvalUserPool> staffPostMap = getShopUserPoolMap(user);
|
936e630c
姜超
feature(*): 门店奖惩分配
|
142
|
Map<String, EvalIndicator> evalIndicatorMap = getNameIndicatorMap();
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
143
|
EvalIndicatorImportRecord importRecord = createRecord(user, DimensionTypeEnum.STAFF);
|
dc3c54cf
姜超
feature(*): 修改上传
|
144
|
// evalIndicatorImportRecordService.save(importRecord);
|
99c55e88
姜超
feature(*): 导入分页查询
|
145
|
List<EvalIndicatorImportDetail> details = new ArrayList<>();
|
b5babc65
姜超
feature(*): 参数修改
|
146
|
List<StaffIndicatorValueVO> indicatorValues = this.analysisExcel(file, StaffIndicatorValueVO.class);
|
99c55e88
姜超
feature(*): 导入分页查询
|
147
148
|
Long importRecordId = importRecord.getId();
Integer errorNum = 0;
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
149
|
Set<String> uploadIndicatorCodes = new HashSet<>();
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
150
151
|
MultiKeyMap<String, String> repeatMap = new MultiKeyMap<>();
|
99c55e88
姜超
feature(*): 导入分页查询
|
152
|
for (StaffIndicatorValueVO staff : indicatorValues) {
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
153
154
155
156
157
158
159
160
161
162
163
|
Optional<StaffIndicatorValueVO> valueOptional = Optional.ofNullable(staff);
EvalIndicatorImportDetail importDetail = convertStaffPo(valueOptional);
importDetail.setRecordId(importRecordId);
details.add(importDetail);
if (repeatMap.containsKey(staff.getStaffName(), staff.getShopName(), staff.getIndicatorName())) {
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_STAFF);
errorNum += 1;
continue;
}
repeatMap.put(staff.getStaffName(), staff.getShopName(), staff.getIndicatorName(), "");
|
b5babc65
姜超
feature(*): 参数修改
|
164
|
importDetail.setDataDate(transferDate(staff.getDataDate()));
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
165
|
if (! staffPostMap.containsKey(staff.getShopName(), staff.getStaffName())) {
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
166
|
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_STAFF);
|
99c55e88
姜超
feature(*): 导入分页查询
|
167
|
errorNum += 1;
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
168
|
continue;
|
99c55e88
姜超
feature(*): 导入分页查询
|
169
|
}
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
170
171
172
173
174
|
EvalUserPool userPool = staffPostMap.get(staff.getShopName(), staff.getStaffName());
importDetail.setUserId(userPool.getUserId());
importDetail.setShopId(userPool.getShopId());
if (! evalIndicatorMap.containsKey(staff.getIndicatorName())) {
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
175
176
|
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_INDICATOR);
errorNum += 1;
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
177
|
continue;
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
178
|
}
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
179
180
181
182
183
184
|
EvalIndicator evalIndicator = evalIndicatorMap.get(staff.getIndicatorName());
uploadIndicatorCodes.add(evalIndicator.getCode());
importDetail.setIndicatorCode(evalIndicator.getCode());
importDetail.setIndicatorName(evalIndicator.getName());
importDetail.setIndicatorValue(new BigDecimal(staff.getIndicatorValue()));
importDetail.setDataType(evalIndicator.getDataType());
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
185
|
}
|
dc3c54cf
姜超
feature(*): 修改上传
|
186
|
Optional<EvalIndicatorImportDetail> detailOptional = details.stream().filter(detail -> PublicUtil.isEmpty(detail.getErrorType())).findFirst();
|
e1778851
姜超
feature(*): 计算考评调整
|
187
188
|
importRecord.setIndicatorCode(detailOptional.map(EvalIndicatorImportDetail::getIndicatorCode).orElse(""));
importRecord.setIndicatorName(detailOptional.map(EvalIndicatorImportDetail::getIndicatorName).orElse(""));
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
189
190
191
|
importRecord.setErrorNum(errorNum);
importRecord.setNum(indicatorValues.size());
importRecord.setSuccessNum(indicatorValues.size() - errorNum);
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
192
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
193
194
195
|
String key = PublicUtil.getUUID() + user.getUserId();
stringRedisTemplate.opsForValue().set(getEvalImport() + key, JSON.toJSONString(importRecord), 1 , TimeUnit.DAYS);
stringRedisTemplate.opsForValue().set(getEvalImportDetail() + key, JSON.toJSONString(details), 1 , TimeUnit.DAYS);
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
196
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
197
198
199
200
201
|
EvalIndicatorImportRecordVO recordVO = PublicUtil.copy(importRecord, EvalIndicatorImportRecordVO.class);
List<EvalIndicatorImportDetailVO> detailVos = PublicUtil.copyList(details, EvalIndicatorImportDetailVO.class);
recordVO.setDetails(detailVos);
recordVO.setKey(key);
return recordVO;
|
5ef1face
姜超
feature(*): 上传人员指标
|
202
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
203
204
|
// evalIndicatorImportRecordService.updateById(importRecord);
// evalIndicatorImportDetailService.saveBatch(details);
|
5ef1face
姜超
feature(*): 上传人员指标
|
205
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
206
207
208
209
210
211
|
// for (String indicatorCode : uploadIndicatorCodes) {
// ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(indicatorCode,
// importRecord.getId(), importRecord.getGroupId(), importRecord.getUploadTime());
// EventBusUtil.asyncPost(importEvalIndicatorEvent);
// }
}
|
5ef1face
姜超
feature(*): 上传人员指标
|
212
|
|
dc3c54cf
姜超
feature(*): 修改上传
|
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
public void saveImportIndicator(String key) {
BoundValueOperations<String, String> importOperation = stringRedisTemplate.boundValueOps(getEvalImport() + key);
BoundValueOperations<String, String> importDetailOperation = stringRedisTemplate.boundValueOps(getEvalImportDetail() + key);
String json = importOperation.get();
String detailJson = importDetailOperation.get();
if (PublicUtil.isEmpty(json) || PublicUtil.isEmpty(detailJson)) {
log.error("考评指标导入,redis数据为空,key {},", getEvalImport() + key);
throw new BusinessException("请求超时,请重新上传");
}
EvalIndicatorImportRecord record = JSON.parseObject(json, EvalIndicatorImportRecord.class);
List<EvalIndicatorImportDetail> details = JSON.parseArray(detailJson, EvalIndicatorImportDetail.class);
evalIndicatorImportRecordService.save(record);
Long recordId = record.getId();
Set<String> uploadIndicatorCodes = new HashSet<>();
for (EvalIndicatorImportDetail detail : details) {
detail.setRecordId(recordId);
if (PublicUtil.isEmpty(detail.getErrorType()) && PublicUtil.isEmpty(detail.getIndicatorCode())) {
uploadIndicatorCodes.add(detail.getIndicatorCode());
|
5ef1face
姜超
feature(*): 上传人员指标
|
231
|
}
|
5ef1face
姜超
feature(*): 上传人员指标
|
232
|
}
|
dc3c54cf
姜超
feature(*): 修改上传
|
233
234
235
236
237
238
239
240
241
|
evalIndicatorImportDetailService.saveBatch(details);
stringRedisTemplate.delete(getEvalImport() + key);
stringRedisTemplate.delete(getEvalImportDetail() + key);
//事件
for (String indicatorCode : uploadIndicatorCodes) {
ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(indicatorCode,
recordId, record.getGroupId(), record.getUploadTime());
EventBusUtil.asyncPost(importEvalIndicatorEvent);
}
|
5ef1face
姜超
feature(*): 上传人员指标
|
242
243
|
}
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
244
|
@Transactional(rollbackFor = Exception.class)
|
dc3c54cf
姜超
feature(*): 修改上传
|
245
|
public EvalIndicatorImportRecordVO uploadShopIndicator(MultipartFile file, LoginAuthBean user) {
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
246
247
248
|
Map<String, EvalShopPool> shopPoolMap = this.getShopPoolMap(user);
Map<String, EvalIndicator> evalIndicatorMap = getNameIndicatorMap();
EvalIndicatorImportRecord importRecord = createRecord(user, DimensionTypeEnum.SHOP);
|
dc3c54cf
姜超
feature(*): 修改上传
|
249
|
// evalIndicatorImportRecordService.save(importRecord);
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
|
Long importRecordId = importRecord.getId();
List<EvalIndicatorImportDetail> details = new ArrayList<>();
List<ShopIndicatorValueVO> indicatorValues = this.analysisExcel(file, ShopIndicatorValueVO.class);
Integer errorNum = 0;
Set<String> uploadIndicatorCodes = new HashSet<>();
MultiKeyMap<String, String> repeatMap = new MultiKeyMap<>();
for (ShopIndicatorValueVO shop : indicatorValues) {
Optional<ShopIndicatorValueVO> valueOptional = Optional.ofNullable(shop);
EvalIndicatorImportDetail importDetail = convertShopPo(valueOptional);
importDetail.setRecordId(importRecordId);
details.add(importDetail);
if (repeatMap.containsKey(shop.getShopName(), shop.getIndicatorName())) {
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_STAFF);
errorNum += 1;
continue;
}
repeatMap.put(shop.getShopName(), shop.getIndicatorName(), "");
importDetail.setDataDate(transferDate(shop.getDataDate()));
if (! shopPoolMap.containsKey(shop.getShopName())) {
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_SHOP);
errorNum += 1;
continue;
}
EvalShopPool shopPool = shopPoolMap.get(shop.getShopName());
importDetail.setShopId(shopPool.getShopId());
if (! evalIndicatorMap.containsKey(shop.getIndicatorName())) {
importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_INDICATOR);
errorNum += 1;
continue;
}
EvalIndicator evalIndicator = evalIndicatorMap.get(shop.getIndicatorName());
uploadIndicatorCodes.add(evalIndicator.getCode());
importDetail.setIndicatorCode(evalIndicator.getCode());
importDetail.setIndicatorName(evalIndicator.getName());
importDetail.setIndicatorValue(new BigDecimal(shop.getIndicatorValue()));
importDetail.setDataType(evalIndicator.getDataType());
}
importRecord.setErrorNum(errorNum);
importRecord.setNum(indicatorValues.size());
importRecord.setSuccessNum(indicatorValues.size() - errorNum);
|
dc3c54cf
姜超
feature(*): 修改上传
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
|
String key = PublicUtil.getUUID() + user.getUserId();
stringRedisTemplate.opsForValue().set(getEvalImport() + key, JSON.toJSONString(importRecord), 1 , TimeUnit.DAYS);
stringRedisTemplate.opsForValue().set(getEvalImportDetail() + key, JSON.toJSONString(details), 1 , TimeUnit.DAYS);
EvalIndicatorImportRecordVO recordVO = PublicUtil.copy(importRecord, EvalIndicatorImportRecordVO.class);
List<EvalIndicatorImportDetailVO> detailVos = PublicUtil.copyList(details, EvalIndicatorImportDetailVO.class);
recordVO.setDetails(detailVos);
recordVO.setKey(key);
return recordVO;
// evalIndicatorImportRecordService.updateById(importRecord);
// evalIndicatorImportDetailService.saveBatch(details);
// for (String indicatorCode : uploadIndicatorCodes) {
// ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(indicatorCode,
// importRecord.getId(), importRecord.getGroupId(), importRecord.getUploadTime());
// EventBusUtil.asyncPost(importEvalIndicatorEvent);
// }
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
310
|
}
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
311
|
|
5ef1face
姜超
feature(*): 上传人员指标
|
312
313
314
315
316
317
318
|
public EvalIndicatorImportDetailVO convertStaffVo(Optional<StaffIndicatorValueVO> valueOptional) {
EvalIndicatorImportDetailVO detail = new EvalIndicatorImportDetailVO();
detail.setIndicatorName(valueOptional.map(StaffIndicatorValueVO::getIndicatorName).orElse(""));
detail.setUserName(valueOptional.map(StaffIndicatorValueVO::getStaffName).orElse(""));
detail.setShopName(valueOptional.map(StaffIndicatorValueVO::getShopName).orElse(""));
return detail;
}
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
319
320
321
322
323
324
325
326
327
328
329
330
331
|
public EvalIndicatorImportDetail convertStaffPo(Optional<StaffIndicatorValueVO> valueOptional) {
EvalIndicatorImportDetail detail = new EvalIndicatorImportDetail();
detail.setIndicatorName(valueOptional.map(StaffIndicatorValueVO::getIndicatorName).orElse(""));
detail.setUserName(valueOptional.map(StaffIndicatorValueVO::getStaffName).orElse(""));
detail.setShopName(valueOptional.map(StaffIndicatorValueVO::getShopName).orElse(""));
return detail;
}
public EvalIndicatorImportDetail convertShopPo(Optional<ShopIndicatorValueVO> valueOptional) {
EvalIndicatorImportDetail detail = new EvalIndicatorImportDetail();
detail.setIndicatorName(valueOptional.map(ShopIndicatorValueVO::getIndicatorName).orElse(""));
detail.setShopName(valueOptional.map(ShopIndicatorValueVO::getShopName).orElse(""));
return detail;
|
b5babc65
姜超
feature(*): 参数修改
|
332
|
}
|
edc57409
姜超
feature(*): 考评奖惩分配
|
333
|
|
b5babc65
姜超
feature(*): 参数修改
|
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
|
public <T> List<T> analysisExcel(MultipartFile file, Class<T> tClass) {
List<T> indicatorValues = null;
ExcelReader reader = null;
try {
reader = ExcelUtil.getReader(file.getInputStream());
} catch (IOException e) {
e.printStackTrace();
}
Map<String, String> headerAlias = ExcelDataUtil.getTitleMappingField(tClass);
reader.setHeaderAlias(headerAlias);
indicatorValues = reader.readAll(tClass);
return indicatorValues;
}
public LocalDate transferDate(String dataDateStr) {
if (PublicUtil.isEmpty(dataDateStr)) {
return LocalDate.now();
}
LocalDate dataDate = LocalDate.now();
DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy/MM/dd");
try {
dataDate = LocalDate.parse(dataDateStr, formatter1);
} catch (Exception e) {
log.error("考评数据导入,日期转换失败,{},{}", dataDateStr, e);
try {
dataDate = LocalDate.parse(dataDateStr, formatter2);
}catch (Exception e2) {
log.error("考评数据导入,日期转换失败,{},{}", dataDateStr, e2);
}
}
return dataDate;
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
367
368
|
}
|
488ba9c3
姜超
feature(*): 新增台阶类型
|
369
|
|
99c55e88
姜超
feature(*): 导入分页查询
|
370
|
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
371
|
public EvalIndicatorImportRecord createRecord(LoginAuthBean user, DimensionTypeEnum dimensionType) {
|
936e630c
姜超
feature(*): 门店奖惩分配
|
372
373
374
|
EvalIndicatorImportRecord importRecord = new EvalIndicatorImportRecord();
importRecord.setImportUserId(user.getUserId());
importRecord.setImportUserName(user.getUserName());
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
375
|
importRecord.setDimensionType(dimensionType);
|
936e630c
姜超
feature(*): 门店奖惩分配
|
376
377
378
379
|
importRecord.setUploadTime(LocalDate.now());
importRecord.setGroupId(user.getGroupId());
importRecord.setYn(Boolean.TRUE);
return importRecord;
|
99c55e88
姜超
feature(*): 导入分页查询
|
380
381
|
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
382
|
public MultiKeyMap<String, EvalUserPool> getShopUserPoolMap(LoginAuthBean user) {
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
383
384
|
YearMonth month = YearMonth.now().minusMonths(12);
List<EvalUserPool> pools = evalUserPoolService.getLastPool(month, user.getGroupId());
|
99c55e88
姜超
feature(*): 导入分页查询
|
385
|
|
936e630c
姜超
feature(*): 门店奖惩分配
|
386
387
388
389
390
391
|
MultiKeyMap<String, EvalUserPool> staffPostMap = new MultiKeyMap();
for (EvalUserPool pool : pools) {
if (staffPostMap.containsKey(pool.getShopName(), pool.getUserName())) {
continue;
}
staffPostMap.put(pool.getShopName(), pool.getUserName(), pool);
|
99c55e88
姜超
feature(*): 导入分页查询
|
392
|
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
393
394
395
|
return staffPostMap;
}
|
ffdae9fa
姜超
feature(*): 上报数据修改
|
396
397
398
399
400
401
402
403
|
public Map<String, EvalShopPool> getShopPoolMap(LoginAuthBean user) {
YearMonth month = YearMonth.now().minusMonths(12);
List<EvalShopPool> pools = evalShopPoolService.getLastPool(month, user.getGroupId());
Map<String, EvalShopPool> evalShopPoolMap = pools.stream()
.collect(Collectors.toMap(EvalShopPool::getShopName, Function.identity(), (v1, v2) -> v1));
return evalShopPoolMap;
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
404
405
406
407
408
409
410
411
|
public Map<String, EvalIndicator> getNameIndicatorMap() {
List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
.eq(EvalIndicator::getYn, Boolean.TRUE)
.eq(EvalIndicator::getEnable, Boolean.TRUE)
);
Map<String, EvalIndicator> evalIndicatorMap = evalIndicators.stream()
.collect(Collectors.toMap(EvalIndicator::getName, Function.identity(), (v1, v2) -> v1));
return evalIndicatorMap;
|
99c55e88
姜超
feature(*): 导入分页查询
|
412
|
}
|
936e630c
姜超
feature(*): 门店奖惩分配
|
413
|
|
5a834c50
姜超
feature(*): 考评模板导出
|
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
|
public static List<StaffIndicatorValueVO> staffTemplateData() {
List<StaffIndicatorValueVO> templates = new ArrayList<>();
StaffIndicatorValueVO valueVO = new StaffIndicatorValueVO();
valueVO.setStaffName("张三");
valueVO.setShopName("宁夏瑞静B4-17店");
valueVO.setIndicatorName("活动成交任务达成率");
valueVO.setIndicatorValue("0.1");
valueVO.setDataDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
templates.add(valueVO);
return templates;
}
public static List<ShopIndicatorValueVO> shopTemplateData() {
List<ShopIndicatorValueVO> templates = new ArrayList<>();
ShopIndicatorValueVO valueVO = new ShopIndicatorValueVO();
valueVO.setShopName("宁夏瑞静B4-17店");
valueVO.setIndicatorName("活动成交任务达成率");
valueVO.setIndicatorValue("0.1");
valueVO.setDataDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
templates.add(valueVO);
return templates;
}
|
c029d47e
姜超
feature(*): 考评导入修改
|
436
|
}
|