Merge remote-tracking branch 'origin/Phase3' into Phase3

wayne

2022-03-01 68343c0e409d7f02f29c5a832a6a1e24e9690f06

Merge remote-tracking branch 'origin/Phase3' into Phase3

 PAMapp/pages/questionnaire/_agentNo.vue

@@ -336,7 +336,6 @@
    private setMyRequest(): void {
      const storageMyRequest = getRequestsFromStorage();
      const storageMyRequirement = this.recommendConsultantItem ? JSON.parse(this.recommendConsultantItem).requirements:[];
      const contactTypePromise = accountSettingService.getUserAccountSetting();

      if (storageMyRequest) {
        this.myRequest = {
@@ -358,12 +357,15 @@
        removeRequestQuestionFromStorage();
      }

      contactTypePromise.then((contactTypeDetail) => {
            this.myRequest = {
              ...this.myRequest,
              ...contactTypeDetail
            }
      })
      if (authService.isUserLogin()) {
        accountSettingService.getUserAccountSetting().then((contactTypeDetail) => {
              this.myRequest = {
                ...this.myRequest,
                ...contactTypeDetail
              }
        })
      }


    }


 PAMapp/shared/const/quickFilter-questionList.ts

@@ -12,12 +12,12 @@
        ],
        type: 'radio'
    },
    {
        name: 'avgScore',
        title: '顧問滿意度',
        detail: [],
        type: ''
    },
    // {
    //     name: 'avgScore',
    //     title: '顧問滿意度',
    //     detail: [],
    //     type: ''
    // },
    {
        name: 'communicationStyles',
        title: '溝通風格',

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

@@ -127,7 +127,6 @@
        log.info("Sending appointment expiring notify to customer finish");
    }

    // todo 需確認該時間, otis todo=134497
    @Scheduled(cron = "0 30 8 * * *")
    public void sendNotFillAppointmentSatisfactionToPersonalNotification() {
        Map<Long, List<Satisfaction>> customerNotFillSatisfactions =