diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
index 1cf2506..e6e8196 100644
--- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
+++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
@@ -112,9 +112,9 @@ public class QuestionnaireService implements IQuestionnaireService{
@Override
public void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId) throws Exception {
//redis判断是否已有
- Object o = redisUtil.get(String.valueOf(param.getDetailId() + userId));
+ Object o = redisUtil.get(param.getDetailId() + "" + userId);
if (ObjectUtil.isNull(o)) {
- redisUtil.set(String.valueOf(param.getDetailId() + userId),userId);
+ redisUtil.set(param.getDetailId() + "" + userId,userId);
//查询是否已经提交,已提交不能保存修改
QuestionnaireDetail questionnaireDetail = questionnaireDetailDao.selectByPrimaryKey(param.getDetailId());
if (Constant.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) {
@@ -135,7 +135,7 @@ public class QuestionnaireService implements IQuestionnaireService{
record.setAnswer(param.getAnswer());
recordDao.insertSelective(record);
}
- redisUtil.del(String.valueOf(param.getDetailId()+userId));
+ redisUtil.del(param.getDetailId() + "" + userId);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5abf242..c3b11fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
- active: prod
- include: common, util-prod
+ active: test
+ include: common, util-test
diff --git a/src/main/resources/mapper_dao/DataStatisticsDao.xml b/src/main/resources/mapper_dao/DataStatisticsDao.xml
index f7dec19..798f563 100644
--- a/src/main/resources/mapper_dao/DataStatisticsDao.xml
+++ b/src/main/resources/mapper_dao/DataStatisticsDao.xml
@@ -276,16 +276,18 @@
FROM
(
SELECT
+
SUBSTRING_INDEX(area.answer,',',1) AS area,
+
LEFT(`level`.answer,1) AS level,
SUM( actual.answer ) AS `value40`
FROM
t_qcp_questionnaire_record AS actual
LEFT JOIN t_qcp_questionnaire_detail AS qd ON actual.questionnaire_detail_id = qd.id
LEFT JOIN t_qcp_questionnaire_record AS `level` ON `level`.questionnaire_detail_id = qd.id
-
+
LEFT JOIN t_qcp_questionnaire_record AS area ON area.questionnaire_detail_id = qd.id
-
+
WHERE
actual.rec_status = 0
AND qd.rec_status = 0
@@ -318,9 +320,9 @@
t_qcp_questionnaire_record AS actual
LEFT JOIN t_qcp_questionnaire_detail AS qd ON actual.questionnaire_detail_id = qd.id
LEFT JOIN t_qcp_questionnaire_record AS `level` ON `level`.questionnaire_detail_id = qd.id
-
+
LEFT JOIN t_qcp_questionnaire_record AS area ON area.questionnaire_detail_id = qd.id
-
+
WHERE
actual.rec_status = 0
AND qd.rec_status = 0
@@ -352,9 +354,9 @@
t_qcp_questionnaire_record AS actual
LEFT JOIN t_qcp_questionnaire_detail AS qd ON actual.questionnaire_detail_id = qd.id
LEFT JOIN t_qcp_questionnaire_record AS `level` ON `level`.questionnaire_detail_id = qd.id
-
+
LEFT JOIN t_qcp_questionnaire_record AS area ON area.questionnaire_detail_id = qd.id
-
+
WHERE
actual.rec_status = 0
AND qd.rec_status = 0