no message

src/main/java/cn/ezhizao/framework/config/SecurityConfig.java

@@ -116,6 +116,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                .antMatchers("/rpc/**").permitAll()
                 .antMatchers("/upload/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

src/main/java/cn/ezhizao/project/business/archiveTicket/controller/ArchiveTicketController.java

@@ -45,6 +45,9 @@ public class ArchiveTicketController extends BaseController {
     @GetMapping("/list")
     @ResponseBody
     public TableDataInfo getList(BizFinancialKeepAccount conditions) throws NoSuchFieldException, IllegalAccessException {
+
+        String month = String.format("%02d", Integer.valueOf(conditions.getMonth()));
+        conditions.setMonth(month);
         setTenantId(conditions);
         startPage();
         startOrderBy();

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

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.ezhizao.common.utils.PdfUtil;
 import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.StringUtils;
+import cn.ezhizao.framework.aspectj.lang.annotation.Anonymous;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.lock.DistributionLock;
 import cn.ezhizao.framework.lock.LockKey;
@@ -29,6 +30,10 @@ import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizF
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.service.IBizFinancialIndividualIncomeTaxIsZeroService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.service.IBizFinancialIndividualIncomeTaxDetailIsZeroService;
+import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirm;
+import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetail;
+import cn.ezhizao.project.business.housingFund.service.IBizHousingFundConfirmDetailService;
+import cn.ezhizao.project.business.housingFund.service.IBizHousingFundConfirmService;
 import cn.ezhizao.project.business.keepAccounts.domain.BizFinancialKeepAccount;
 import cn.ezhizao.project.business.keepAccounts.domain.BizFinancialKeepAccountDetail;
 import cn.ezhizao.project.business.keepAccounts.service.IBizFinancialKeepAccountDetailService;
@@ -41,19 +46,22 @@ import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmploye
 import cn.ezhizao.project.business.salary.domain.vo.BizFinancialSalaryDetailEmployeeNotCompany;
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailEmployeeService;
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailService;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirm;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetail;
+import cn.ezhizao.project.business.socialSecurity.service.IBizSocialSecurityConfirmDetailService;
+import cn.ezhizao.project.business.socialSecurity.service.IBizSocialSecurityConfirmService;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
-import cn.ezhizao.project.system.service.ISysUserService;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.itextpdf.kernel.geom.PageSize;
-import freemarker.cache.FileTemplateLoader;
-import freemarker.cache.TemplateLoader;
-import freemarker.template.Configuration;
+
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import io.swagger.annotations.ApiOperation;
@@ -66,6 +74,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -121,6 +130,17 @@ public class BizFinancialSalaryController extends BaseController {
     @Resource
     private IBizFinancialKeepAccountDetailService financialKeepAccountDetailService;
 
+    @Resource
+    private IBizSocialSecurityConfirmDetailService socialSecurityConfirmDetailService;
+
+    @Resource
+    private IBizSocialSecurityConfirmService socialSecurityConfirmService;
+
+    @Resource
+    private IBizHousingFundConfirmService housingFundConfirmService;
+
+    @Resource
+    private IBizHousingFundConfirmDetailService housingFundConfirmDetailService;
 
     /**
      * 查询工资列表
@@ -747,4 +767,79 @@ public class BizFinancialSalaryController extends BaseController {
         outputStream.write(resources);
         outputStream.close();
     }
+
+
+    @PostMapping("/rpc/abc")
+    @Anonymous
+    public String filterCompletedOrders(@RequestBody List<Long> workOrderIds) {
+        //通过 workOrderId 查询出所有代理记账公积金 社保是否有已完成
+        //代理记账
+        ArrayList<Long> oneList = new ArrayList<>();
+        ArrayList<Long> twoList = new ArrayList<>();
+        ArrayList<Long> threeList = new ArrayList<>();
+        //通过workId筛选代理记账
+        for (Long workOrderId : workOrderIds) {
+            BizFinancialSalary bizFinancialSalary =
+                    bizFinancialSalaryService.getOne(new LambdaQueryWrapper<BizFinancialSalary>()
+                            .eq(BizFinancialSalary::getWorkOrderId, workOrderId));
+            if (bizFinancialSalary != null) {
+                List<BizFinancialSalaryDetail> list = bizFinancialSalaryDetailService.list(new LambdaQueryWrapper<BizFinancialSalaryDetail>()
+                        .eq(BizFinancialSalaryDetail::getFinancialSalaryId, bizFinancialSalary.getId())
+                        .eq(BizFinancialSalaryDetail::getStatus, 2));
+                if (!CollectionUtils.isEmpty(list)) {
+                    oneList.add(workOrderId);
+                }
+            }
+        }
+        if (!CollectionUtils.isEmpty(oneList)) {
+            workOrderIds.removeAll(oneList);
+        }
+
+        //通过workId筛选社保代缴
+        if (!CollectionUtils.isEmpty(workOrderIds)) {
+            for (Long workOrderId : workOrderIds) {
+
+                BizSocialSecurityConfirm one = socialSecurityConfirmService.getOne(new LambdaQueryWrapper<BizSocialSecurityConfirm>()
+                        .eq(BizSocialSecurityConfirm::getWorkOrderId, workOrderId));
+                if (one != null) {
+                    List<BizSocialSecurityConfirmDetail> list = socialSecurityConfirmDetailService.list(new LambdaQueryWrapper<BizSocialSecurityConfirmDetail>()
+                            .eq(BizSocialSecurityConfirmDetail::getSocialSecurityConfirmId, one.getId())
+                            .eq(BizSocialSecurityConfirmDetail::getStatus, 2));
+                    if (!CollectionUtils.isEmpty(list)) {
+                        twoList.add(workOrderId);
+                    }
+                }
+            }
+        }
+        if (!CollectionUtils.isEmpty(twoList)) {
+            workOrderIds.removeAll(twoList);
+        }
+        if (!CollectionUtils.isEmpty(workOrderIds)) {
+            //通过workId筛选公积金
+            for (Long workOrderId : workOrderIds) {
+                BizHousingFundConfirm one = housingFundConfirmService.getOne(new LambdaQueryWrapper<BizHousingFundConfirm>()
+                        .eq(BizHousingFundConfirm::getWorkOrderId, workOrderId));
+                if (one != null){
+                    List<BizHousingFundConfirmDetail> list = housingFundConfirmDetailService.list(new LambdaQueryWrapper<BizHousingFundConfirmDetail>()
+                            .eq(BizHousingFundConfirmDetail::getHousingFundConfirmId, one.getId())
+                            .eq(BizHousingFundConfirmDetail::getStatus, 2));
+                    if (!CollectionUtils.isEmpty(list)) {
+                        threeList.add(workOrderId);
+                    }
+                }
+
+            }
+        }
+        if (!CollectionUtils.isEmpty(threeList)) {
+            workOrderIds.removeAll(threeList);
+        }
+        Map<String, List<Long>> map = new HashMap<>();
+        map.put("oneList", oneList);
+        map.put("twoList", twoList);
+        map.put("threeList", threeList);
+        map.put("workOrderIds", workOrderIds);
+        return JSON.toJSONString(map);
+
+
+    }
 }