From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java | 328 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 243 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
index b85975f..3f4ffed 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -1,26 +1,38 @@
package com.ruoyi.lavorissue.service.impl;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.utils.StartAndEndDateDto;
-import com.ruoyi.common.utils.excel.ExcelUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.excel.ConfigurableMergeStrategy;
+import com.ruoyi.common.utils.excel.CustomCellStyleHandler;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
import com.ruoyi.lavorissue.service.LavorIssueService;
+import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.domain.SysDictType;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -29,65 +41,117 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class LavorIssueServiceImpl extends ServiceImpl<LavorIssueMapper, LaborIssue> implements LavorIssueService {
- @Autowired
- private LavorIssueMapper lavorIssueMapper;
+ private final LavorIssueMapper lavorIssueMapper;
+ private final SysDictDataMapper sysDictDataMapper;
+ private final SysDeptMapper sysDeptMapper;
+
@Override
public IPage<LaborIssue> listPage(Page page, LaborIssue laborIssue) {
StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
laborIssue.setStartDate(startAndEndDateDto.getStartDate());
laborIssue.setEndDate(startAndEndDateDto.getEndDate());
- IPage<LaborIssue> laborIssueIPage = lavorIssueMapper.listPage(page, laborIssue);
- return laborIssueIPage;
+ return lavorIssueMapper.listPage(page, laborIssue);
}
- public StartAndEndDateDto getStartAndEndDateDto(Integer season,Date payDate){
+ @Override
+ public List<Map<String, Object>> statisticsList(LaborIssue laborIssue) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
+ laborIssue.setStartDate(startAndEndDateDto.getStartDate());
+ laborIssue.setEndDate(startAndEndDateDto.getEndDate());
+ List<LaborIssue> laborIssueIPage = lavorIssueMapper.list(laborIssue);
+
+ // 浣跨敤鍙彉鐨凙rrayList鏇挎崲榛樿鐨勪笉鍙彉鍒楄〃
+ List<Map<String, Object>> records = new ArrayList<>();
+
+ Map<String, List<LaborIssue>> collect = laborIssueIPage.stream().collect(Collectors.groupingBy(LaborIssue::getStaffNo));
+ collect.forEach((k, v) -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ LaborIssue laborIssue1 = v.get(0);
+ hashMap.put("id", v.stream().map(LaborIssue::getId));
+ hashMap.put("deptName", laborIssue1.getDeptName());
+ hashMap.put("orderNo", laborIssue1.getOrderNo());
+ hashMap.put("staffId", laborIssue1.getStaffId());
+ hashMap.put("staffName", laborIssue1.getStaffName());
+ hashMap.put("staffNo", laborIssue1.getStaffNo());
+ hashMap.put("dictType", laborIssue1.getDictType());
+ hashMap.put("dictTypeName", laborIssue1.getDictTypeName());
+ hashMap.put("factoryDate", laborIssue1.getFactoryDate() == null ? "" : sdf.format(laborIssue1.getFactoryDate()));
+ hashMap.put("issueDate", laborIssue1.getIssueDate() == null ? "" : sdf.format(laborIssue1.getIssueDate()));
+ hashMap.put("adoptedDate", laborIssue1.getAdoptedDate() == null ? "" : sdf.format(laborIssue1.getAdoptedDate()));
+ hashMap.put("tenantId", laborIssue1.getTenantId());
+ Map<String, List<LaborIssue>> collect1 = v.stream().collect(Collectors.groupingBy(LaborIssue::getDictId));
+ collect1.forEach((k1, v1) -> {
+ hashMap.put(k1, v1.stream()
+ .mapToLong(LaborIssue::getNum)
+ .sum());
+ });
+ records.add(hashMap);
+ });
+ return records;
+ }
+
+ public StartAndEndDateDto getStartAndEndDateDto(Integer season, Date payDate) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
- if(season != null){
- Calendar calendar = Calendar.getInstance();
- int currentYear = calendar.get(Calendar.YEAR);
- switch (season){
+ Calendar calendar = Calendar.getInstance();
+ int currentYear = calendar.get(Calendar.YEAR);
+ startAndEndDateDto.setYear(currentYear);
+ if (season != null) {
+ switch (season) {
case 1:
startAndEndDateDto.setStartDate(currentYear + "-01-01");
startAndEndDateDto.setEndDate(currentYear + "-03-31");
+ startAndEndDateDto.setStartMonth(1);
+ startAndEndDateDto.setEndMonth(3);
break;
case 2:
startAndEndDateDto.setStartDate(currentYear + "-04-01");
startAndEndDateDto.setEndDate(currentYear + "-06-30");
+ startAndEndDateDto.setStartMonth(4);
+ startAndEndDateDto.setEndMonth(6);
break;
case 3:
startAndEndDateDto.setStartDate(currentYear + "-07-01");
startAndEndDateDto.setEndDate(currentYear + "-09-30");
+ startAndEndDateDto.setStartMonth(7);
+ startAndEndDateDto.setEndMonth(9);
break;
case 4:
startAndEndDateDto.setStartDate(currentYear + "-10-01");
startAndEndDateDto.setEndDate(currentYear + "-12-31");
+ startAndEndDateDto.setStartMonth(10);
+ startAndEndDateDto.setEndMonth(12);
break;
}
}
- if(payDate != null){
+ if (payDate != null) {
Date lastDayOfMonth = getLastDayOfMonth(payDate);
- startAndEndDateDto.setStartDate(sdf.format(payDate));
+ Date firstDayOfMonth = getFirstDayOfMonth(payDate);
+ startAndEndDateDto.setStartDate(sdf.format(firstDayOfMonth));
startAndEndDateDto.setEndDate(sdf.format(lastDayOfMonth));
+ startAndEndDateDto.setStartMonth(payDate.getMonth() + 1);
+ startAndEndDateDto.setEndMonth(payDate.getMonth() + 1);
}
return startAndEndDateDto;
}
@Override
- public StatisticsLaborIssue statistics(StatisticsLaborIssue req) throws Exception{
+ public StatisticsLaborIssue statistics(StatisticsLaborIssue req) throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StatisticsLaborIssue statisticsLaborIssue = new StatisticsLaborIssue();
StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(req.getSeason(), req.getIssueDate());
LambdaQueryWrapper<LaborIssue> laborIssueLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(req.getSeason() != null || req.getIssueDate() != null){
+ if (req.getSeason() != null || req.getIssueDate() != null) {
laborIssueLambdaQueryWrapper.ge(LaborIssue::getIssueDate, startAndEndDateDto.getStartDate())
.le(LaborIssue::getIssueDate, startAndEndDateDto.getEndDate());
}
List<LaborIssue> laborIssues = lavorIssueMapper.selectList(laborIssueLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(laborIssues)){
+ if (!CollectionUtils.isEmpty(laborIssues)) {
Long sum = laborIssues.stream()
.filter(laborIssue -> laborIssue.getAdoptedDate() != null)
.mapToLong(LaborIssue::getNum)
@@ -115,83 +179,163 @@
return statisticsLaborIssue;
}
- @Autowired
- private SysDictDataMapper sysDictDataMapper;
-
@Override
- public void exportCopy(HttpServletResponse response) {
+ public void exportCopy(HttpServletResponse response, LaborIssue laborIssue) throws UnsupportedEncodingException {
List<SysDictData> sys_lavor_issue = sysDictDataMapper.selectDictDataByType("sys_lavor_issue");
- if(CollectionUtils.isEmpty(sys_lavor_issue)){
+ if (CollectionUtils.isEmpty(sys_lavor_issue)) {
throw new RuntimeException("瀛楀吀鏁版嵁涓虹┖");
}
- List<Object> head = new ArrayList<>();
- head.add("閮ㄩ棬");
- head.add(ExcelUtils.COLUMN_MERGE);
- head.add("浼佷笟绠＄悊绉�");
- head.add(ExcelUtils.COLUMN_MERGE);
- head.add("");
- for (int i = 0; i < sys_lavor_issue.size(); i++) {
- head.add(ExcelUtils.COLUMN_MERGE);
- }
-
- List<Object> head1 = new ArrayList<>();
- head1.add("寮�濮嬪勾/鏈�");
- head1.add(ExcelUtils.COLUMN_MERGE);
- head1.add("缁撴潫骞�/鏈�");
- head1.add(ExcelUtils.COLUMN_MERGE);
- head1.add("");
- for (int i = 0; i < sys_lavor_issue.size(); i++) {
- head1.add(ExcelUtils.COLUMN_MERGE);
- }
-
- List<Object> head2 = new ArrayList<>();
- head2.add("2025");
- head2.add("1");
- head2.add("2025");
- head2.add("3");
- head2.add("浼佷笟绠＄悊绉�2025骞�1鏈�-2025骞�3鏈堝姵淇濆彂鏀捐鍒掕〃");
- for (int i = 0; i < sys_lavor_issue.size(); i++) {
- head2.add(ExcelUtils.COLUMN_MERGE);
- }
-
- List<Object> head3 = new ArrayList<>();
- head3.add("閮ㄩ棬鍚嶇О");
- head3.add(ExcelUtils.COLUMN_MERGE);
- head3.add("濮撳悕");
- head3.add("宸ュ彿");
- for (SysDictData sysDictData : sys_lavor_issue) {
- head3.add(sysDictData.getDictLabel());
- }
- head3.add("绛惧悕");
-
- // 濉厖鏁版嵁
- List<Object> head4 = new ArrayList<>();
- List<LaborIssue> laborIssues = lavorIssueMapper.selectList(null);
- if(CollectionUtils.isEmpty(laborIssues)){
+ StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
+ BeanUtils.copyProperties(startAndEndDateDto, laborIssue);
+ List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue);
+ if (CollectionUtils.isEmpty(laborIssues)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
+ Map<String, List<LaborIssue>> laborIssueMap = laborIssues.stream()
+ .collect(Collectors.groupingBy(LaborIssue::getStaffNo));
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("UTF-8");
+ // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+ String fileName = URLEncoder.encode("鍔充繚鍙拌处", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- Map<String, List<LaborIssue>> collect = laborIssues.stream().collect(Collectors.groupingBy(LaborIssue::getStaffNo));
- collect.forEach((k,v)->{
- head4.add(v.get(0).getDeptName());
- head4.add(ExcelUtils.COLUMN_MERGE);
- head4.add(v.get(0).getStaffName());
- head4.add(v.get(0).getStaffNo());
- // 鍒ゆ柇瀛楀吀鏁版嵁
- for (SysDictData sysDictData : sys_lavor_issue) {
- long sum = v.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue())).mapToLong(LaborIssue::getNum).sum();
- head4.add(sum);
+ try {
+ //鏂板缓ExcelWriter
+ ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
+ .registerWriteHandler(new CustomCellStyleHandler())
+ .registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4, sys_lavor_issue.size(), laborIssueMap.size())))
+ .build();
+
+ List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue, laborIssue);
+
+ for (int i = 0; i < data.size(); i++) {
+ List<List<String>> list = data.get(i);
+
+ //鑾峰彇sheet0瀵硅薄
+ WriteSheet mainSheet = EasyExcel.writerSheet(i, "鍔充繚鍙拌处" + i).build();
+ //鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
+ excelWriter.write(list, mainSheet);
}
- });
+ //鍏抽棴娴�
+ excelWriter.finish();
+ } catch (IOException e) {
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
+ }
- List<List<Object>> sheetDataList = new ArrayList<>();
- sheetDataList.add(head);
- sheetDataList.add(head1);
- sheetDataList.add(head2);
- sheetDataList.add(head3);
- sheetDataList.add(head4);
- ExcelUtils.export(response, "鍔充繚鍙戞斁璁″垝琛�", sheetDataList);
+ // 澶勭悊澶栭儴瑁呯鍗曟暟鎹�
+ private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap, List<SysDictData> sys_lavor_issue, LaborIssue obj) {
+ List<List<List<String>>> data = new ArrayList<>();
+ int num = sys_lavor_issue.size();
+
+ List<List<String>> item = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("閮ㄩ棬");
+ list.add("");
+ list.add("浼佷笟绠＄悊绉�");
+ list.add("");
+ list.add("浼佷笟绠＄悊绉�" + obj.getYear() + "骞�" + obj.getStartMonth() + "鏈�-" + obj.getYear() + "骞�" + obj.getEndMonth() + "鏈堝姵淇濆彂鏀捐鍒掕〃");
+ for (int i = 1; i <= num; i++) {
+ list.add("");
+ }
+ item.add(list);
+
+ List<String> list1 = new ArrayList<>();
+ list1.add("寮�濮嬪勾/鏈�");
+ list1.add("");
+ list1.add("缁撴潫骞�/鏈�");
+ list1.add("");
+ for (int i = 0; i <= num; i++) {
+ list1.add("");
+ }
+ item.add(list1);
+
+ List<String> list2 = new ArrayList<>();
+ list2.add(obj.getYear().toString());
+ list2.add(obj.getStartMonth().toString());
+ list2.add(obj.getYear().toString());
+ list2.add(obj.getEndMonth().toString());
+ for (int i = 0; i <= num; i++) {
+ list.add("");
+ }
+ item.add(list2);
+
+ List<String> list3 = new ArrayList<>();
+ list3.add("閮ㄩ棬鍚嶇О");
+ list3.add("");
+ list3.add("濮撳悕");
+ list3.add("宸ュ彿");
+ for (SysDictData sysDictData : sys_lavor_issue) {
+ list3.add(sysDictData.getDictLabel());
+ }
+ list3.add("绛惧悕");
+ item.add(list3);
+
+ // 濉��
+ SysDept sysDept = sysDeptMapper.selectDeptById(SecurityUtils.getLoginUser().getTenantId());
+ List<String> sumList = new ArrayList<>();
+ AtomicInteger i = new AtomicInteger();
+ listMap.forEach((key, value) -> {
+ List<String> list4 = new ArrayList<>();
+ list4.add(sysDept.getDeptName());
+ list4.add("");
+ list4.add(value.get(0).getStaffName());
+ list4.add(value.get(0).getStaffNo());
+ int j = 0;
+ for (SysDictData sysDictData : sys_lavor_issue) {
+ list4.add(value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
+ .mapToLong(LaborIssue::getNum)
+ .sum()
+ + "");
+ if (i.get() == 0) {
+ sumList.add(value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
+ .mapToLong(LaborIssue::getNum)
+ .sum()
+ + "");
+ } else {
+ sumList.set(j, (Long.parseLong(sumList.get(j)) + value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
+ .mapToLong(LaborIssue::getNum)
+ .sum())
+ + "");
+ }
+ j++;
+ }
+ i.getAndIncrement();
+ item.add(list4);
+ });
+ List<String> list5 = new ArrayList<>();
+ list5.add("鍚堣");
+ list5.add("");
+ list5.add("");
+ list5.add("");
+ for (int h = 0; h < sumList.size(); h++) {
+ list5.add(sumList.get(h));
+ }
+ item.add(list5);
+ data.add(item);
+ return data;
+ }
+
+ /**
+ * 澶栭儴瑁呯鍗曞悎骞跺崟鍏冩牸
+ *
+ * @return
+ */
+ private List<CellRangeAddress> exportExternalPackingListGetMerge(Integer rowNum, Integer num, Integer listSize) {
+ List<CellRangeAddress> mergeRegions = new ArrayList<>();
+ mergeRegions.add(new CellRangeAddress(0, 0, 0, 1)); // 鍚堝苟A1:Q2
+ mergeRegions.add(new CellRangeAddress(0, 0, 2, 3)); // 鍚堝苟A4:Q4
+
+ mergeRegions.add(new CellRangeAddress(0, 2, rowNum, rowNum + num)); // 鍚堝苟A5:B6
+ mergeRegions.add(new CellRangeAddress(1, 1, 0, 1)); // 鍚堝苟C5:E6
+ mergeRegions.add(new CellRangeAddress(1, 1, 2, 3)); // 鍚堝苟F5:G6
+ mergeRegions.add(new CellRangeAddress(3, 3, 0, 1)); // 鍚堝苟H5:I6
+ for (int i = 1; i <= listSize; i++) {
+ mergeRegions.add(new CellRangeAddress(3 + i, 3 + i, 0, 1));
+ }
+ mergeRegions.add(new CellRangeAddress(rowNum + listSize, rowNum + listSize, 0, 3));
+ return mergeRegions;
}
public Date getLastDayOfMonth(Date date) {
@@ -200,4 +344,18 @@
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); // 璁剧疆涓哄綋鏈堟渶鍚庝竴澶�
return calendar.getTime(); // 杩斿洖Date瀵硅薄
}
+
+ /**
+ * 鑾峰彇褰撴湀绗竴澶�
+ *
+ * @param date
+ * @return
+ */
+ public Date getFirstDayOfMonth(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date); // 璁剧疆浼犲叆鐨凞ate
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH)); // 璁剧疆涓哄綋鏈堢涓�澶�
+ return calendar.getTime(); // 杩斿洖Date瀵硅薄
+ }
+
}
--
Gitblit v1.9.3