diff --git a/resource/sqlupgrade/DM/sql202308080603.sql b/resource/sqlupgrade/DM/sql202308080603.sql new file mode 100644 index 000000000..652e03173 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202308080603.sql @@ -0,0 +1,51 @@ +create table hrsa_employee_declare_record +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + request_id varchar2(100) +); +/ + +create table hrsa_employee_declare +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + employee_id number, + employee_type number, + employee_name varchar2(100), + job_num varchar2(100), + card_type number, + card_num varchar2(100), + gender varchar2(100), + birthday date, + employment_status number, + mobile varchar2(100), + employment_type number, + employment_first_year varchar2(100), + employment_date date, + dismiss_date date, + disability number, + disability_card_no varchar2(100), + lonely_old number, + martyr_dependents number, + martyr_dependents_card_no varchar2(100), + deduct_expenses number, + successfully_declared number, + new_employee_info number, + declare_status number, + declare_error_msg varchar2(1000) +); +/ + diff --git a/resource/sqlupgrade/JC/sql202308080603.sql b/resource/sqlupgrade/JC/sql202308080603.sql new file mode 100644 index 000000000..652e03173 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202308080603.sql @@ -0,0 +1,51 @@ +create table hrsa_employee_declare_record +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + request_id varchar2(100) +); +/ + +create table hrsa_employee_declare +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + employee_id number, + employee_type number, + employee_name varchar2(100), + job_num varchar2(100), + card_type number, + card_num varchar2(100), + gender varchar2(100), + birthday date, + employment_status number, + mobile varchar2(100), + employment_type number, + employment_first_year varchar2(100), + employment_date date, + dismiss_date date, + disability number, + disability_card_no varchar2(100), + lonely_old number, + martyr_dependents number, + martyr_dependents_card_no varchar2(100), + deduct_expenses number, + successfully_declared number, + new_employee_info number, + declare_status number, + declare_error_msg varchar2(1000) +); +/ + diff --git a/resource/sqlupgrade/Mysql/sql202308080603.sql b/resource/sqlupgrade/Mysql/sql202308080603.sql new file mode 100644 index 000000000..7e651187b --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202308080603.sql @@ -0,0 +1,50 @@ +create table hrsa_employee_declare_record +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + tax_agent_id bigint comment '个税扣缴义务人' , + tax_cycle varchar(10) comment '税款所属期' , + request_id varchar(100) comment '供应商第三方系统翻译的requestid' +) +; + +create table hrsa_employee_declare +( + id bigint primary key comment 'ID' , + create_time datetime comment '创建时间' , + update_time datetime comment '修改时间' , + creator bigint comment '创建人id' , + delete_type int default 0 comment '是否删除' , + tenant_key varchar(10) comment '租户KEY' , + tax_agent_id bigint comment '个税扣缴义务人ID' , + tax_cycle varchar(10) comment '税款所属期' , + employee_id bigint comment '人员id' , + employee_type tinyint comment '人员类型' , + employee_name varchar(100) comment '姓名' , + job_num varchar(100) comment '工号' , + card_type tinyint comment '证件类型' , + card_num varchar(100) comment '证件号码' , + gender varchar(100) comment '性别' , + birthday date comment '生日' , + employment_status tinyint comment '人员状态' , + mobile varchar(100) comment '手机号码' , + employment_type tinyint comment '任职受雇从业类型' , + employment_first_year varchar(100) comment '入职年度就业情形' , + employment_date date comment '任职受雇从业日期' , + dismiss_date date comment '离职日期' , + disability tinyint comment '是否残疾' , + disability_card_no varchar(100) comment '残疾证号码' , + lonely_old tinyint comment '是否孤老' , + martyr_dependents tinyint comment '是否烈属' , + martyr_dependents_card_no varchar(100) comment '烈属证号码' , + deduct_expenses tinyint comment '是否扣除减除费用' , + successfully_declared tinyint comment '是否成功报送过' , + new_employee_info tinyint comment '本月是否编辑过' , + declare_status tinyint comment '报送状态' , + declare_error_msg varchar(1000) comment '报送失败时的错误信息' +) +; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202308080603.sql b/resource/sqlupgrade/Oracle/sql202308080603.sql new file mode 100644 index 000000000..c846543ba --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202308080603.sql @@ -0,0 +1,50 @@ +create table hrsa_employee_declare_record +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + request_id varchar2(100) +) +/ + +create table hrsa_employee_declare +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + employee_id number, + employee_type number, + employee_name varchar2(100), + job_num varchar2(100), + card_type number, + card_num varchar2(100), + gender varchar2(100), + birthday date, + employment_status number, + mobile varchar2(100), + employment_type number, + employment_first_year varchar2(100), + employment_date date, + dismiss_date date, + disability number, + disability_card_no varchar2(100), + lonely_old number, + martyr_dependents number, + martyr_dependents_card_no varchar2(100), + deduct_expenses number, + successfully_declared number, + new_employee_info number, + declare_status number, + declare_error_msg varchar2(1000) +) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202308080603.sql b/resource/sqlupgrade/PG/sql202308080603.sql new file mode 100644 index 000000000..f5e88b1a1 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202308080603.sql @@ -0,0 +1,50 @@ +create table hrsa_employee_declare_record +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + tax_agent_id bigint, + tax_cycle varchar(10), + request_id varchar(100) +); +/ + +create table hrsa_employee_declare +( + id bigint primary key , + create_time timestamp, + update_time timestamp, + creator bigint, + delete_type int default 0, + tenant_key varchar(10), + tax_agent_id bigint, + tax_cycle varchar(10), + employee_id bigint, + employee_type smallint, + employee_name varchar(100), + job_num varchar(100), + card_type smallint, + card_num varchar(100), + gender varchar(100), + birthday date, + employment_status smallint, + mobile varchar(100), + employment_type smallint, + employment_first_year varchar(100), + employment_date date, + dismiss_date date, + disability smallint, + disability_card_no varchar(100), + lonely_old smallint, + martyr_dependents smallint, + martyr_dependents_card_no varchar(100), + deduct_expenses smallint, + successfully_declared smallint, + new_employee_info smallint, + declare_status smallint, + declare_error_msg varchar(1000) +); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202308080603.sql b/resource/sqlupgrade/SQLServer/sql202308080603.sql new file mode 100644 index 000000000..1438be357 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202308080603.sql @@ -0,0 +1,50 @@ +create table hrsa_employee_declare_record +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + tax_agent_id bigint, + tax_cycle nvarchar(10), + request_id nvarchar(100) +) +GO + +create table hrsa_employee_declare +( + id bigint primary key , + create_time datetime, + update_time datetime, + creator bigint, + delete_type int default 0, + tenant_key nvarchar(10), + tax_agent_id bigint, + tax_cycle nvarchar(10), + employee_id bigint, + employee_type tinyint, + employee_name nvarchar(100), + job_num nvarchar(100), + card_type tinyint, + card_num nvarchar(100), + gender nvarchar(100), + birthday datetime, + employment_status tinyint, + mobile nvarchar(100), + employment_type tinyint, + employment_first_year nvarchar(100), + employment_date datetime, + dismiss_date datetime, + disability tinyint, + disability_card_no nvarchar(100), + lonely_old tinyint, + martyr_dependents tinyint, + martyr_dependents_card_no nvarchar(100), + deduct_expenses tinyint, + successfully_declared tinyint, + new_employee_info tinyint, + declare_status tinyint, + declare_error_msg nvarchar(1000) +) +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202308080603.sql b/resource/sqlupgrade/ST/sql202308080603.sql new file mode 100644 index 000000000..652e03173 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202308080603.sql @@ -0,0 +1,51 @@ +create table hrsa_employee_declare_record +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + request_id varchar2(100) +); +/ + +create table hrsa_employee_declare +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + tax_agent_id number, + tax_cycle varchar2(10), + employee_id number, + employee_type number, + employee_name varchar2(100), + job_num varchar2(100), + card_type number, + card_num varchar2(100), + gender varchar2(100), + birthday date, + employment_status number, + mobile varchar2(100), + employment_type number, + employment_first_year varchar2(100), + employment_date date, + dismiss_date date, + disability number, + disability_card_no varchar2(100), + lonely_old number, + martyr_dependents number, + martyr_dependents_card_no varchar2(100), + deduct_expenses number, + successfully_declared number, + new_employee_info number, + declare_status number, + declare_error_msg varchar2(1000) +); +/ + diff --git a/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareBatchUpdateParam.java b/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareBatchUpdateParam.java new file mode 100644 index 000000000..3dc154bfb --- /dev/null +++ b/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareBatchUpdateParam.java @@ -0,0 +1,25 @@ +package com.engine.salary.entity.employeedeclare.param; + +import lombok.Data; + +import java.util.Collection; + +/** + * @description: 浜哄憳鎶ラ-鎵归噺缂栬緫淇濆瓨鍙傛暟 + * @author: xiajun + * @modified By: xiajun + * @date: Created in 2022/12/16 3:56 PM + * @version:v1.0 + */ +@Data +public class EmployeeDeclareBatchUpdateParam extends EmployeeDeclareListQueryParam { + + //鎶ラ佷汉鍛樼殑id + private Collection ids; + + //鎵归噺缂栬緫鐨勯」鐩 + private String batchUpdateItem; + + //鎵归噺缂栬緫涓 + private String itemValue; +} diff --git a/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclarePO.java b/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclarePO.java index 794a0bedd..20b531403 100644 --- a/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclarePO.java +++ b/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclarePO.java @@ -25,6 +25,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Accessors(chain = true) +//hrsa_employee_declare public class EmployeeDeclarePO { /** diff --git a/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclareRecordPO.java b/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclareRecordPO.java index 83d5ffa7e..bf715c633 100644 --- a/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclareRecordPO.java +++ b/src/com/engine/salary/entity/employeedeclare/po/EmployeeDeclareRecordPO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.employeedeclare.po; import lombok.Data; import lombok.experimental.Accessors; +import java.util.Collection; import java.util.Date; /** @@ -53,4 +54,6 @@ public class EmployeeDeclareRecordPO { * 鏇存柊鏃堕棿 */ private Date updateTime; + + private Collection ids; } diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationApiConfigPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationApiConfigPO.java index 5f3c1ae81..e89c94530 100644 --- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationApiConfigPO.java +++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationApiConfigPO.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.Collection; import java.util.Date; /** @@ -87,4 +88,7 @@ public class TaxDeclarationApiConfigPO implements Serializable { * 鏇存柊鏃堕棿 */ private Date updateTime; + + //鏌ヨ鏉′欢 + Collection ids; } diff --git a/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.java b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.java new file mode 100644 index 000000000..9fe80ed26 --- /dev/null +++ b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.java @@ -0,0 +1,80 @@ +package com.engine.salary.mapper.employeedeclare; + +import com.engine.salary.entity.employeedeclare.po.EmployeeDeclareRecordPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +public interface EmployeeDeclareRecordMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(EmployeeDeclareRecordPO employeeDeclareRecord); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + EmployeeDeclareRecordPO getById(Long id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param employeeDeclareRecord 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(EmployeeDeclareRecordPO employeeDeclareRecord); + + /** + * 鎵归噺鎻掑叆 + * + * @param employeeDeclareRecord + */ + void batchInsert(@Param("collection") List employeeDeclareRecord); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param employeeDeclareRecord 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(EmployeeDeclareRecordPO employeeDeclareRecord); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param employeeDeclareRecord 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(EmployeeDeclareRecordPO employeeDeclareRecord); + + /** + * 鍒犻櫎璁板綍 + * + * @param employeeDeclareRecord 寰呭垹闄ょ殑璁板綍 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int delete(EmployeeDeclareRecordPO employeeDeclareRecord); + + /** + * 鎵归噺鍒犻櫎璁板綍 + * + * @param ids 涓婚敭id闆嗗悎 + */ + void deleteByIds(@Param("ids") Collection ids); + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.xml b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.xml new file mode 100644 index 000000000..e2f16e7ac --- /dev/null +++ b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareRecordMapper.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + t + . + id + , t.create_time + , t.update_time + , t.creator + , t.delete_type + , t.tenant_key + , t.tax_agent_id + , t.tax_cycle + , t.request_id + + + + + + + + + + + + + + + INSERT INTO hrsa_employee_declare_record + + + + id, + + + create_time, + + + update_time, + + + creator, + + + delete_type, + + + tenant_key, + + + tax_agent_id, + + + tax_cycle, + + + request_id, + + + + + #{id}, + + + #{createTime}, + + + #{updateTime}, + + + #{creator}, + + + #{deleteType}, + + + #{tenantKey}, + + + #{taxAgentId}, + + + #{taxCycle}, + + + #{requestId}, + + + + + + + + INSERT INTO hrsa_employee_declare_record + ( + id, + create_time, + update_time, + creator, + delete_type, + tenant_key, + tax_agent_id, + tax_cycle, + request_id, + ) + VALUES + ( + + #{item.id}, + #{item.createTime}, + #{item.updateTime}, + #{item.creator}, + #{item.deleteType}, + #{item.tenantKey}, + #{item.taxAgentId}, + #{item.taxCycle}, + #{item.requestId}, + + ) + + + + + INSERT INTO hrsa_employee_declare_record ( + id, + create_time, + update_time, + creator, + delete_type, + tenant_key, + tax_agent_id, + tax_cycle, + request_id, + ) + + select + #{item.id,jdbcType=DOUBLE}, + #{item.createTime,jdbcType=DATE}, + #{item.updateTime,jdbcType=DATE}, + #{item.creator,jdbcType=DOUBLE}, + #{item.deleteType,jdbcType=INTEGER}, + #{item.tenantKey,jdbcType=VARCHAR}, + #{item.taxAgentId,jdbcType=DOUBLE}, + #{item.taxCycle,jdbcType=VARCHAR}, + #{item.requestId,jdbcType=DOUBLE}, + from dual + + + + + + + INSERT INTO hrsa_employee_declare_record ( + id, + create_time, + update_time, + creator, + delete_type, + tenant_key, + tax_agent_id, + tax_cycle, + request_id, + ) + VALUES + ( + #{item.id,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.createTime,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.updateTime,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.creator,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.deleteType,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.tenantKey,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.taxAgentId,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.taxCycle,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + #{item.requestId,jdbcType=DOUBLE銆丏ATE銆乂ARCHAR銆両NTEGER}, + ) + + + + + + UPDATE hrsa_employee_declare_record + + create_time=#{createTime}, + update_time=#{updateTime}, + creator=#{creator}, + delete_type=#{deleteType}, + tenant_key=#{tenantKey}, + tax_agent_id=#{taxAgentId}, + tax_cycle=#{taxCycle}, + request_id=#{requestId}, + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_employee_declare_record + + + create_time=#{createTime}, + + + update_time=#{updateTime}, + + + creator=#{creator}, + + + delete_type=#{deleteType}, + + + tenant_key=#{tenantKey}, + + + tax_agent_id=#{taxAgentId}, + + + tax_cycle=#{taxCycle}, + + + request_id=#{requestId}, + + + WHERE id = #{id} AND delete_type = 0 + + + + + + UPDATE hrsa_employee_declare_record + SET delete_type=1 + WHERE id = #{id} + AND delete_type = 0 + + + + UPDATE hrsa_employee_declare_record + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclareApiConfigMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclareApiConfigMapper.xml index b6b64d359..5ae5a4680 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclareApiConfigMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclareApiConfigMapper.xml @@ -11,6 +11,10 @@ + + + + @@ -26,6 +30,10 @@ , t.host , t.app_key , t.app_secret + , t.enable_use + , t.totality + , t.remain + , t.last_update_time @@ -45,8 +53,7 @@ - SELECT FROM hrsa_tax_declare_api_config t @@ -78,6 +85,18 @@ AND app_secret = #{appSecret} + + AND enable_use = #{enableUse} + + + AND totality = #{totality} + + + AND remain = #{remain} + + + AND last_update_time = #{lastUpdateTime} + AND id IN @@ -120,6 +139,18 @@ app_secret, + + enable_use, + + + totality, + + + remain, + + + last_update_time, + @@ -149,6 +180,18 @@ #{appSecret}, + + #{enableUse}, + + + #{totality}, + + + #{remain}, + + + #{lastUpdateTime}, + @@ -164,6 +207,10 @@ host=#{host}, app_key=#{appKey}, app_secret=#{appSecret}, + enable_use=#{enableUse}, + totality=#{totality}, + remain=#{remain}, + last_update_time=#{lastUpdateTime}, WHERE id = #{id} AND delete_type = 0 @@ -197,6 +244,18 @@ app_secret=#{appSecret}, + + enable_use=#{enableUse}, + + + totality=#{totality}, + + + remain=#{remain}, + + + last_update_time=#{lastUpdateTime}, + WHERE id = #{id} AND delete_type = 0 @@ -227,4 +286,5 @@ WHERE delete_type = 0 + \ No newline at end of file diff --git a/src/com/engine/salary/service/EmployeeDeclareService.java b/src/com/engine/salary/service/EmployeeDeclareService.java index 097e6ae3e..202f28aec 100644 --- a/src/com/engine/salary/service/EmployeeDeclareService.java +++ b/src/com/engine/salary/service/EmployeeDeclareService.java @@ -119,10 +119,8 @@ public interface EmployeeDeclareService{ * 鎵归噺缂栬緫 * * @param batchUpdateParam - * @param employeeId - * @param tenantKey */ -// void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam, Long employeeId); + void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam); /** * 鍒犻櫎 diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java index 3114d8ca7..3ae25647b 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java @@ -27,9 +27,11 @@ import com.engine.salary.entity.taxapiflow.bo.TaxApiFlowBO; import com.engine.salary.entity.taxapiflow.po.TaxDeclarationApiFlowRecordPO; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationApiConfigPO; import com.engine.salary.enums.SalaryCycleTypeEnum; +import com.engine.salary.enums.SalaryOnOffEnum; import com.engine.salary.enums.employeedeclare.CardTypeEnum; import com.engine.salary.enums.employeedeclare.DeclareStatusEnum; import com.engine.salary.enums.employeedeclare.EmploymentStatusEnum; +import com.engine.salary.enums.employeedeclare.EmploymentTypeEnum; import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.enums.taxagent.TaxAgentTaxReturnStatusEnum; @@ -54,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional; import weaver.general.Util; import weaver.hrm.User; +import java.time.LocalDate; import java.time.YearMonth; import java.time.temporal.ChronoUnit; import java.util.*; @@ -97,6 +100,10 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla return ServiceUtil.getService(EmployeeDeclareRecordServiceImpl.class, user); } + private TaxDeclarationApiBillingService getTaxDeclarationApiBillingService(User user) { + return ServiceUtil.getService(TaxDeclarationApiBillingServiceImpl.class, user); + } + @Override public EmployeeDeclarePO getById(Long id) { return getEmployeeDeclareMapper().getById(id); @@ -156,7 +163,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla // @Override // public List list4FailByParam(EmployeeDeclareFailListQueryParam queryParam) { // return new LambdaQueryChainWrapper<>(employeeDeclareMapper) -// .eq(EmployeeDeclarePO::getTenantKey, tenantKey) +// .eq(EmployeeDeclarePO::getTenantKey) // .eq(EmployeeDeclarePO::getDeleteType, DeleteTypeEnum.NOT_DELETED.getValue()) // .eq(EmployeeDeclarePO::getTaxAgentId, queryParam.getTaxAgentId()) // .eq(EmployeeDeclarePO::getTaxCycle, queryParam.getTaxCycle().toString()) @@ -257,109 +264,110 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla } } -// @Override -// public void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam, Long employeeId) { -// // 鏌ヨ鎶ラ佷汉鍛 -// List employeeDeclares; -// if (CollectionUtils.isNotEmpty(batchUpdateParam.getIds())) { -// employeeDeclares = listByIds(batchUpdateParam.getIds(), tenantKey); -// } else { -// employeeDeclares = listByParam(batchUpdateParam, tenantKey); -// } -// // 浜哄憳涓虹┖鏃讹紝涓嶅厑璁告壒閲忕紪杈 -// if (CollectionUtils.isEmpty(employeeDeclares)) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(182693, "褰撳墠浜哄憳鍒楄〃涓虹┖锛岃閫夋嫨瑕佹壒閲忕紪杈戠殑浜哄憳")); -// } -// LocalDateTime now = LocalDateTime.now(); -// // 鏍￠獙鍙傛暟 -// if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentStatus")) { -// EmploymentStatusEnum employmentStatusEnum = null; -// for (EmploymentStatusEnum value : EmploymentStatusEnum.values()) { -// if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { -// employmentStatusEnum = value; -// } -// } -// if (employmentStatusEnum == null) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); -// } -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// if (!Objects.equals(employeeDeclare.getEmploymentStatus(), employmentStatusEnum.getValue())) { -// employeeDeclare.setEmploymentStatus(employmentStatusEnum.getValue()); -// employeeDeclare.setNewEmployeeInfo(1); -// employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); -// employeeDeclare.setDeclareErrorMsg(""); -// employeeDeclare.setUpdateTime(now); -// } -// } -// } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentType")) { -// EmploymentTypeEnum employmentTypeEnum = null; -// for (EmploymentTypeEnum value : EmploymentTypeEnum.values()) { -// if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { -// employmentTypeEnum = value; -// } -// } -// if (employmentTypeEnum == null) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); -// } -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// if (!Objects.equals(employeeDeclare.getEmploymentType(), employmentTypeEnum.getValue())) { -// employeeDeclare.setEmploymentType(employmentTypeEnum.getValue()); -// employeeDeclare.setNewEmployeeInfo(1); -// employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); -// employeeDeclare.setDeclareErrorMsg(""); -// employeeDeclare.setUpdateTime(now); -// } -// } -// } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentDate")) { -// if (!SalaryDateUtil.checkDay(batchUpdateParam.getItemValue())) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); -// } -// LocalDate employmentDate = LocalDate.parse(batchUpdateParam.getItemValue()); -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// if (!Objects.equals(employeeDeclare.getEmploymentDate(), employmentDate)) { -// employeeDeclare.setEmploymentDate(employmentDate); -// employeeDeclare.setNewEmployeeInfo(1); -// employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); -// employeeDeclare.setDeclareErrorMsg(""); -// employeeDeclare.setUpdateTime(now); -// } -// } -// } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "dismissDate")) { -// if (!SalaryDateUtil.checkDay(batchUpdateParam.getItemValue())) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); -// } -// LocalDate dismissDate = LocalDate.parse(batchUpdateParam.getItemValue()); -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// if (!Objects.equals(employeeDeclare.getDismissDate(), dismissDate)) { -// employeeDeclare.setDismissDate(dismissDate); -// employeeDeclare.setNewEmployeeInfo(1); -// employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); -// employeeDeclare.setDeclareErrorMsg(""); -// employeeDeclare.setUpdateTime(now); -// } -// } -// } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "deductExpenses")) { -// SalaryOnOffEnum salaryOnOffEnum = null; -// for (SalaryOnOffEnum value : SalaryOnOffEnum.values()) { -// if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { -// salaryOnOffEnum = value; -// } -// } -// if (salaryOnOffEnum == null) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); -// } -// for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { -// if (!Objects.equals(employeeDeclare.getDeductExpenses(), salaryOnOffEnum.getValue())) { -// employeeDeclare.setDeductExpenses(salaryOnOffEnum.getValue()); -// employeeDeclare.setNewEmployeeInfo(1); -// employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); -// employeeDeclare.setDeclareErrorMsg(""); -// employeeDeclare.setUpdateTime(now); -// } -// } -// } + @Override + public void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam) { + // 鏌ヨ鎶ラ佷汉鍛 + List employeeDeclares; + if (CollectionUtils.isNotEmpty(batchUpdateParam.getIds())) { + employeeDeclares = listByIds(batchUpdateParam.getIds()); + } else { + employeeDeclares = listByParam(batchUpdateParam); + } + // 浜哄憳涓虹┖鏃讹紝涓嶅厑璁告壒閲忕紪杈 + if (CollectionUtils.isEmpty(employeeDeclares)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(182693, "褰撳墠浜哄憳鍒楄〃涓虹┖锛岃閫夋嫨瑕佹壒閲忕紪杈戠殑浜哄憳")); + } + Date now = new Date(); + // 鏍￠獙鍙傛暟 + if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentStatus")) { + EmploymentStatusEnum employmentStatusEnum = null; + for (EmploymentStatusEnum value : EmploymentStatusEnum.values()) { + if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { + employmentStatusEnum = value; + } + } + if (employmentStatusEnum == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); + } + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + if (!Objects.equals(employeeDeclare.getEmploymentStatus(), employmentStatusEnum.getValue())) { + employeeDeclare.setEmploymentStatus(employmentStatusEnum.getValue()); + employeeDeclare.setNewEmployeeInfo(1); + employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); + employeeDeclare.setDeclareErrorMsg(""); + employeeDeclare.setUpdateTime(now); + } + } + } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentType")) { + EmploymentTypeEnum employmentTypeEnum = null; + for (EmploymentTypeEnum value : EmploymentTypeEnum.values()) { + if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { + employmentTypeEnum = value; + } + } + if (employmentTypeEnum == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); + } + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + if (!Objects.equals(employeeDeclare.getEmploymentType(), employmentTypeEnum.getValue())) { + employeeDeclare.setEmploymentType(employmentTypeEnum.getValue()); + employeeDeclare.setNewEmployeeInfo(1); + employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); + employeeDeclare.setDeclareErrorMsg(""); + employeeDeclare.setUpdateTime(now); + } + } + } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "employmentDate")) { + if (!SalaryDateUtil.checkDay(batchUpdateParam.getItemValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); + } + Date employmentDate = SalaryDateUtil.localDateToDate(LocalDate.parse(batchUpdateParam.getItemValue())); + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + if (!Objects.equals(employeeDeclare.getEmploymentDate(), employmentDate)) { + employeeDeclare.setEmploymentDate(employmentDate); + employeeDeclare.setNewEmployeeInfo(1); + employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); + employeeDeclare.setDeclareErrorMsg(""); + employeeDeclare.setUpdateTime(now); + } + } + } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "dismissDate")) { + if (!SalaryDateUtil.checkDay(batchUpdateParam.getItemValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); + } + Date dismissDate = SalaryDateUtil.localDateToDate(LocalDate.parse(batchUpdateParam.getItemValue())); + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + if (!Objects.equals(employeeDeclare.getDismissDate(), dismissDate)) { + employeeDeclare.setDismissDate(dismissDate); + employeeDeclare.setNewEmployeeInfo(1); + employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); + employeeDeclare.setDeclareErrorMsg(""); + employeeDeclare.setUpdateTime(now); + } + } + } else if (Objects.equals(batchUpdateParam.getBatchUpdateItem(), "deductExpenses")) { + SalaryOnOffEnum salaryOnOffEnum = null; + for (SalaryOnOffEnum value : SalaryOnOffEnum.values()) { + if (Objects.equals(value.name(), batchUpdateParam.getItemValue())) { + salaryOnOffEnum = value; + } + } + if (salaryOnOffEnum == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "鍙傛暟閿欒")); + } + for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { + if (!Objects.equals(employeeDeclare.getDeductExpenses(), salaryOnOffEnum.getValue())) { + employeeDeclare.setDeductExpenses(salaryOnOffEnum.getValue()); + employeeDeclare.setNewEmployeeInfo(1); + employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); + employeeDeclare.setDeclareErrorMsg(""); + employeeDeclare.setUpdateTime(now); + } + } + } + employeeDeclares.forEach(getEmployeeDeclareMapper()::updateIgnoreNull); // updateBatchById(employeeDeclares); -// } + } @Override public void deleteByIds(Collection ids) { @@ -470,7 +478,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla .collect(Collectors.toSet()); // 鏌ヨ鏂板鍔犵殑浜哄憳淇℃伅 List employeeInfos = getSalaryEmployeeService(user).getEmployeeByIdsAll(new ArrayList<>(newOrgEmployeeIds)); -// List newSimpleUserInfos = salaryEmployeeService.listByEmployeeIds(newOrgEmployeeIds, tenantKey); +// List newSimpleUserInfos = salaryEmployeeService.listByEmployeeIds(newOrgEmployeeIds); // List newHrmEmployeeComInfos = comInfoCache.getCacheList(HrmEmployeeComInfo.class, Lists.newArrayList(newOrgEmployeeIds)); // 鏌ヨ鏈湀澧炲姞浜嗗摢浜涢潪绯荤粺浜哄憳 // List extEmployees = extEmployeeService.listBySalaryCycleAndTaxAgentId(salaryCycleRange, refreshParam.getTaxAgentId()); @@ -577,7 +585,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla // 鍒犻櫎鍘熸潵鐨勪汉鍛樻姤閫佽褰 getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId()); // 淇濆瓨鏂扮殑浜哄憳鎶ラ佽褰 - Date now =new Date(); + Date now = new Date(); AsyncRequestIdDTO asyncRequestIdDTO = declareEmployeeInfoResponse.getBody(); employeeDeclareRecord = new EmployeeDeclareRecordPO() .setId(IdGenerator.generate()) @@ -585,7 +593,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla .setTaxCycle(param.getTaxCycle().toString()) .setRequestId(asyncRequestIdDTO.getRequestId()) .setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .setCreator((long)user.getUID()) + .setCreator((long) user.getUID()) .setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()) .setCreateTime(now) .setUpdateTime(now); @@ -633,7 +641,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla + "-" + e.getOrDefault("zzlx", "") + "-" + e.getOrDefault("zzhm", "")); // 娴侀噺浣跨敤鎯呭喌 - TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper( SalaryDateUtil.localDateToDate(param.getTaxCycle().atDay(1)), apiConfig, EnumDeclareApiBusinessType.EMPLOYEE_DECLARATION); + TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper apiFlowUpdateWrapper = new TaxDeclarationApiBillingServiceImpl.ApiFlowUpdateWrapper(SalaryDateUtil.localDateToDate(param.getTaxCycle().atDay(1)), apiConfig, EnumDeclareApiBusinessType.EMPLOYEE_DECLARATION); // 鏌ヨ鐢虫姤鐨勪汉鍛樺垪琛 Date now = new Date(); List needUpdateEmployeeDeclares = Lists.newArrayList(); @@ -667,6 +675,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla // 鏇存柊鍛樺伐鐨勬姤閫佺姸鎬 if (CollectionUtils.isNotEmpty(needUpdateEmployeeDeclares)) { //todo + needUpdateEmployeeDeclares.forEach(getEmployeeDeclareMapper()::updateIgnoreNull); // updateBatchById(needUpdateEmployeeDeclares); } // 鍒犻櫎鍘熸潵鐨勪汉鍛樻姤閫佽褰 @@ -682,7 +691,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla // employeeDeclareLoggerTemplate.write(loggerContext); // 鏇存柊娴侀噺缁熻 //todo -// taxDeclarationApiBillingService.updateApiFlowInfo(apiFlowUpdateWrapper); + getTaxDeclarationApiBillingService(user).updateApiFlowInfo(apiFlowUpdateWrapper); // 鎶ラ佸け璐ョ殑 int declareFailSize = (int) needUpdateEmployeeDeclares.stream() .filter(e -> Objects.equals(e.getDeclareStatus(), DeclareStatusEnum.DECLARE_FAIL.getValue())) diff --git a/src/com/engine/salary/web/EmployeeDeclareController.java b/src/com/engine/salary/web/EmployeeDeclareController.java index aaaf3cae2..e8e62dcdc 100644 --- a/src/com/engine/salary/web/EmployeeDeclareController.java +++ b/src/com/engine/salary/web/EmployeeDeclareController.java @@ -4,6 +4,7 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.employeedeclare.dto.EmployeeDeclareFailListDTO; import com.engine.salary.entity.employeedeclare.dto.EmployeeDeclareInfoDTO; +import com.engine.salary.entity.employeedeclare.dto.EmployeeDeclareRateDTO; import com.engine.salary.entity.employeedeclare.dto.TaxAgentDeclareListDTO; import com.engine.salary.entity.employeedeclare.param.*; import com.engine.salary.util.ResponseResult; @@ -227,39 +228,39 @@ public class EmployeeDeclareController { @POST @Path("/getDeclareFeedback") @Produces(MediaType.APPLICATION_JSON) - public String getDeclareFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody EmployeeDeclareParam employeeDeclareParam) { + public String getDeclareFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareParam employeeDeclareParam) { User user = HrmUserVarify.getUser(request, response); return new ResponseResult(user).run(getEmployeeDeclareWrapper(user)::getDeclareFeedback, employeeDeclareParam); } -// /** -// * 浜哄憳鎶ラ-鍚庣涓氬姟閫昏緫鏄惁宸茬粡瀹屾垚 -// * -// * @param index 杩涘害绱㈠紩 -// * @return -// */ -// @GetMapping("/getRate") -// @ApiOperation("浜哄憳鎶ラ-鍚庣涓氬姟閫昏緫鏄惁宸茬粡瀹屾垚") -// @Produces(MediaType.APPLICATION_JSON) -// public WeaResult getRate(@RequestParam(value = "index") String index) { -// EmployeeDeclareRateDTO rate = employeeDeclareWrapper.getRate(index, TenantContext.getCurrentTenantKey()); -// return WeaResult.success(rate); -// } -// + /** + * 浜哄憳鎶ラ-鍚庣涓氬姟閫昏緫鏄惁宸茬粡瀹屾垚 + * + * @param index 杩涘害绱㈠紩 + * @return + */ + @GET + @Path("/getRate") + @Produces(MediaType.APPLICATION_JSON) + public String getRate(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "index") String index) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getEmployeeDeclareWrapper(user)::getRate, index); + } + // /** // * 浜哄憳鎶ラ-瀵煎嚭鍏ㄩ儴浜哄憳 // * // * @param queryParam 瀵煎嚭鍙傛暟 // * @return // */ +// @POST // @Path("/export") -// @ApiOperation("浜哄憳鎶ラ-瀵煎嚭鍏ㄩ儴浜哄憳") // @Produces(MediaType.APPLICATION_JSON) -// public WeaResult export(@RequestBody @Validated EmployeeDeclareListQueryParam queryParam) { +// public String export(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody EmployeeDeclareListQueryParam queryParam) { // Map exportMap = employeeDeclareWrapper.export(queryParam, UserContext.getCurrentUser()); // return WeaResult.success(exportMap); // } -// + // /** // * 浜哄憳鎶ラ-瀵煎嚭鏈湀鏂板浜哄憳 // * @@ -302,7 +303,7 @@ public class EmployeeDeclareController { // return WeaResult.success(exportMap); // } // -// @GetMapping("/getImportParam") +// @Path("/getImportParam") // @ApiOperation("浜哄憳鎶ラ-鑾峰彇瀵煎叆鍙傛暟") // @Produces(MediaType.APPLICATION_JSON) // public WeaResult getAcctResultImportParams() { diff --git a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java index 15438a9bf..eb956d57b 100644 --- a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java +++ b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java @@ -396,16 +396,14 @@ public class EmployeeDeclareWrapper extends Service { } -// /** -// * 鎵归噺缂栬緫 -// * -// * @param batchUpdateParam -// * @param employeeId -// * @param tenantKey -// */ -// public void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam, Long employeeId, String tenantKey) { -// getEmployeeDeclareService(user).batchUpdate(batchUpdateParam, employeeId, tenantKey); -// } + /** + * 鎵归噺缂栬緫 + * + * @param batchUpdateParam + */ + public void batchUpdate(EmployeeDeclareBatchUpdateParam batchUpdateParam) { + getEmployeeDeclareService(user).batchUpdate(batchUpdateParam); + } /** * 浜哄憳鎶ラ-鍒犻櫎 @@ -527,17 +525,16 @@ public class EmployeeDeclareWrapper extends Service { return employeeDeclareRate.getIndex(); } -// /** -// * 鑾峰彇浜哄憳鎶ラ佺浉鍏冲悗绔帴鍙ｆ槸鍚﹀凡缁忓畬鎴 -// * -// * @param index -// * @param tenantKey -// * @return -// */ -// public EmployeeDeclareRateDTO getRate(String index, String tenantKey) { -// return getSalaryCacheService(user).get(SalaryCacheKey.EMPLOYEE_DECLARE, index, EmployeeDeclareRateDTO.class); -// } -// + /** + * 鑾峰彇浜哄憳鎶ラ佺浉鍏冲悗绔帴鍙ｆ槸鍚﹀凡缁忓畬鎴 + * + * @param index + * @return + */ + public EmployeeDeclareRateDTO getRate(String index) { + return getSalaryCacheService(user).get(SalaryCacheKey.EMPLOYEE_DECLARE+ index); + } + // /** // * 浜哄憳鎶ラ-瀵煎嚭鏈湀鍏ㄩ儴鐨勪汉鍛 // *