diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationEmployeeDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationEmployeeDTO.java index 10c5ec845..a2c2fe5e1 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationEmployeeDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationEmployeeDTO.java @@ -1,6 +1,9 @@ package com.engine.salary.entity.taxdeclaration.dto; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * 个税申报表中的人员(组织架构中的人员+外部人员) @@ -10,6 +13,9 @@ import lombok.Data; * @author qiantao * @version 1.0 **/ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class TaxDeclarationEmployeeDTO { diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormEditParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormEditParam.java new file mode 100644 index 000000000..e0ed3e6c1 --- /dev/null +++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormEditParam.java @@ -0,0 +1,27 @@ +package com.engine.salary.entity.taxdeclaration.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.util.Map; + + +@Data +@Builder +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +public class TaxDeclarationDetailFormEditParam { + + //"个税申报记录id") + private Long taxDeclarationId; + + private Long employeeId; + + private String taxDeclarationIdStr; + + private Map valueMap; +} diff --git a/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormQueryParam.java b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormQueryParam.java new file mode 100644 index 000000000..601bfd3bb --- /dev/null +++ b/src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationDetailFormQueryParam.java @@ -0,0 +1,23 @@ +package com.engine.salary.entity.taxdeclaration.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + + +@Data +@Builder +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +public class TaxDeclarationDetailFormQueryParam { + + //"个税申报记录id") + private Long taxDeclarationId; + + private String taxDeclarationIdStr; + + private Long employeeId; +} diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.java b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.java index cbe931b93..2feb448ff 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.java +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.java @@ -70,4 +70,6 @@ public interface TaxDeclarationDetailMapper { List listAll(); int batchUpdate(@Param("collection") List taxDeclarationDetailPos); + + void deleteByTaxDeclarationIdAndEmployeeId(@Param("taxDeclarationId") Long taxDeclarationId, @Param("employeeId") Long employeeId); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml index 232e769bf..00d8105bd 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml @@ -31,6 +31,13 @@ , t.update_time , t.employee_type + + UPDATE hrsa_tax_declaration_detail + SET delete_type = 1 + WHERE delete_type = 0 + AND tax_declaration_id = #{taxDeclarationId} + AND employee_id = #{employeeId} + @@ -39,7 +46,7 @@