申报表查看附表

src/com/engine/salary/entity/datacollection/param/OtherDeductionDetailQueryParam.java

@@ -1,11 +1,14 @@
 package com.engine.salary.entity.datacollection.param;
 
 import com.engine.salary.common.BaseQueryParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 /**
  * 其他免税扣除，附表查询列表
  * <p>Copyright: Copyright (c) 2022</p>
@@ -22,4 +25,9 @@ public class OtherDeductionDetailQueryParam extends BaseQueryParam {
 
     private Long id;
 
+
+    private Long employeeId;
+    private Long taxAgentId;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date taxCycle;
 }

src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java

@@ -2248,7 +2248,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
     @Override
     public PageInfo<FreeIncomeListDTO> freeIncomeList(OtherDeductionDetailQueryParam param) {
 
-        List<FreeIncomePO> pos = getFreeIncomeMapper().listSome(FreeIncomePO.builder().mainId(param.getId()).build());
+        FreeIncomePO build;
+        if (param.getId() != null) {
+            build = FreeIncomePO.builder().mainId(param.getId()).build();
+        } else {
+            build = FreeIncomePO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+        List<FreeIncomePO> pos = getFreeIncomeMapper().listSome(build);
+
         List<Long> empIds = SalaryEntityUtil.properties(pos, FreeIncomePO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2272,7 +2279,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<DerateDeductionListDTO> derateDeductionList(OtherDeductionDetailQueryParam param) {
-        List<DerateDeductionPO> pos = getDerateDeductionMapper().listSome(DerateDeductionPO.builder().mainId(param.getId()).build());
+        DerateDeductionPO build;
+        if (param.getId() != null) {
+            build = DerateDeductionPO.builder().mainId(param.getId()).build();
+        } else {
+            build = DerateDeductionPO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<DerateDeductionPO> pos = getDerateDeductionMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, DerateDeductionPO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2296,7 +2310,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<EndowmentInsuranceListDTO> endowmentInsuranceList(OtherDeductionDetailQueryParam param) {
-        List<EndowmentInsurancePO> pos = getEndowmentInsuranceMapper().listSome(EndowmentInsurancePO.builder().mainId(param.getId()).build());
+        EndowmentInsurancePO build;
+        if (param.getId() != null) {
+            build = EndowmentInsurancePO.builder().mainId(param.getId()).build();
+        } else {
+            build = EndowmentInsurancePO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<EndowmentInsurancePO> pos = getEndowmentInsuranceMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, EndowmentInsurancePO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2320,7 +2341,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<GrantDonationListDTO> grantDonationList(OtherDeductionDetailQueryParam param) {
-        List<GrantDonationPO> pos = getGrantDonationMapper().listSome(GrantDonationPO.builder().mainId(param.getId()).build());
+        GrantDonationPO build;
+        if (param.getId() != null) {
+            build = GrantDonationPO.builder().mainId(param.getId()).build();
+        } else {
+            build = GrantDonationPO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<GrantDonationPO> pos = getGrantDonationMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, GrantDonationPO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2344,7 +2372,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<HealthInsuranceListDTO> healthInsuranceList(OtherDeductionDetailQueryParam param) {
-        List<HealthInsurancePO> pos = getHealthInsuranceMapper().listSome(HealthInsurancePO.builder().mainId(param.getId()).build());
+        HealthInsurancePO build;
+        if (param.getId() != null) {
+            build = HealthInsurancePO.builder().mainId(param.getId()).build();
+        } else {
+            build = HealthInsurancePO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<HealthInsurancePO> pos = getHealthInsuranceMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, HealthInsurancePO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2368,7 +2403,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<OtherDerateDeductionListDTO> otherDerateDeductionList(OtherDeductionDetailQueryParam param) {
-        List<OtherDerateDeductionPO> pos = getOtherDerateDeductionMapper().listSome(OtherDerateDeductionPO.builder().mainId(param.getId()).build());
+        OtherDerateDeductionPO build;
+        if (param.getId() != null) {
+            build = OtherDerateDeductionPO.builder().mainId(param.getId()).build();
+        } else {
+            build = OtherDerateDeductionPO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<OtherDerateDeductionPO> pos = getOtherDerateDeductionMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, OtherDerateDeductionPO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -2392,7 +2434,14 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
 
     @Override
     public PageInfo<PersonalPensionListDTO> personalPensionList(OtherDeductionDetailQueryParam param) {
-        List<PersonalPensionPO> pos = getPersonalPensionMapper().listSome(PersonalPensionPO.builder().mainId(param.getId()).build());
+        PersonalPensionPO build;
+        if (param.getId() != null) {
+            build = PersonalPensionPO.builder().mainId(param.getId()).build();
+        } else {
+            build = PersonalPensionPO.builder().taxAgentId(param.getTaxAgentId()).taxYearMonth(param.getTaxCycle()).employeeId(param.getEmployeeId()).build();
+        }
+
+        List<PersonalPensionPO> pos = getPersonalPensionMapper().listSome(build);
         List<Long> empIds = SalaryEntityUtil.properties(pos, PersonalPensionPO::getEmployeeId, Collectors.toList());
         List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);

src/com/engine/salary/web/OtherDeductionController.java

@@ -536,5 +536,4 @@ public class OtherDeductionController {
         return new ResponseResult<OtherDeductionDetailDeleteParam, String>(user).run(getOtherDeductionWrapper(user)::deletePersonalPension, param);
     }
 
-
 }