From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java | 152 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 107 insertions(+), 45 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..3f4ffed 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -19,13 +19,14 @@
import com.ruoyi.project.system.domain.SysDictData;
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.apache.poi.ss.util.CellRangeAddress;
-import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -40,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)
@@ -126,16 +179,15 @@
return statisticsLaborIssue;
}
- @Autowired
- 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)){
+ 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,23 +196,23 @@
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 {
//鏂板缓ExcelWriter
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
.registerWriteHandler(new CustomCellStyleHandler())
- .registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4,sys_lavor_issue.size(),laborIssueMap.size())))
+ .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);
}
@@ -172,12 +224,8 @@
}
}
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
-
-// 澶勭悊澶栭儴瑁呯鍗曟暟鎹�
- 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,8 +235,8 @@
list.add("");
list.add("浼佷笟绠＄悊绉�");
list.add("");
- list.add("浼佷笟绠＄悊绉�2025骞�1鏈�-2025骞�3鏈堝姵淇濆彂鏀捐鍒掕〃");
- for (int i = 1; i <= num; i++){
+ list.add("浼佷笟绠＄悊绉�" + obj.getYear() + "骞�" + obj.getStartMonth() + "鏈�-" + obj.getYear() + "骞�" + obj.getEndMonth() + "鏈堝姵淇濆彂鏀捐鍒掕〃");
+ for (int i = 1; i <= num; i++) {
list.add("");
}
item.add(list);
@@ -198,17 +246,17 @@
list1.add("");
list1.add("缁撴潫骞�/鏈�");
list1.add("");
- for (int i = 0; i <= num; i++){
+ for (int i = 0; i <= num; i++) {
list1.add("");
}
item.add(list1);
List<String> list2 = new ArrayList<>();
- list2.add("2025");
- list2.add("1");
- list2.add("2025");
- list2.add("3");
- for (int i = 0; i <= num; i++){
+ 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);
@@ -240,13 +288,13 @@
.mapToLong(LaborIssue::getNum)
.sum()
+ "");
- if(i.get() == 0){
+ 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()))
+ } else {
+ sumList.set(j, (Long.parseLong(sumList.get(j)) + value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
.mapToLong(LaborIssue::getNum)
.sum())
+ "");
@@ -261,7 +309,7 @@
list5.add("");
list5.add("");
list5.add("");
- for (int h = 0; h < sumList.size(); h++){
+ for (int h = 0; h < sumList.size(); h++) {
list5.add(sumList.get(h));
}
item.add(list5);
@@ -274,7 +322,7 @@
*
* @return
*/
- private List<CellRangeAddress> exportExternalPackingListGetMerge(Integer rowNum,Integer num,Integer listSize) {
+ 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
@@ -296,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