suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

绩效填报调整

Browse Source
liweidong
maxiangong 1 day ago
parent 92abe8d3d4
commit ec2fe3f82a
3 changed files with 59 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 97
      blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
  2. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/listener/ExcelMapListener.java
  3. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/util/EasyExcelUtil.java

97
blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
Unescape View File

@ -128,11 +128,13 @@ public class BsEfficiencyTaskController extends BladeController {
if (task.getStatus() == null || task.getStatus() != BsEfficiencyTaskEnum.STATUS_PENDING_APPROVAL.getCode()) {
R.fail("当前绩效任务不能审批");
}
BsEfficiencyTaskEntity upd = new BsEfficiencyTaskEntity();
upd.setId(bsEfficiencyTask.getId());
upd.setStatus(BsEfficiencyTaskEnum.STATUS_REJECTED.getCode());
upd.setRemark(bsEfficiencyTask.getRemark());
return R.status(bsEfficiencyTaskService.saveOrUpdate(upd));
LambdaUpdateWrapper<BsEfficiencyTaskEntity> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(BsEfficiencyTaskEntity::getId, bsEfficiencyTask.getId())
.set(BsEfficiencyTaskEntity::getAttachId, null)
.set(BsEfficiencyTaskEntity::getReportTime, null)
.set(BsEfficiencyTaskEntity::getRemark, bsEfficiencyTask.getRemark())
.set(BsEfficiencyTaskEntity::getStatus, BsEfficiencyTaskEnum.STATUS_REJECTED.getCode());
return R.status(bsEfficiencyTaskService.update(null, wrapper));
}
/**
@ -161,6 +163,7 @@ public class BsEfficiencyTaskController extends BladeController {
upd.setId(bsEfficiencyTask.getId());
upd.setAttachId(bsEfficiencyTask.getAttachId());
upd.setStatus(BsEfficiencyTaskEnum.STATUS_FINISHED.getCode());
upd.setReportTime(new Date());
return R.status(bsEfficiencyTaskService.saveOrUpdate(upd));
}
@ -187,6 +190,7 @@ public class BsEfficiencyTaskController extends BladeController {
LambdaUpdateWrapper<BsEfficiencyTaskEntity> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(BsEfficiencyTaskEntity::getId, bsEfficiencyTask.getId())
.set(BsEfficiencyTaskEntity::getAttachId, null)
.set(BsEfficiencyTaskEntity::getReportTime, null)
.set(BsEfficiencyTaskEntity::getStatus, BsEfficiencyTaskEnum.STATUS_IN_PROGRESS.getCode());
return R.status(bsEfficiencyTaskService.update(null, wrapper));
}
@ -247,53 +251,47 @@ public class BsEfficiencyTaskController extends BladeController {
return checkR;
}
Map<String, Object> resultMap = new HashMap<>();
List<LinkedHashMap<String, Object>> mapList = EasyExcelUtil.read(file);
List<LinkedHashMap<String, Object>> tableDataList = new ArrayList<>();
Map<String, Object> readResult = EasyExcelUtil.read(file);
List<LinkedHashMap<String, Object>> mapList = (List<LinkedHashMap<String, Object>>) readResult.get("data");
Map<Integer, String> excelHeadMap = (Map<Integer, String>) readResult.get("head");
List<String> excelParamNames = excelHeadMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey())
.map(Map.Entry::getValue)
.toList();
if (excelParamNames.size() != paramNames.size()) {
return R.fail("上传文件与模板不一致！");
}
Set<String> paramSet = new HashSet<>(paramNames);
Set<String> excelParamSet = new HashSet<>(excelParamNames);
if (!paramSet.equals(excelParamSet)) {
return R.fail("上传文件与模板不一致！");
}
int num = 1;
LinkedHashMap<String, String> headMap = new LinkedHashMap<>();
for (String key : excelParamNames) {
if (this.EMPLOYEE_CODE.equals(key)) {
headMap.put(this.EMPLOYEE_CODE, "employeeCode");
} else if (this.EMPLOYEE_NAME.equals(key)) {
headMap.put(this.EMPLOYEE_NAME, "employeeName");
} else if (this.TOTAL_SCORE.equals(key)) {
headMap.put(this.TOTAL_SCORE, "totalScore");
} else {
headMap.put(key, "temp" + num);
num++;
}
}
List<LinkedHashMap<String, Object>> tableColumnList = new ArrayList<>();
for (Map.Entry<String, String> entry : headMap.entrySet()) {
LinkedHashMap<String, Object> tableColumn = new LinkedHashMap<>();
tableColumn.put("label", entry.getKey());
tableColumn.put("prop", entry.getValue());
tableColumnList.add(tableColumn);
}
List<LinkedHashMap<String, Object>> tableDataList = new ArrayList<>();
if (!CollectionUtils.isEmpty(mapList)) {
LinkedHashMap<String, Object> firstMap = mapList.get(0);
int num = 1;
LinkedHashMap<String, String> headMap = new LinkedHashMap<>();
for (String key : firstMap.keySet()) {
if (this.EMPLOYEE_CODE.equals(key)) {
headMap.put(this.EMPLOYEE_CODE, "employeeCode");
} else if (this.EMPLOYEE_NAME.equals(key)) {
headMap.put(this.EMPLOYEE_NAME, "employeeName");
} else if (this.TOTAL_SCORE.equals(key)) {
headMap.put(this.TOTAL_SCORE, "totalScore");
} else {
headMap.put(key, "temp" + num);
num++;
}
}
List<String> missingFields = new ArrayList<>();
for (String requiredField : paramNames) {
if (!headMap.containsKey(requiredField)) {
missingFields.add(requiredField);
}
}
// 如果有缺失字段
if (!CollectionUtils.isEmpty(missingFields)) {
return R.fail("上传文件与模板不一致！");
}
for (Map.Entry<String, String> entry : headMap.entrySet()) {
String excelHeadName = entry.getKey();
if (!paramNames.contains(excelHeadName)) {
continue;
}
LinkedHashMap<String, Object> tableColumn = new LinkedHashMap<>();
tableColumn.put("label", entry.getKey());
tableColumn.put("prop", entry.getValue());
tableColumnList.add(tableColumn);
}
for (LinkedHashMap<String, Object> map : mapList) {
LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : headMap.entrySet()) {
String excelHeadName = entry.getKey();
if (!paramNames.contains(excelHeadName)) {
continue;
}
tableData.put(entry.getValue(), map.get(entry.getKey()));
}
R<UserInfo> userInfoResult = userClient.userInfoByCode((String) tableData.get("employeeCode"));
@ -304,9 +302,9 @@ public class BsEfficiencyTaskController extends BladeController {
}
tableDataList.add(tableData);
}
resultMap.put("tableColumn", tableColumnList);
resultMap.put("tableData", tableDataList);
}
resultMap.put("tableColumn", tableColumnList);
resultMap.put("tableData", tableDataList);
return R.data(resultMap);
}
@ -398,6 +396,7 @@ public class BsEfficiencyTaskController extends BladeController {
upd.setId(bsEfficiencyTask.getId());
upd.setAttachId(bsEfficiencyTask.getAttachId());
upd.setStatus(BsEfficiencyTaskEnum.STATUS_PENDING_APPROVAL.getCode());
upd.setReportTime(new Date());
return R.status(bsEfficiencyTaskService.saveOrUpdate(upd));
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/listener/ExcelMapListener.java
Unescape View File

@ -41,4 +41,9 @@ public class ExcelMapListener extends AnalysisEventListener<Map<Integer, Object>
public List<LinkedHashMap<String, Object>> getData() {
return resultList;
}
// 获取表头
public Map<Integer, String> getHeadMap() {
return headMap;
}
}

8
blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/util/EasyExcelUtil.java
Unescape View File

@ -4,13 +4,14 @@ import com.alibaba.excel.EasyExcel;
import org.springblade.desk.efficiency.listener.ExcelMapListener;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class EasyExcelUtil {
public static List<LinkedHashMap<String, Object>> read(MultipartFile file) {
public static Map<String, Object> read(MultipartFile file) {
try {
ExcelMapListener listener = new ExcelMapListener();
@ -19,7 +20,10 @@ public class EasyExcelUtil {
.sheet()
.doRead();
return listener.getData();
Map<String, Object> result = new HashMap<>();
result.put("data", listener.getData());
result.put("head", listener.getHeadMap());
return result;
} catch (Exception e) {
return null;
}

Write Preview
Loading…
Cancel
Save