From ee7936a9bf07aeea1b277540818bb578665cc64e Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 16 Jun 2023 13:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=83=BD=E5=A4=9F=E5=90=A6=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AttendQuoteServiceImpl.java  | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
index e9919b070..7f4b96a60 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
@@ -5,7 +5,6 @@ import com.engine.core.impl.Service;
 import com.engine.salary.biz.AttendQuoteBiz;
 import com.engine.salary.biz.AttendQuoteDataBiz;
 import com.engine.salary.biz.AttendQuoteDataValueBiz;
-import com.engine.salary.common.LocalDateRange;
 import com.engine.salary.entity.datacollection.dto.AttendQuoteListDTO;
 import com.engine.salary.entity.datacollection.param.AttendQuoteDataQueryParam;
 import com.engine.salary.entity.datacollection.param.AttendQuoteQueryParam;
@@ -30,10 +29,7 @@ import weaver.hrm.User;
 
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -63,13 +59,13 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic
     public PageInfo<AttendQuoteListDTO> listPage(AttendQuoteQueryParam queryParam) {
 
         List<String> declareMonth = queryParam.getSalaryYearMonth();
-        SalaryAcctRecordPO queryRecordParam = new SalaryAcctRecordPO();
+//        SalaryAcctRecordPO queryRecordParam = new SalaryAcctRecordPO();
         if (CollectionUtils.isNotEmpty(declareMonth)) {
             queryParam.setSalaryYearMonth(declareMonth.stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList()));
             queryParam.setSalaryYearMonthDate(declareMonth.stream().map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList()));
-            LocalDateRange salaryMonth = LocalDateRange.builder().fromDate(SalaryDateUtil.dateStrToLocalDate(declareMonth.get(0)+"-01 00:00:00"))
-                    .endDate(SalaryDateUtil.dateStrToLocalTime(declareMonth.get(1)+"-01 00:00:00")).build();
-            queryRecordParam.setSalaryMonths(salaryMonth);
+//            LocalDateRange salaryMonth = LocalDateRange.builder().fromDate(SalaryDateUtil.dateStrToLocalDate(declareMonth.get(0)+"-01 00:00:00"))
+//                    .endDate(SalaryDateUtil.dateStrToLocalTime(declareMonth.get(1)+"-01 00:00:00")).build();
+//            queryRecordParam.setSalaryMonths(salaryMonth);
         }
 
 
@@ -82,18 +78,18 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic
                 return new PageInfo<>(AttendQuoteListDTO.class);
             }
             queryParam.setSalarySobIds(salarySobIds);
-            queryRecordParam.setSalarySobIds(salarySobIds);
+//            queryRecordParam.setSalarySobIds(salarySobIds);
         }
 
         // 获取已经归档的记录
-        List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listSome(queryRecordParam);
-        List<String> archivedRecords = salaryAcctRecordPOS.stream().filter(PO -> PO.getStatus() > SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())
-                .map(PO -> SalaryDateUtil.getFormatYearMonth(PO.getSalaryMonth()) + PO.getSalarySobId())
-                .collect(Collectors.toList());
+//        List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listSome(queryRecordParam);
+//        List<String> archivedRecords = salaryAcctRecordPOS.stream().filter(PO -> PO.getStatus() > SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())
+//                .map(PO -> SalaryDateUtil.getFormatYearMonth(PO.getSalaryMonth()) + PO.getSalarySobId())
+//                .collect(Collectors.toList());
 
 
         List<AttendQuoteListDTO> list = getAttendQuoteMapper().list(queryParam);
-        list.stream().forEach(DTO -> DTO.setCanDelete( !archivedRecords.contains( (SalaryDateUtil.getFormatYearMonth(DTO.getSalaryYearMonth()) + DTO.getSalarySobId().toString()) ) ));
+//        list.stream().forEach(DTO -> DTO.setCanDelete( !archivedRecords.contains( (SalaryDateUtil.getFormatYearMonth(DTO.getSalaryYearMonth()) + DTO.getSalarySobId().toString()) ) ));
 
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 list, AttendQuoteListDTO.class);
@@ -113,6 +109,13 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic
         if (CollectionUtils.isNotEmpty(accountingAttendQuotes)) {
             throw new SalaryRunTimeException("已经核算完成的数据不能删除");
         }
+
+        List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listSome(SalaryAcctRecordPO.builder().salarySobId(attendQuotes.get(0).getSalarySobId())
+                .salaryMonth(attendQuotes.get(0).getSalaryYearMonth()).build());
+        Optional<SalaryAcctRecordPO> haveArchived = salaryAcctRecordPOS.stream().filter(PO -> PO.getStatus() > SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()).findFirst();
+        if(haveArchived.isPresent()){
+            throw new SalaryRunTimeException("已经核算完成的数据不能删除");
+        }
         List<Long> unAccountingIds = attendQuotes.stream().filter(e -> e.getSalaryAccountingStatus().equals(0)).map(AttendQuoteListDTO::getId).collect(Collectors.toList());
         // 1.删除未核算的考勤引用
         biz.deleteByIds(unAccountingIds);