|
|
@@ -44,7 +44,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
example.createCriteria().andAccountIdEqualTo(planAccount.getAccountId())
|
|
|
.andPlanIdEqualTo(planAccount.getPlanId())
|
|
|
- .andCreateTimeGreaterThan(DateUtil.getThatDayDate());
|
|
|
+ .andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate());
|
|
|
List<PlanAccount> planAccounts = planAccountMapper.selectByExample(example);
|
|
|
if (CollectionUtils.isEmpty(planAccounts)) {
|
|
|
planAccountMapper.insertSelective(planAccount);
|
|
|
@@ -63,7 +63,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
example.createCriteria().andAccountIdEqualTo(planAccount.getAccountId())
|
|
|
.andPlanIdEqualTo(planAccount.getPlanId())
|
|
|
- .andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ .andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andStatusEqualTo(0)
|
|
|
.andIsDeleteEqualTo(0)
|
|
|
.andPublishOpenFlagEqualTo(1);
|
|
|
@@ -99,20 +99,20 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
public List<PlanAccount> getPlanAccountByPlanId(String planId) {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
example.createCriteria().andPlanIdEqualTo(planId)
|
|
|
- .andCreateTimeGreaterThan(DateUtil.getThatDayDate());
|
|
|
+ .andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate());
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
}
|
|
|
|
|
|
public List<PlanAccount> getMatchPlanAccount() {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andMatchStatusEqualTo(0).andIsDeleteEqualTo(0);
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
}
|
|
|
|
|
|
public List<PlanAccount> getSendNormalPlanAccount() {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andStatusEqualTo(0).andIsDeleteEqualTo(0).andPublishOpenFlagEqualTo(1)
|
|
|
.andSpecialNotSendEqualTo(SpecialNotSendEnum.SEND.getStatusCode());
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
@@ -120,7 +120,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
|
|
|
public List<PlanAccount> getNormalPlanAccount(String accountId) {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andAccountIdEqualTo(accountId)
|
|
|
.andIsDeleteEqualTo(0).andPublishOpenFlagEqualTo(1);
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
@@ -129,7 +129,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
@Override
|
|
|
public List<PlanAccount> getSpecialPlanAccount(String accountId) {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andAccountIdEqualTo(accountId)
|
|
|
.andIsSpecialSettingEqualTo(1);
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
@@ -137,7 +137,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
|
|
|
public List<PlanAccount> getPlanAccount(String planId, String accountId) {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andPlanIdEqualTo(planId)
|
|
|
.andAccountIdEqualTo(accountId);
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
@@ -160,7 +160,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
planMapper.updateByExampleSelective(updatePlan, planExample);
|
|
|
|
|
|
PlanAccountExample planAccountExample = new PlanAccountExample();
|
|
|
- planAccountExample.createCriteria().andPlanIdEqualTo(planId).andCreateTimeGreaterThan(DateUtil.getThatDayDate());
|
|
|
+ planAccountExample.createCriteria().andPlanIdEqualTo(planId).andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate());
|
|
|
PlanAccount updatePlanAccount = new PlanAccount();
|
|
|
updatePlanAccount.setIsDelete(1);
|
|
|
planAccountMapper.updateByExampleSelective(updatePlanAccount, planAccountExample);
|
|
|
@@ -172,7 +172,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
planAccountExample.createCriteria()
|
|
|
.andAccountIdEqualTo(accountId)
|
|
|
.andPlanIdEqualTo(planId).
|
|
|
- andCreateTimeGreaterThan(DateUtil.getThatDayDate());
|
|
|
+ andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate());
|
|
|
PlanAccount updatePlanAccount = new PlanAccount();
|
|
|
updatePlanAccount.setIsDelete(1);
|
|
|
planAccountMapper.updateByExampleSelective(updatePlanAccount, planAccountExample);
|
|
|
@@ -208,7 +208,7 @@ public class PlanAccountServiceImpl implements PlanAccountService {
|
|
|
|
|
|
public List<PlanAccount> getPlanAccount(String accountId) {
|
|
|
PlanAccountExample example = new PlanAccountExample();
|
|
|
- example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate())
|
|
|
+ example.createCriteria().andCreateTimeGreaterThanOrEqualTo(DateUtil.getThatDayDate())
|
|
|
.andAccountIdEqualTo(accountId);
|
|
|
return planAccountMapper.selectByExample(example);
|
|
|
}
|