Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3

Jack

2022-01-24 f8ab133a7dc20562c25a092a402266f5e7b0b296

 pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java

@@ -20,22 +20,22 @@
@Service
@Transactional
public class PersonalNotificationService {
	

   @Autowired
   PersonalNotificationRepository personalNotificationRepository;
	

   @Autowired
   ConsultantService consultantService;
	

   @Autowired
   AppointmentService appointmentService;
	

   @Autowired
   CustomerService customerService;
	

   @Autowired
   CustomerRepository customerRepository;
	

   @Autowired
   SatisfactionService satisfactionService;

@@ -68,6 +68,18 @@
      personalNotificationRepository.save(entity);
   }

    public void createNotFillSatisfactionSumToCustomer(Long customerId, int notFillSatisfactionSum) {
        PersonalNotification entity = new PersonalNotification();

        String content = "您有 "+notFillSatisfactionSum+" 筆顧問的滿意度需要填寫";
        entity.setContent(content);
        entity.setNotificationType(NotificationTypeEnum.ACTIVITY);
        entity.setOwnerId(customerId);
        entity.setOwnerRole(PersonalNotificationRoleEnum.CUSTOMER);
        entity.setTitle("客戶滿意度");
        personalNotificationRepository.save(entity);
    }

   public void createEditConsultantToConsultant(Consultant consultant) {
      PersonalNotification entity = new PersonalNotification();
      String content = "您的個人帳號設定已進行更新";