From add7051759ca6d47d46bbc7caccf7f9e8ea8aeba Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 4 Apr 2023 16:28:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F,=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E9=87=91=E4=BB=93-=E4=B8=AA=E7=A8=8E?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E5=8D=95=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E8=96=AA=E8=B5=84=E9=83=A8=E5=88=86=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?initserviceimpl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxdeclaration/bo/TaxDeclarationBO.java | 1 + .../salarybill/SalarySendRangeObjMapper.xml | 2 +- .../sys/service/impl/InitServiceImpl.java | 76 ------------------- 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 src/com/engine/salary/sys/service/impl/InitServiceImpl.java diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 6d936a232..906cd9e4f 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -715,6 +715,7 @@ public class TaxDeclarationBO { private static String findStringValue(String fieldCode, Map> resultMap, Map salaryItemMap) { return resultMap.getOrDefault(salaryItemMap.getOrDefault(fieldCode, 0L), Collections.emptyList()).stream() + .filter(f -> StringUtils.isNotBlank(f.getResultValue())) .map(SalaryAcctResultPO::getResultValue) .findFirst().orElse(""); } diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml index 680991a2a..68737ab47 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml @@ -310,7 +310,7 @@ insert into hrsa_salary_send_range_obj (salary_send_id, salary_send_range_id, range_type, target_type, target_id, creator, create_time, update_time, delete_type, tenant_key) - + select #{item.salarySendId,jdbcType=BIGINT}, #{item.salarySendRangeId,jdbcType=BIGINT}, #{item.rangeType,jdbcType=INTEGER}, #{item.targetType,jdbcType=INTEGER}, #{item.targetId,jdbcType=BIGINT}, diff --git a/src/com/engine/salary/sys/service/impl/InitServiceImpl.java b/src/com/engine/salary/sys/service/impl/InitServiceImpl.java deleted file mode 100644 index 45e309539..000000000 --- a/src/com/engine/salary/sys/service/impl/InitServiceImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.engine.salary.sys.service.impl; - -import com.api.formmode.mybatis.util.SqlProxyHandle; -import com.engine.salary.mapper.sys.SalarySysConfMapper; -import com.engine.salary.sys.entity.po.SalarySysConfPO; -import com.weaverboot.frame.ioc.anno.classAnno.WeaSysInitComponent; -import com.weaverboot.frame.ioc.anno.methodAnno.WeaSysInit; -import dm.jdbc.util.IdGenerator; -import org.apache.commons.lang3.StringUtils; -import weaver.general.BaseBean; - -import java.util.Date; - -@WeaSysInitComponent("initSalary") -public class InitServiceImpl { - - private SalarySysConfMapper getSalarySysConfMapper() { - return SqlProxyHandle.getProxy(SalarySysConfMapper.class); - } - - BaseBean baseBean = new BaseBean(); - - @WeaSysInit(order = 1, description = "升级薪酬非标版本") - public void init() { - String version = baseBean.getPropValue("hrmSalary", "version"); - Date date = new Date(); - - //升级版本号 - //当前版本 - SalarySysConfPO currentVersion = getSalarySysConfMapper().getOneByCode("currentVersion"); - //前一个版本 - int orderWeight = getSalarySysConfMapper().countByCode("previousVersion"); - if (currentVersion == null) { - //初始化版本 - SalarySysConfPO current = SalarySysConfPO.builder() - .id(IdGenerator.generate()) - .confKey("currentVersion") - .confValue(version) - .title("当前版本") - .module("basic") - .orderWeight(0) - .createTime(date) - .updateTime(date) - .deleteType(0).build(); - getSalarySysConfMapper().insertIgnoreNull(current); - } else { - //版本不一样 - if (!StringUtils.equals(version, currentVersion.getConfValue())) { - //生成历史版本记录 - SalarySysConfPO previous = SalarySysConfPO.builder() - .id(IdGenerator.generate()) - .confKey("previousVersion") - .confValue(currentVersion.getConfValue()) - .title("上一个版本") - .module("basic") - .orderWeight(orderWeight) - .createTime(date) - .updateTime(date) - .deleteType(0) - .build(); - getSalarySysConfMapper().insertIgnoreNull(previous); - - //更新当前版本 - currentVersion.setConfValue(version); - currentVersion.setUpdateTime(date); - getSalarySysConfMapper().updateIgnoreNull(currentVersion); - } - } - } - - @WeaSysInit(order = 2, description = "处理薪资档案历史数据") - public void handleSalaryArchiveHistoryData() { -// new SalaryArchiveServiceImpl().handleHistory(1L); - } - -}