Commit ed185597 authored by Vijay Chaitanya's avatar Vijay Chaitanya Committed by rbonthala-nisum-com

Mt 98 domain changes (#65)

* update code changes

* changes done for saving with Id and Name

* changes done for response for UI

* MT-79 code fix

* changes for defect fixing
parent cd48f6c9
......@@ -16,7 +16,7 @@ import org.springframework.util.StringUtils;
import com.mongodb.WriteResult;
import com.nisum.mytime.exception.handler.MyTimeException;
import com.nisum.mytime.model.AccountInfo;
import com.nisum.mytime.model.Account;
import com.nisum.mytime.model.Domains;
import com.nisum.mytime.model.EmployeeRoles;
import com.nisum.mytime.repository.DomainRepo;
......@@ -89,7 +89,7 @@ public class DomainServiceImpl implements DomainService {
domainMap.put(MyTimeUtils.ACCOUNT_ID, domain.getAccountId());
Query accountInfoQuery = new Query(Criteria.where(MyTimeUtils.ACCOUNT_ID).in(domain.getAccountId()));
List<AccountInfo> accountList = mongoTemplate.find(accountInfoQuery, AccountInfo.class);
List<Account> accountList = mongoTemplate.find(accountInfoQuery, Account.class);
if(accountList!=null)
domainMap.put(MyTimeUtils.ACCOUNT_NAME, accountList.get(0).getAccountName());
......
......@@ -254,7 +254,7 @@ public class ProjectServiceImpl implements ProjectService {
billings.setActive(true);
billings.setBillingStartDate(pT.getStartDate() == null
? DateUtils.truncate(new Date(), Calendar.DATE)
: DateUtils.truncate(pT.getNewBillingStartDate(), Calendar.DATE));
: DateUtils.truncate(pT.getStartDate(), Calendar.DATE));
if (pT.getEndDate() != null) {
billings.setBillingEndDate(
DateUtils.truncate(pT.getEndDate(), Calendar.DATE));
......
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