diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index 56096503d..e6a82d22a 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -26,6 +26,7 @@ import com.engine.salary.enums.push.PushItemFieldEnum; import com.engine.salary.enums.push.PushRecordStatusEnum; import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.push.PushRecordMapper; import com.engine.salary.mapper.push.PushSettingItemMapper; import com.engine.salary.mapper.push.PushSettingMapper; import com.engine.salary.service.*; @@ -37,6 +38,7 @@ import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import weaver.conn.RecordSet; import weaver.formmode.setup.ModeRightInfo; import weaver.general.TimeUtil; @@ -64,6 +66,10 @@ public class PushServiceImpl extends Service implements PushService { return MapperProxyFactory.getProxy(PushSettingItemMapper.class); } + private PushRecordMapper getPushRecordMapper() { + return MapperProxyFactory.getProxy(PushRecordMapper.class); + } + private SalaryEmployeeService getSalaryEmployeeService(User user) { return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } @@ -352,21 +358,23 @@ public class PushServiceImpl extends Service implements PushService { } List pushSettingPOS = getPushSettingMapper().listSome(PushSettingPO.builder().able(1).build()); - pushSettingPOS.stream() + Date now = new Date(); + List pushRecordPOList = pushSettingPOS.stream() .filter(po -> po.getSalarySobIds().contains(salaryAcctRecordPO.getSalarySobId())) - .map(po -> PushRecordPO.builder() - .id(IdGenerator.generate()) - .name(po.getName()) - .settingId() - .acctRecordId(salaryAcctRecordId) - .status(PushRecordStatusEnum.Waiting.getValue())) - - - - - - .build(); - + .map(po -> PushRecordPO.builder() + .id(IdGenerator.generate()) + .name(po.getName()) + .settingId(po.getId()) + .acctRecordId(salaryAcctRecordId) + .status(PushRecordStatusEnum.Waiting.getValue()) + .createTime(now) + .updateTime(now) + .creator((long) user.getUID()) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build() + ) + .collect(Collectors.toList()); }