diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 224bf7aaf..76646f636 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -88,6 +88,7 @@ jobcall, jobcall_id, status, + mark_items, account_type) VALUES @@ -113,6 +114,7 @@ #{emp.jobcall}, #{emp.jobcallId}, #{emp.status}, + #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler}, #{emp.accountType} ) @@ -130,6 +132,7 @@ jobcall, jobcall_id, status, + mark_items, account_type ) @@ -155,6 +158,7 @@ #{emp.jobcall,jdbcType=VARCHAR}, #{emp.jobcallId,jdbcType=DOUBLE}, #{emp.status,jdbcType=VARCHAR}, + #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler}, #{emp.accountType,jdbcType=INTEGER} from dual @@ -173,6 +177,7 @@ jobcall, jobcall_id, status, + mark_items, account_type ) VALUES @@ -198,6 +203,7 @@ #{emp.jobcall}, #{emp.jobcallId}, #{emp.status}, + #{emp.markItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler}, #{emp.accountType} ) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index b0f0d6c46..1df93d2d1 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1068,7 +1068,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe markItemIds.removeIf(salaryItemId::equals); } - salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(markItemIds))); + salaryAcctEmployeePO.setMarkItems(Lists.newArrayList(new HashSet(markItemIds))); getSalaryAcctEmployeeService(user).mark(salaryAcctEmployeePO); }