qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into fix/230702-福利档案-不显示合同到期日期

This commit is contained in:
sy 2023-07-31 16:46:55 +08:00
parent ea4b603c36 ed99e186e1
commit 61b35eda1f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
View File

@ -743,7 +743,7 @@
<!-- 更新不为NULL的字段 -->
<update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryitem.po.SalaryItemPO">
<update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
UPDATE hrsa_salary_send_info
<set>
<if test="salarySendId != null">
@ -752,9 +752,6 @@
<if test="salaryMonth != null">
salary_month=#{salaryMonth},
</if>
<if test="useType != null">
use_type=#{useType},
</if>
<if test="salaryAcctRecordId != null">
salary_acct_record_id=#{salaryAcctRecordId},
</if>

2
src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
View File

@ -138,6 +138,8 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
param.setFormula(param.getFormula().replaceAll("ＥＸＩＳＴＳ", "EXISTS"));
param.setFormula(param.getFormula().replaceAll("ｂｅｔｗｅｅｎ", "between"));
param.setFormula(param.getFormula().replaceAll("ＢＥＴＷＥＥＮ", "BETWEEN"));
param.setFormula(param.getFormula().replaceAll("ｕｎｉｏｎ", "union"));
param.setFormula(param.getFormula().replaceAll("ＵＮＩＯＮ", "UNION"));
// 解析公式中的参数
if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) {