From 78b0b58d0c0fa4a50b5767136f3bbee8f364fe61 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 26 九月 2025 09:11:08 +0800
Subject: [PATCH] yys 新增配置文件
---
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 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 3d2c087..9e66121 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.excel.ConfigurableMergeStrategy;
import com.ruoyi.common.utils.excel.CustomCellStyleHandler;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
@@ -21,6 +22,7 @@
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -50,39 +52,88 @@
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);
+ }
+
+ @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();
+ Calendar calendar = Calendar.getInstance();
+ int currentYear = calendar.get(Calendar.YEAR);
+ startAndEndDateDto.setYear(currentYear);
if(season != null){
- Calendar calendar = Calendar.getInstance();
- int currentYear = calendar.get(Calendar.YEAR);
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){
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;
}
@@ -130,12 +181,14 @@
private SysDictDataMapper sysDictDataMapper;
@Override
- public void exportCopy(HttpServletResponse response) throws UnsupportedEncodingException {
+ 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)){
throw new RuntimeException("瀛楀吀鏁版嵁涓虹┖");
}
- List<LaborIssue> laborIssues = lavorIssueMapper.list(new LaborIssue());
+ StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
+ BeanUtils.copyProperties(startAndEndDateDto, laborIssue);
+ List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue);
if (CollectionUtils.isEmpty(laborIssues)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
@@ -144,7 +197,7 @@
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("UTF-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
- String fileName = URLEncoder.encode("澶栭儴瑁呯鍗�", "UTF-8");
+ String fileName = URLEncoder.encode("鍔充繚鍙拌处", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
try {
@@ -154,13 +207,13 @@
.registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4,sys_lavor_issue.size(),laborIssueMap.size())))
.build();
- List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue);
+ 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();
+ WriteSheet mainSheet = EasyExcel.writerSheet(i, "鍔充繚鍙拌处" + i).build();
//鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
excelWriter.write(list, mainSheet);
}
@@ -177,7 +230,7 @@
// 澶勭悊澶栭儴瑁呯鍗曟暟鎹�
- private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap,List<SysDictData> sys_lavor_issue) {
+ 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();
@@ -187,7 +240,7 @@
list.add("");
list.add("浼佷笟绠＄悊绉�");
list.add("");
- list.add("浼佷笟绠＄悊绉�2025骞�1鏈�-2025骞�3鏈堝姵淇濆彂鏀捐鍒掕〃");
+ list.add("浼佷笟绠＄悊绉�" + obj.getYear() + "骞�" + obj.getStartMonth() + "鏈�-" + obj.getYear() + "骞�" + obj.getEndMonth() +"鏈堝姵淇濆彂鏀捐鍒掕〃");
for (int i = 1; i <= num; i++){
list.add("");
}
@@ -204,10 +257,10 @@
item.add(list1);
List<String> list2 = new ArrayList<>();
- list2.add("2025");
- list2.add("1");
- list2.add("2025");
- list2.add("3");
+ 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("");
}
@@ -296,4 +349,17 @@
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