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

调整sql配置

This commit is contained in:
钱涛 2022-07-25 15:01:10 +08:00
parent 9602ed1d87
commit db31190b9e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/sql/档案支持一对多.sql
View File

@ -1,5 +1,5 @@
ALTER TABLE hrsa_salary_archive
ADD COLUMN tax_agent_id bigint(0) NULL COMMENT '个税扣缴义务人id'
ADD COLUMN tax_agent_id bigint(0) NULL COMMENT '个税扣缴义务人id',
ADD COLUMN pay_start_date datetime(0) NULL DEFAULT NULL COMMENT '起始发薪日期' ,
ADD COLUMN pay_end_date datetime(0) NULL DEFAULT NULL COMMENT '最后发薪日期' ;

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

@ -153,9 +153,7 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
}
//试运行公式
if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) {
checkRun(param);
}
checkRun(param);
FormulaPO formulaPO = new FormulaPO();
String formula = param.getFormula();
@ -242,6 +240,12 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
}
}
}
if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.SQL) {
if (formulaRunScript.contains(";") || formulaRunScript.contains("--")) {
throw new SalaryRunTimeException("SQL配置异常,请去除';'或者'--'");
}
}
}