Commit 05097a1d authored by hongguangwu's avatar hongguangwu

薪资特殊值,过滤劳务费、稿酬类型

parent 84dba00e
...@@ -332,12 +332,14 @@ public class SalaryAccountUtil implements Serializable { ...@@ -332,12 +332,14 @@ public class SalaryAccountUtil implements Serializable {
+ CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + relaySalary) != null) { + CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + relaySalary) != null) {
entity.setIsRepeat(CommonConstants.ONE_INT); entity.setIsRepeat(CommonConstants.ONE_INT);
} }
if (!CommonConstants.THREE_STRING.equals(salaryType) && !CommonConstants.FOUR_STRING.equals(salaryType)) {
relaySalarySum = BigDecimalUtils.safeAdd(relaySalary, specialMap.get(entity.getEmpIdcard())); relaySalarySum = BigDecimalUtils.safeAdd(relaySalary, specialMap.get(entity.getEmpIdcard()));
if (money3500.compareTo(relaySalarySum) == CommonConstants.ZERO_INT if (money3500.compareTo(relaySalarySum) == CommonConstants.ZERO_INT
|| money5000.compareTo(relaySalarySum) == CommonConstants.ZERO_INT) { || money5000.compareTo(relaySalarySum) == CommonConstants.ZERO_INT) {
entity.setHaveSpecialFlag(CommonConstants.ONE_INT); entity.setHaveSpecialFlag(CommonConstants.ONE_INT);
} }
} }
}
if (actualSalarySum != null) { if (actualSalarySum != null) {
actualSalarySum = actualSalarySum.setScale(2, BigDecimal.ROUND_HALF_UP); actualSalarySum = actualSalarySum.setScale(2, BigDecimal.ROUND_HALF_UP);
if (!checkMap.isEmpty() && checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth()) if (!checkMap.isEmpty() && checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth())
......
...@@ -269,6 +269,7 @@ ...@@ -269,6 +269,7 @@
left join t_salary_standard s on a.SALARY_FORM_ID = s.id left join t_salary_standard s on a.SALARY_FORM_ID = s.id
left join t_salary_account_item relaySalary on relaySalary.SALARY_ACCOUNT_ID = a.id and relaySalary.JAVA_FIED_NAME='relaySalary' left join t_salary_account_item relaySalary on relaySalary.SALARY_ACCOUNT_ID = a.id and relaySalary.JAVA_FIED_NAME='relaySalary'
where a.DELETE_FLAG = 0 and s.UNIT_ID = #{unitId} and a.SALARY_MONTH = #{salaryMonth} and a.INVOICE_TITLE = #{invoiceTitle} where a.DELETE_FLAG = 0 and s.UNIT_ID = #{unitId} and a.SALARY_MONTH = #{salaryMonth} and a.INVOICE_TITLE = #{invoiceTitle}
and a.FORM_TYPE !='3' and a.FORM_TYPE !='4'
group by a.EMP_IDCARD group by a.EMP_IDCARD
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment