diff --git a/src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java b/src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java index e0e2cd4..614bee9 100644 --- a/src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java +++ b/src/main/java/com/project/appeal/domain/service/Impl/SaveAppealDomainServiceImpl.java @@ -92,11 +92,13 @@ public class SaveAppealDomainServiceImpl implements SaveAppealDomainService { appealDTO.setQuestionContent(questionSnapshotDTO.getQuestionContent()); appealDTO.setQuestionSort(index + 1); + + if (appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue())) { //更新申诉状态 examRecordMapper.updateHasAppealed(index, examRecordDTO.getId()); return Result.success(appealDTO); - }else if(appealDTO.getStatus().equals(AppealStatusEnum.PASS_REVIEW.getValue())){ + }else if(appealDTO.getStatus().equals(AppealStatusEnum.PASS_REVIEW.getValue()) && !questionSnapshotDTO.getIsRight()){ //审批通过需要加分 calculateScore(appealDTO, examRecordDTO, questionSnapshotDTO.getType()); } diff --git a/src/main/java/com/project/ding/utils/DingUtil.java b/src/main/java/com/project/ding/utils/DingUtil.java index 90fa7d2..9843ac9 100644 --- a/src/main/java/com/project/ding/utils/DingUtil.java +++ b/src/main/java/com/project/ding/utils/DingUtil.java @@ -60,8 +60,8 @@ public class DingUtil { @Value("${ding.corpId}") private String corpId; - @Value("${server.host}") - private String host; + @Value("${ding.noticeUrlPrefix}") + private String noticeUrlPrefix; private static final String TICKET_KEY = "dingtalk:jsapi_ticket"; @@ -279,9 +279,9 @@ public class DingUtil { .append(String.format("处理理由:%s" , appealDTO.getReason())); StringBuilder url = new StringBuilder(); - url.append(String.format("http://%s/examResult/?" + + url.append(String.format("%s/examResult/?" + "dd_nav_translucent=true&dd_full_screen=true&dd_nav_bgcolor=33E0EEFF" + - "&corpid=%s&id=%d&index=%d",host,corpId,appealDTO.getId(),appealDTO.getQuestionSort())); + "&corpid=%s&id=%d&index=%d",noticeUrlPrefix,corpId,appealDTO.getId(),appealDTO.getQuestionSort())); //发送工作通知 DtCorpConversationMessage corpConversationMessage = DtCorpConversationMessage.builder() diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 1f28312..ced36c7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,5 @@ server: port: 7088 - host: 172.16.204.50 spring: datasource: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index c798768..32e3043 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,5 @@ server: port: 7088 - host: 8.129.84.155 spring: datasource: @@ -70,7 +69,7 @@ ding: appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK agentId: 4283077101 corpId: ding13d71da66ad91ff0f5bf40eda33b7ba0 - noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator-test/ + noticeUrlPrefix: https://107pm707566hq.vicp.fun/ai-evaluator-test algo: clusterUrl: /algo/semantic-cluster baseUrl: https://107pm707566hq.vicp.fun