diff --git a/resource/sqlupgrade/DM/sql202308230303.sql b/resource/sqlupgrade/DM/sql202308230303.sql index 311a2bf86..4867c56aa 100644 --- a/resource/sqlupgrade/DM/sql202308230303.sql +++ b/resource/sqlupgrade/DM/sql202308230303.sql @@ -1,3 +1,6 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar2(400); +/ + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; / diff --git a/resource/sqlupgrade/GS/sql202308230303.sql b/resource/sqlupgrade/GS/sql202308230303.sql index 311a2bf86..4867c56aa 100644 --- a/resource/sqlupgrade/GS/sql202308230303.sql +++ b/resource/sqlupgrade/GS/sql202308230303.sql @@ -1,3 +1,6 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar2(400); +/ + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; / diff --git a/resource/sqlupgrade/JC/sql202308230303.sql b/resource/sqlupgrade/JC/sql202308230303.sql index 311a2bf86..4867c56aa 100644 --- a/resource/sqlupgrade/JC/sql202308230303.sql +++ b/resource/sqlupgrade/JC/sql202308230303.sql @@ -1,3 +1,6 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar2(400); +/ + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; / diff --git a/resource/sqlupgrade/Mysql/sql202308230303.sql b/resource/sqlupgrade/Mysql/sql202308230303.sql index ba8b047ae..76f96bf71 100644 --- a/resource/sqlupgrade/Mysql/sql202308230303.sql +++ b/resource/sqlupgrade/Mysql/sql202308230303.sql @@ -1 +1,4 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar(400) +; + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202308230303.sql b/resource/sqlupgrade/Oracle/sql202308230303.sql index 1f5c3dd15..1f61a5c96 100644 --- a/resource/sqlupgrade/Oracle/sql202308230303.sql +++ b/resource/sqlupgrade/Oracle/sql202308230303.sql @@ -1,2 +1,5 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar2(400) +/ + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416 / \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202308230303.sql b/resource/sqlupgrade/PG/sql202308230303.sql index ba8b047ae..9cd12b134 100644 --- a/resource/sqlupgrade/PG/sql202308230303.sql +++ b/resource/sqlupgrade/PG/sql202308230303.sql @@ -1 +1,5 @@ -update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; \ No newline at end of file +alter table hrsa_tax_agent_tax_return add city_name varchar(400); +/ + +update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202308230303.sql b/resource/sqlupgrade/SQLServer/sql202308230303.sql index 61cc33829..6cb8ed60b 100644 --- a/resource/sqlupgrade/SQLServer/sql202308230303.sql +++ b/resource/sqlupgrade/SQLServer/sql202308230303.sql @@ -1,2 +1,5 @@ +alter table hrsa_tax_agent_tax_return add city_name nvarchar(400) +GO + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416 GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202308230303.sql b/resource/sqlupgrade/ST/sql202308230303.sql index 311a2bf86..4867c56aa 100644 --- a/resource/sqlupgrade/ST/sql202308230303.sql +++ b/resource/sqlupgrade/ST/sql202308230303.sql @@ -1,3 +1,6 @@ +alter table hrsa_tax_agent_tax_return add city_name varchar2(400); +/ + update hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416; / diff --git a/src/com/api/salary/web/TaxDeclarationApiFlowController.java b/src/com/api/salary/web/TaxDeclarationApiFlowController.java index 6fcdf10c5..14eff76b5 100644 --- a/src/com/api/salary/web/TaxDeclarationApiFlowController.java +++ b/src/com/api/salary/web/TaxDeclarationApiFlowController.java @@ -4,10 +4,12 @@ import javax.ws.rs.Path; /** * 智能算薪-计费 + *
Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-15 16:05:40 - */ + * @author qiantao + * @version 1.0 + **/ @Path("/bs/hrmsalary/taxdeclaration/apiflow") public class TaxDeclarationApiFlowController extends com.engine.salary.web.TaxDeclarationApiFlowController{ diff --git a/src/com/engine/salary/common/OptionDTO.java b/src/com/engine/salary/common/OptionDTO.java index 465d4ed3f..b8e126406 100644 --- a/src/com/engine/salary/common/OptionDTO.java +++ b/src/com/engine/salary/common/OptionDTO.java @@ -1,17 +1,18 @@ package com.engine.salary.common; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; /** * 人员选项 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-09-06 16:57:23 - */ + * @author qiantao + * @version 1.0 + **/ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/src/com/engine/salary/constant/SzyhApiConstant.java b/src/com/engine/salary/constant/SzyhApiConstant.java index 8dc473191..698f662f8 100644 --- a/src/com/engine/salary/constant/SzyhApiConstant.java +++ b/src/com/engine/salary/constant/SzyhApiConstant.java @@ -2,9 +2,11 @@ package com.engine.salary.constant; /** * 神州云合api常量 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-18 11:05 AM + * @author qiantao + * @version 1.0 **/ public class SzyhApiConstant { diff --git a/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountFeedbackResponse.java b/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountFeedbackResponse.java index f94fe1cf0..8ac88752e 100644 --- a/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountFeedbackResponse.java +++ b/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountFeedbackResponse.java @@ -8,9 +8,11 @@ import java.util.List; /** * 人员专项附加扣除信息查询结果 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-27 10:00 AM + * @author qiantao + * @version 1.0 **/ @Data public class QuerySpecialAmountFeedbackResponse extends BaseResponse { diff --git a/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountResponse.java b/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountResponse.java index 9dfbc2cec..4562612e1 100644 --- a/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountResponse.java +++ b/src/com/engine/salary/entity/datacollection/response/QuerySpecialAmountResponse.java @@ -5,9 +5,11 @@ import lombok.Data; /** * 人员专项附加扣除信息查询结果 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-27 10:00 AM + * @author qiantao + * @version 1.0 **/ @Data public class QuerySpecialAmountResponse extends BaseResponse { diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentTaxReturnBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentTaxReturnBO.java index 559aced70..fab88eda0 100644 --- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentTaxReturnBO.java +++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentTaxReturnBO.java @@ -18,28 +18,32 @@ import java.util.UUID; /** * 报税信息BO + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-09-02 11:06:41 - */ + * @author qiantao + * @version 1.0 + **/ public class TaxAgentTaxReturnBO { public static TaxAgentTaxReturnMainFormDTO convertPo2FormDto(TaxAgentTaxReturnPO taxReturnPO) { - return new TaxAgentTaxReturnMainFormDTO() - .setId(taxReturnPO.getId()) - .setPasswordType(TaxAgentTaxReturnPasswordTypeEnum.parseByValue(taxReturnPO.getPasswordType())) - .setCity(taxReturnPO.getCity()) - .setProvince(taxReturnPO.getProvince()) - .setNation(taxReturnPO.getNation()) - .setAreaCode(taxReturnPO.getAreaCode()) - .setTaxCode(taxReturnPO.getTaxCode()) - .setAccount(taxReturnPO.getRealAccount()) - .setNetPassword(TaxAgentTaxReturnPasswordTypeEnum.TAX_NET_PASSWORD.getValue().equals(taxReturnPO.getPasswordType()) ? taxReturnPO.getPwd() : null) - .setRealNamePassword(TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(taxReturnPO.getPasswordType()) ? taxReturnPO.getPwd() : null) - .setTaxRegistrationNumber(taxReturnPO.getTaxRegistrationNumber()) - .setDepartmentCode(taxReturnPO.getDepartmentCode()) - .setCheckStatus(TaxAgentTaxReturnStatusEnum.parseByValue(taxReturnPO.getCheckStatus())) - .setFailReason(taxReturnPO.getFailReason()); + TaxAgentTaxReturnMainFormDTO dto = new TaxAgentTaxReturnMainFormDTO(); + dto.setId(taxReturnPO.getId()); + dto.setPasswordType(TaxAgentTaxReturnPasswordTypeEnum.parseByValue(taxReturnPO.getPasswordType())); + dto.setCity(taxReturnPO.getCity()); + dto.setCityName(taxReturnPO.getCityName()); + dto.setProvince(taxReturnPO.getProvince()); + dto.setNation(taxReturnPO.getNation()); + dto.setAreaCode(taxReturnPO.getAreaCode()); + dto.setTaxCode(taxReturnPO.getTaxCode()); + dto.setAccount(taxReturnPO.getRealAccount()); + dto.setNetPassword(TaxAgentTaxReturnPasswordTypeEnum.TAX_NET_PASSWORD.getValue().equals(taxReturnPO.getPasswordType()) ? taxReturnPO.getPwd() : null); + dto.setRealNamePassword(TaxAgentTaxReturnPasswordTypeEnum.REAL_NAME_PASSWORD.getValue().equals(taxReturnPO.getPasswordType()) ? taxReturnPO.getPwd() : null); + dto.setTaxRegistrationNumber(taxReturnPO.getTaxRegistrationNumber()); + dto.setDepartmentCode(taxReturnPO.getDepartmentCode()); + dto.setCheckStatus(TaxAgentTaxReturnStatusEnum.parseByValue(taxReturnPO.getCheckStatus())); + dto.setFailReason(taxReturnPO.getFailReason()); + return dto; } public static TaxAgentTaxReturnPO convertParam2Po4Insert(TaxDeclarationApiConfigPO apiConfig, TaxAgentTaxReturnSaveParam saveParam) throws Exception { @@ -49,6 +53,7 @@ public class TaxAgentTaxReturnBO { .taxCode(saveParam.getTaxCode()) .nation(saveParam.getNation()) .city(saveParam.getCity()) + .cityName(saveParam.getCityName()) .province(saveParam.getProvince()) .areaCode(saveParam.getAreaCode()) .realAccount(saveParam.getAccount()) @@ -65,16 +70,17 @@ public class TaxAgentTaxReturnBO { public static void convertParam2Po4Update(TaxDeclarationApiConfigPO apiConfig, TaxAgentTaxReturnPO po, TaxAgentTaxReturnSaveParam saveParam) throws Exception { Date now = new Date(); - po.setTaxCode(saveParam.getTaxCode()) - .setNation(saveParam.getNation()) - .setCity(saveParam.getCity()) - .setProvince(saveParam.getProvince()) - .setAreaCode(saveParam.getAreaCode()) - .setRealAccount(saveParam.getAccount()) - .setPwd(Sm4Utils.encryptEcb(apiConfig.getAppSecret(), saveParam.getPassword())) - .setPasswordType(TaxAgentTaxReturnPasswordTypeEnum.valueOf(saveParam.getPasswordType()).getValue()) - .setTaxAgentId(saveParam.getTaxAgentId()) - .setUpdateTime(now); + po.setTaxCode(saveParam.getTaxCode()); + po.setNation(saveParam.getNation()); + po.setCity(saveParam.getCity()); + po.setCityName(saveParam.getCityName()); + po.setProvince(saveParam.getProvince()); + po.setAreaCode(saveParam.getAreaCode()); + po.setRealAccount(saveParam.getAccount()); + po.setPwd(Sm4Utils.encryptEcb(apiConfig.getAppSecret(), saveParam.getPassword())); + po.setPasswordType(TaxAgentTaxReturnPasswordTypeEnum.valueOf(saveParam.getPasswordType()).getValue()); + po.setTaxAgentId(saveParam.getTaxAgentId()); + po.setUpdateTime(now); } public static MapCopyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 15:25:44 - */ + * @author qiantao + * @version 1.0 + **/ @Data @Accessors(chain = true) @ApiModel("税友验证成功信息") diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnCheckFormDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnCheckFormDTO.java index 5430733d3..cf6ca11da 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnCheckFormDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnCheckFormDTO.java @@ -4,7 +4,6 @@ import com.engine.salary.enums.SalaryOnOffEnum; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,10 +12,12 @@ import lombok.NoArgsConstructor; /** * 税友验证信息表单 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 15:25:44 - */ + * @author qiantao + * @version 1.0 + **/ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnListDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnListDTO.java index 3d38a1772..67f1c5360 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnListDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnListDTO.java @@ -9,10 +9,12 @@ import lombok.NoArgsConstructor; /** * 税友报税信息列表 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-09-02 15:31:10 - */ + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnMainFormDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnMainFormDTO.java index dae97d778..0438e01b5 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnMainFormDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnMainFormDTO.java @@ -5,18 +5,19 @@ import com.engine.salary.enums.taxagent.TaxAgentTaxReturnStatusEnum; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; /** - * 报税信息表单 + * 报税信息表单 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-09-02 09:39:05 - */ + * @author qiantao + * @version 1.0 + **/ @Data @Accessors(chain = true) @NoArgsConstructor @@ -36,6 +37,7 @@ public class TaxAgentTaxReturnMainFormDTO { //报税所属区域") private String city; + private String cityName; //省份") private String province; diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnResultDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnResultDTO.java index 24b12c7d6..76b51acf5 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnResultDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentTaxReturnResultDTO.java @@ -9,10 +9,12 @@ import lombok.experimental.Accessors; /** * 税友验证成功信息 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 15:25:44 - */ + * @author qiantao + * @version 1.0 + **/ @Data @Accessors(chain = true) @Builder diff --git a/src/com/engine/salary/entity/taxagent/param/TaxAgentTaxReturnSaveParam.java b/src/com/engine/salary/entity/taxagent/param/TaxAgentTaxReturnSaveParam.java index a28a0b349..9cd0f2c01 100644 --- a/src/com/engine/salary/entity/taxagent/param/TaxAgentTaxReturnSaveParam.java +++ b/src/com/engine/salary/entity/taxagent/param/TaxAgentTaxReturnSaveParam.java @@ -5,59 +5,64 @@ import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryI18nUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; /** - * @author chengliming - * @desc: 个税扣缴义务人-报税信息-保存参数 - * @date: 2022-08-31 10:23:29 - */ + * 个税扣缴义务人-报税信息-保存参数 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
+ * + * @author qiantao + * @version 1.0 + **/ @Data @NoArgsConstructor @AllArgsConstructor @ApiModel("个税扣缴义务人-报税信息-保存参数") public class TaxAgentTaxReturnSaveParam { - //个税扣缴义务人id") + //个税扣缴义务人id private Long taxAgentId; - //税号") + //税号 private String taxCode; - //登记序号") + //登记序号 private String taxRegistrationNumber; - //省级") + //省级 private String province; - //市级") + //市级 private String city; - //国家") + //浏览按钮显示 + private String cityName; + + //国家 private String nation; - //密码校验类型") + //密码校验类型 private String passwordType; - //密码") + //密码 private String password; - //实名账号") + //实名账号 private String account; - //部门编码,分部门备案时填入") + //部门编码,分部门备案时填入 private String departmentCode; - //部门名称,分部门备案时填入") + //部门名称,分部门备案时填入 private String departmentName; - //请求类型 1.保存并验证 2.仅保存") + //请求类型 1.保存并验证 2.仅保存 private Integer requestType = 1; - //验证类型 1.请求税友验证报税信息 2.请求税友验证登记序号+税号 3.请求税友验证部门编码") + //验证类型 1.请求税友验证报税信息 2.请求税友验证登记序号+税号 3.请求税友验证部门编码 @JsonIgnore private Integer type; diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentTaxReturnPO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentTaxReturnPO.java index 98bafb451..b338e53b6 100644 --- a/src/com/engine/salary/entity/taxagent/po/TaxAgentTaxReturnPO.java +++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentTaxReturnPO.java @@ -6,7 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Collection; @@ -22,7 +21,6 @@ import java.util.Date; **/ @Data @Builder -@Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor //hrsa_tax_agent_tax_return @@ -79,6 +77,7 @@ public class TaxAgentTaxReturnPO implements Serializable { * 市级 */ private String city; + private String cityName; /** * 市级 diff --git a/src/com/engine/salary/entity/taxagent/response/CheckPasswordResponse.java b/src/com/engine/salary/entity/taxagent/response/CheckPasswordResponse.java index 2078bfa08..c4a21e6f6 100644 --- a/src/com/engine/salary/entity/taxagent/response/CheckPasswordResponse.java +++ b/src/com/engine/salary/entity/taxagent/response/CheckPasswordResponse.java @@ -4,9 +4,11 @@ import lombok.Data; /** * 神州云合接口返回状态实体 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-18 10:39 AM + * @author qiantao + * @version 1.0 **/ @Data public class CheckPasswordResponse { diff --git a/src/com/engine/salary/entity/taxagent/response/CompanyRegisterInfoResponse.java b/src/com/engine/salary/entity/taxagent/response/CompanyRegisterInfoResponse.java index b3a2557e3..f0ff1c84f 100644 --- a/src/com/engine/salary/entity/taxagent/response/CompanyRegisterInfoResponse.java +++ b/src/com/engine/salary/entity/taxagent/response/CompanyRegisterInfoResponse.java @@ -6,9 +6,11 @@ import java.util.List; /** * 神州云合接口返回状态实体 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-18 10:39 AM + * @author qiantao + * @version 1.0 **/ @Data public class CompanyRegisterInfoResponse { diff --git a/src/com/engine/salary/entity/taxagent/response/SzyhResponseHead.java b/src/com/engine/salary/entity/taxagent/response/SzyhResponseHead.java index 11b1185a0..90ba9fc96 100644 --- a/src/com/engine/salary/entity/taxagent/response/SzyhResponseHead.java +++ b/src/com/engine/salary/entity/taxagent/response/SzyhResponseHead.java @@ -4,9 +4,11 @@ import lombok.Data; /** * 神州云合接口返回状态实体 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-10-18 10:39 AM + * @author qiantao + * @version 1.0 **/ @Data public class SzyhResponseHead { diff --git a/src/com/engine/salary/entity/taxpayment/response/WithholdingVoucherFeedbackResponse.java b/src/com/engine/salary/entity/taxpayment/response/WithholdingVoucherFeedbackResponse.java index e49c10f80..abb5e585d 100644 --- a/src/com/engine/salary/entity/taxpayment/response/WithholdingVoucherFeedbackResponse.java +++ b/src/com/engine/salary/entity/taxpayment/response/WithholdingVoucherFeedbackResponse.java @@ -6,9 +6,11 @@ import java.util.List; /** * 缴款凭证反馈 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-12-06 17:25:32 + * @author qiantao + * @version 1.0 **/ @Data public class WithholdingVoucherFeedbackResponse extends BaseResponse { diff --git a/src/com/engine/salary/enums/taxdeclaration/TaxPaymentTypeEnum.java b/src/com/engine/salary/enums/taxdeclaration/TaxPaymentTypeEnum.java index b3aeeed48..2ffa4958f 100644 --- a/src/com/engine/salary/enums/taxdeclaration/TaxPaymentTypeEnum.java +++ b/src/com/engine/salary/enums/taxdeclaration/TaxPaymentTypeEnum.java @@ -6,10 +6,12 @@ import java.util.Objects; /** * 个税辅助缴款-请求类型 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-12-08 19:08:17 - */ + * @author qiantao + * @version 1.0 + **/ public enum TaxPaymentTypeEnum implements BaseEnum { /** * 三方协议缴款反馈 diff --git a/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.java b/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.java index c6cf9f5f0..ec4492aae 100644 --- a/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.java +++ b/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.java @@ -6,10 +6,12 @@ import java.util.List; /** * 个税扣缴义务人报税信息 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 11:20:32 - */ + * @author qiantao + * @version 1.0 + **/ public interface TaxAgentTaxReturnMapper { /** * 查询所有记录 diff --git a/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.xml b/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.xml index 6468afdac..e5a86e57f 100644 --- a/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.xml +++ b/src/com/engine/salary/mapper/taxagent/TaxAgentTaxReturnMapper.xml @@ -5,6 +5,7 @@Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-08-31 11:20:32 - */ + * @author qiantao + * @version 1.0 + **/ public interface TaxDeclarationApiFlowRecordMapper { /** * 批量插入 diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationApiFlowRecordMapper.java b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationApiFlowRecordMapper.java index 8d3d174c8..0f6194282 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationApiFlowRecordMapper.java +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationApiFlowRecordMapper.java @@ -8,10 +8,12 @@ import java.util.Collection; /** * 个税申报-接口流量使用记录 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-08-31 11:20:32 - */ + * @author qiantao + * @version 1.0 + **/ @Mapper public interface TaxDeclarationApiFlowRecordMapper { /** diff --git a/src/com/engine/salary/service/TaxAgentTaxReturnService.java b/src/com/engine/salary/service/TaxAgentTaxReturnService.java index 6009b455a..c87b48267 100644 --- a/src/com/engine/salary/service/TaxAgentTaxReturnService.java +++ b/src/com/engine/salary/service/TaxAgentTaxReturnService.java @@ -9,9 +9,11 @@ import java.util.List; /** * 个税扣缴义务人-报税信息service接口 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-02 9:26 AM + * @author qiantao + * @version 1.0 **/ public interface TaxAgentTaxReturnService { /** diff --git a/src/com/engine/salary/service/TaxDeclarationApiBillingService.java b/src/com/engine/salary/service/TaxDeclarationApiBillingService.java index 3917b494e..7c7801cdb 100644 --- a/src/com/engine/salary/service/TaxDeclarationApiBillingService.java +++ b/src/com/engine/salary/service/TaxDeclarationApiBillingService.java @@ -4,10 +4,12 @@ import com.engine.salary.service.impl.TaxDeclarationApiBillingServiceImpl; /** * 个税申报计费service + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-11 14:54:14 - */ + * @author qiantao + * @version 1.0 + **/ public interface TaxDeclarationApiBillingService { /** diff --git a/src/com/engine/salary/service/TaxDeclarationApiConfigService.java b/src/com/engine/salary/service/TaxDeclarationApiConfigService.java index 69de5ffd3..c43db36c9 100644 --- a/src/com/engine/salary/service/TaxDeclarationApiConfigService.java +++ b/src/com/engine/salary/service/TaxDeclarationApiConfigService.java @@ -5,10 +5,12 @@ import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationApiConfigPO; /** * 个税申报api配置service + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-09 10:09:22 - */ + * @author qiantao + * @version 1.0 + **/ public interface TaxDeclarationApiConfigService { /** diff --git a/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java b/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java index de75cf036..ae981ddd3 100644 --- a/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java +++ b/src/com/engine/salary/service/TaxDeclarationApiFlowWarnService.java @@ -12,10 +12,12 @@ import java.util.List; /** * 流量不足提醒 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-11 14:54:14 - */ + * @author qiantao + * @version 1.0 + **/ public interface TaxDeclarationApiFlowWarnService { /** diff --git a/src/com/engine/salary/service/TaxPaymentService.java b/src/com/engine/salary/service/TaxPaymentService.java index 72c740132..6f8ae318f 100644 --- a/src/com/engine/salary/service/TaxPaymentService.java +++ b/src/com/engine/salary/service/TaxPaymentService.java @@ -11,9 +11,11 @@ import java.util.Map; /** * 个税辅助缴款 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-12-06 17:27:59 + * @author qiantao + * @version 1.0 **/ public interface TaxPaymentService { /** diff --git a/src/com/engine/salary/service/factory/TaxAgentTaxReturnCheckServiceFactory.java b/src/com/engine/salary/service/factory/TaxAgentTaxReturnCheckServiceFactory.java index 31b50a2a7..14b08ed4e 100644 --- a/src/com/engine/salary/service/factory/TaxAgentTaxReturnCheckServiceFactory.java +++ b/src/com/engine/salary/service/factory/TaxAgentTaxReturnCheckServiceFactory.java @@ -8,10 +8,6 @@ import com.engine.salary.service.impl.TaxReturnCheckMainServiceImpl; import com.engine.salary.service.impl.TaxReturnCheckRegistrationServiceImpl; import weaver.hrm.User; -/** - * @author chengliming - * @date 2022-09-09 2:09 PM - **/ public class TaxAgentTaxReturnCheckServiceFactory { private User user; diff --git a/src/com/engine/salary/service/factory/TaxPaymentServiceFactory.java b/src/com/engine/salary/service/factory/TaxPaymentServiceFactory.java index 90fbb0cc4..f778ff2df 100644 --- a/src/com/engine/salary/service/factory/TaxPaymentServiceFactory.java +++ b/src/com/engine/salary/service/factory/TaxPaymentServiceFactory.java @@ -5,10 +5,6 @@ import com.engine.salary.service.TaxPaymentService; import com.engine.salary.service.impl.*; import weaver.hrm.User; -/** - * @author chengliming - * @date 2022-12-08 19:05:16 - **/ public class TaxPaymentServiceFactory { private User user; diff --git a/src/com/engine/salary/service/impl/TaxAgentTaxReturnServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentTaxReturnServiceImpl.java index 7b36f358d..a39f2a941 100644 --- a/src/com/engine/salary/service/impl/TaxAgentTaxReturnServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentTaxReturnServiceImpl.java @@ -12,10 +12,6 @@ import com.engine.salary.util.db.MapperProxyFactory; import java.util.Collection; import java.util.List; -/** - * @author chengliming - * @date 2022-09-02 9:27 AM - **/ public class TaxAgentTaxReturnServiceImpl extends Service implements TaxAgentTaxReturnService { private TaxAgentTaxReturnMapper getTaxAgentTaxReturnMapper() { return MapperProxyFactory.getProxy(TaxAgentTaxReturnMapper.class); diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java index 4b3d8a9a2..8288c1565 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationApiBillingServiceImpl.java @@ -24,10 +24,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -/** - * @author chengliming - * @date 2022-11-11 2:57 PM - **/ @Slf4j public class TaxDeclarationApiBillingServiceImpl extends Service implements TaxDeclarationApiBillingService { diff --git a/src/com/engine/salary/service/impl/TaxDeclarationApiConfigServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationApiConfigServiceImpl.java index e716e6daa..f307a95c8 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationApiConfigServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationApiConfigServiceImpl.java @@ -22,8 +22,12 @@ import org.apache.commons.lang3.StringUtils; import java.util.*; /** - * @author chengliming - * @date 2022-11-09 10:09 AM + * chengliming + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
+ * + * @author qiantao + * @version 1.0 **/ @Slf4j public class TaxDeclarationApiConfigServiceImpl extends Service implements TaxDeclarationApiConfigService { diff --git a/src/com/engine/salary/service/impl/TaxPaymentAgreementServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentAgreementServiceImpl.java index 9e738ef1b..5b140dd83 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentAgreementServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentAgreementServiceImpl.java @@ -23,9 +23,11 @@ import java.util.*; /** * 三方信息查询 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-02 9:27 AM + * @author qiantao + * @version 1.0 **/ @Slf4j public class TaxPaymentAgreementServiceImpl extends AbstractTaxPaymentService { diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java index 4cb11b809..eb977a7b7 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithheldVoucherServiceImpl.java @@ -22,9 +22,11 @@ import java.util.*; /** * 完税证明 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-02 9:27 AM + * @author qiantao + * @version 1.0 **/ @Slf4j public class TaxPaymentWithheldVoucherServiceImpl extends AbstractTaxPaymentService { diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java index 401bca567..4e6c5180e 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingServiceImpl.java @@ -28,9 +28,11 @@ import java.util.Optional; /** * 三方缴款 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-02 9:27 AM + * @author qiantao + * @version 1.0 **/ @Slf4j public class TaxPaymentWithholdingServiceImpl extends AbstractTaxPaymentService { diff --git a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java index d87f61c39..048f286ab 100644 --- a/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxPaymentWithholdingVoucherServiceImpl.java @@ -34,9 +34,11 @@ import java.util.stream.Collectors; /** * 缴款凭证 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-02 9:27 AM + * @author qiantao + * @version 1.0 **/ @Slf4j public class TaxPaymentWithholdingVoucherServiceImpl extends AbstractTaxPaymentService { diff --git a/src/com/engine/salary/service/impl/TaxReturnCheckDepartmentServiceImpl.java b/src/com/engine/salary/service/impl/TaxReturnCheckDepartmentServiceImpl.java index dd2c2af07..087105b17 100644 --- a/src/com/engine/salary/service/impl/TaxReturnCheckDepartmentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxReturnCheckDepartmentServiceImpl.java @@ -10,10 +10,12 @@ import lombok.extern.slf4j.Slf4j; /** * 验证部门编码相关方法 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-15 17:21:41 - */ + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxReturnCheckDepartmentServiceImpl extends AbstractTaxAgentTaxReturnCheckService { diff --git a/src/com/engine/salary/service/impl/TaxReturnCheckMainServiceImpl.java b/src/com/engine/salary/service/impl/TaxReturnCheckMainServiceImpl.java index 0d304779c..12feb8d16 100644 --- a/src/com/engine/salary/service/impl/TaxReturnCheckMainServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxReturnCheckMainServiceImpl.java @@ -18,11 +18,13 @@ import java.util.List; import java.util.Objects; /** - * 验证主题报税信息相关方法 + * 验证主体报税信息相关方法 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-15 17:21:23 - */ + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxReturnCheckMainServiceImpl extends AbstractTaxAgentTaxReturnCheckService { @@ -78,7 +80,9 @@ public class TaxReturnCheckMainServiceImpl extends AbstractTaxAgentTaxReturnChec TaxAgentTaxReturnBO.convertParam2Po4Update(apiConfig, po, saveParam); getTaxAgentTaxReturnMapper().updateByTaxAgentId(po); } else { - po = TaxAgentTaxReturnBO.convertParam2Po4Insert(apiConfig, saveParam).setCreator((long) user.getUID()).setTenantKey(""); + po = TaxAgentTaxReturnBO.convertParam2Po4Insert(apiConfig, saveParam); + po.setCreator((long) user.getUID()); + po.setTenantKey(""); getTaxAgentTaxReturnMapper().insertIgnoreNull(po); } return po; diff --git a/src/com/engine/salary/service/impl/TaxReturnCheckRegistrationServiceImpl.java b/src/com/engine/salary/service/impl/TaxReturnCheckRegistrationServiceImpl.java index aabb3e2f9..4ac507c1b 100644 --- a/src/com/engine/salary/service/impl/TaxReturnCheckRegistrationServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxReturnCheckRegistrationServiceImpl.java @@ -12,10 +12,12 @@ import java.util.List; /** * 验证税号+序号相关方法 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-09-15 17:22:14 - */ + * @author qiantao + * @version 1.0 + **/ public class TaxReturnCheckRegistrationServiceImpl extends AbstractTaxAgentTaxReturnCheckService { @Override diff --git a/src/com/engine/salary/web/TaxAgentTaxReturnController.java b/src/com/engine/salary/web/TaxAgentTaxReturnController.java index c7bacf57a..e0bb24202 100644 --- a/src/com/engine/salary/web/TaxAgentTaxReturnController.java +++ b/src/com/engine/salary/web/TaxAgentTaxReturnController.java @@ -18,10 +18,12 @@ import javax.ws.rs.core.MediaType; /** * 个税扣缴义务人-报税信息 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 11:49:38 - */ + * @author qiantao + * @version 1.0 + **/ public class TaxAgentTaxReturnController { private TaxAgentTaxReturnWrapper getTaxAgentTaxReturnWrapper(User user) { diff --git a/src/com/engine/salary/web/TaxDeclarationApiFlowController.java b/src/com/engine/salary/web/TaxDeclarationApiFlowController.java index 0a6bf2a36..0fdcad304 100644 --- a/src/com/engine/salary/web/TaxDeclarationApiFlowController.java +++ b/src/com/engine/salary/web/TaxDeclarationApiFlowController.java @@ -23,10 +23,12 @@ import javax.ws.rs.core.MediaType; /** * 智能算薪-计费 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-15 16:05:40 - */ + * @author qiantao + * @version 1.0 + **/ public class TaxDeclarationApiFlowController { private TaxDeclarationApiFlowBillingWrapper getTaxDeclarationApiFlowBillingWrapper(User user) { diff --git a/src/com/engine/salary/web/TaxPaymentController.java b/src/com/engine/salary/web/TaxPaymentController.java index ceffe78ff..07e5203ca 100644 --- a/src/com/engine/salary/web/TaxPaymentController.java +++ b/src/com/engine/salary/web/TaxPaymentController.java @@ -23,10 +23,12 @@ import javax.ws.rs.core.MediaType; /** * 个税辅助缴款 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 11:49:38 - */ + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxPaymentController { diff --git a/src/com/engine/salary/wrapper/TaxAgentTaxReturnWrapper.java b/src/com/engine/salary/wrapper/TaxAgentTaxReturnWrapper.java index 08674beb1..79d2fe07a 100644 --- a/src/com/engine/salary/wrapper/TaxAgentTaxReturnWrapper.java +++ b/src/com/engine/salary/wrapper/TaxAgentTaxReturnWrapper.java @@ -30,11 +30,12 @@ import java.util.stream.Collectors; /** * 个税扣缴义务人-报税信息包装类 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 13:29:14 - */ - + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxAgentTaxReturnWrapper extends Service { diff --git a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java index 7be89079d..ac6db24f7 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationApiFlowBillingWrapper.java @@ -18,10 +18,12 @@ import weaver.hrm.User; /** * 个税申报计费 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date 2022-11-11 15:16:22 - */ + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxDeclarationApiFlowBillingWrapper extends Service { diff --git a/src/com/engine/salary/wrapper/TaxPaymentWrapper.java b/src/com/engine/salary/wrapper/TaxPaymentWrapper.java index 431deede8..f90f62713 100644 --- a/src/com/engine/salary/wrapper/TaxPaymentWrapper.java +++ b/src/com/engine/salary/wrapper/TaxPaymentWrapper.java @@ -11,10 +11,12 @@ import lombok.extern.slf4j.Slf4j; /** * 个税辅助缴款 + *Copyright: Copyright (c) 2023
+ *Company: 泛微软件
* - * @author chengliming - * @date: 2022-08-31 13:29:14 - */ + * @author qiantao + * @version 1.0 + **/ @Slf4j public class TaxPaymentWrapper extends Service { private final TaxPaymentServiceFactory taxPaymentServiceFactory = new TaxPaymentServiceFactory(user);