tubn campaign execute update

src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java

@@ -632,6 +632,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                     ccr.setPreEndTime(ccResultRepository.getMaxCreateTime(dto.getCampaignId(), dto.getAgentId()));
                     ccr.setEndTime(dto.getEndTime());
                     ccr.setWaitTime(dto.getWaitTime());
+                    ccr.setCallId(dto.getCallId());
+                    ccr.setUpdateBy(userSession.getUserId());
+                    ccr.setUpdateTime(new Date());
                     ccr = ccResultRepository.save(ccr);
                     CampaignCustomer cc = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCustomerId(dto.getCampaignId(), dto.getCustomerId());
                     cc.setCallTime(dto.getStartCall());
@@ -642,10 +645,12 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                 }
 
                 if (dto.getEventCall().equalsIgnoreCase("endedBeforeTen")) {
+                    ccr = ccResultRepository.getOne(dto.getOldContactCustResultId());
                     ccr.setStatus((short) 0);
                     ccr.setUpdateBy(userSession.getUserId());
                     ccr.setUpdateTime(new Date());
-                    ccr = ccResultRepository.save(ccr);
+                    ccResultRepository.save(ccr);
+                    ccr = ccResultRepository.save(modelMapper.map(dto, ContactCustResult.class));
                 }
             }