no message

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -44,6 +44,7 @@ import cn.ezhizao.project.business.receiveTicket.service.IBizFinancialReceiveTic
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
 import cn.ezhizao.project.business.salary.domain.vo.BizFinancialSalaryDetailEmployeeNotCompany;
+import cn.ezhizao.project.business.salary.domain.vo.FilterRequest;
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailEmployeeService;
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailService;
 import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirm;
@@ -769,9 +770,16 @@ public class BizFinancialSalaryController extends BaseController {
     }
 
 
-    @PostMapping("/rpc/abc")
+    @PostMapping("/rpc/filterCompletedOrders")
     @Anonymous
-    public String filterCompletedOrders(@RequestBody List<Long> workOrderIds) {
+    public String filterCompletedOrders(@RequestBody FilterRequest filterRequest) {
+        List<Long> workOrderIds = filterRequest.getWorkOrderIds();
+        Date sqlDate = filterRequest.getDate();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(sqlDate);
+        int year = calendar.get(Calendar.YEAR);
+        int month = sqlDate.getMonth() + 1;
+        String format = String.format("%02d", month);
         //通过 workOrderId 查询出所有代理记账公积金 社保是否有已完成
         //代理记账
         ArrayList<Long> oneList = new ArrayList<>();
@@ -785,7 +793,9 @@ public class BizFinancialSalaryController extends BaseController {
             if (bizFinancialSalary != null) {
                 List<BizFinancialSalaryDetail> list = bizFinancialSalaryDetailService.list(new LambdaQueryWrapper<BizFinancialSalaryDetail>()
                         .eq(BizFinancialSalaryDetail::getFinancialSalaryId, bizFinancialSalary.getId())
-                        .eq(BizFinancialSalaryDetail::getStatus, 2));
+                        .eq(BizFinancialSalaryDetail::getYear, year + "")
+                        .eq(BizFinancialSalaryDetail::getMonth, format)
+                        .eq(BizFinancialSalaryDetail::getStatus, 3));
                 if (!CollectionUtils.isEmpty(list)) {
                     oneList.add(workOrderId);
                 }
@@ -804,7 +814,9 @@ public class BizFinancialSalaryController extends BaseController {
                 if (one != null) {
                     List<BizSocialSecurityConfirmDetail> list = socialSecurityConfirmDetailService.list(new LambdaQueryWrapper<BizSocialSecurityConfirmDetail>()
                             .eq(BizSocialSecurityConfirmDetail::getSocialSecurityConfirmId, one.getId())
-                            .eq(BizSocialSecurityConfirmDetail::getStatus, 2));
+                            .eq(BizSocialSecurityConfirmDetail::getYear, year + "")
+                            .eq(BizSocialSecurityConfirmDetail::getMonth, format)
+                            .eq(BizSocialSecurityConfirmDetail::getStatus, 3));
                     if (!CollectionUtils.isEmpty(list)) {
                         twoList.add(workOrderId);
                     }
@@ -819,10 +831,12 @@ public class BizFinancialSalaryController extends BaseController {
             for (Long workOrderId : workOrderIds) {
                 BizHousingFundConfirm one = housingFundConfirmService.getOne(new LambdaQueryWrapper<BizHousingFundConfirm>()
                         .eq(BizHousingFundConfirm::getWorkOrderId, workOrderId));
-                if (one != null){
+                if (one != null) {
                     List<BizHousingFundConfirmDetail> list = housingFundConfirmDetailService.list(new LambdaQueryWrapper<BizHousingFundConfirmDetail>()
                             .eq(BizHousingFundConfirmDetail::getHousingFundConfirmId, one.getId())
-                            .eq(BizHousingFundConfirmDetail::getStatus, 2));
+                            .eq(BizHousingFundConfirmDetail::getYear, year + "")
+                            .eq(BizHousingFundConfirmDetail::getMonth, format)
+                            .eq(BizHousingFundConfirmDetail::getStatus, 3));
                     if (!CollectionUtils.isEmpty(list)) {
                         threeList.add(workOrderId);
                     }

src/main/java/cn/ezhizao/project/business/salary/domain/vo/FilterRequest.java

@@ -0,0 +1,14 @@
+package cn.ezhizao.project.business.salary.domain.vo;
+
+import lombok.Data;
+
+import java.sql.Date;
+import java.util.List;
+
+@Data
+public class FilterRequest {
+    private List<Long> workOrderIds;
+    private Date date;
+
+
+}