Browse Source

修改个人版导出问题

master-admin
ccsens_zhengzhichuan 1 week ago
parent
commit
7aa5d113f9
  1. 6
      ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
  2. 2
      ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

6
ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@ -617,7 +617,7 @@ public class AmsReportServiceImpl implements AmsReportService {
RmsDto.QueryDetail queryDetail = new RmsDto.QueryDetail();
queryDetail.setEvaluationId(dto.getEvaluationId());
RmsVo.ReportDetail detail = rmsService.queryReportDetail(queryDetail);
RmsVo.ReportDetail detail = rmsService.queryReport(queryDetail);
if (detail == null) {
return null;
}
@ -1234,7 +1234,7 @@ public class AmsReportServiceImpl implements AmsReportService {
RmsDto.QueryDetail queryDetail = new RmsDto.QueryDetail();
queryDetail.setEvaluationId(dto.getEvaluationId());
RmsVo.ReportDetail detail = rmsService.queryReportDetail(queryDetail);
RmsVo.ReportDetail detail = rmsService.queryReport(queryDetail);
//查询测评量表
List<RmsVo.ReportScore> scores = rmsDao.queryEmsScaleScore(dto.getEvaluationId(), CollectionUtil.newArrayList());
if (CollUtil.isNotEmpty(scores)) {
@ -1440,7 +1440,7 @@ public class AmsReportServiceImpl implements AmsReportService {
RmsDto.QueryDetail queryDetail = new RmsDto.QueryDetail();
queryDetail.setEvaluationId(dto.getEvaluationId());
RmsVo.ReportDetail detail = rmsService.queryReportDetail(queryDetail);
RmsVo.ReportDetail detail = rmsService.queryReport(queryDetail);
if (detail == null) {
return null;
}

2
ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

@ -11,7 +11,7 @@ spring:
# password: po3OynBO[M3579p6L7)o
url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
password: q7510327
# 从库数据源
slave:
# 从数据源开关/默认关闭

Loading…
Cancel
Save