diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 61a7def..7fd73c5 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -88,15 +88,15 @@ public class MsgApi { String msgToken = getMsgToken(); // 封装发送消息的参数 NutMap map = createMessageMap(channels, sublist, mtype, title, content, imageUrl, link); - System.out.println(map); + log.info("短信发送内容:{}", map); // 发送请求 JSONObject jsonObject = sendRequest(msgToken, map); // 判断发送结果 int status = jsonObject.getInteger("code"); if (status == 200) { - log.info("=================================================================================================发送成功: {}", jsonObject.toJSONString()); + log.info("==================================================发送成功: {}", jsonObject.toJSONString()); } else { - log.error("=================================================================================================发送失败: {}", jsonObject.toJSONString()); + log.error("==================================================发送失败: {}", jsonObject.toJSONString()); throw new RuntimeException("Message sending failed with status code: " + status + ", Message: " + jsonObject.getString("message")); } } @@ -144,15 +144,15 @@ public class MsgApi { String msgToken = getMsgToken(); // 封装发送消息的参数 NutMap map = createMessageMap(channels, sublist, mtype, title, content, imageUrl, link); - System.out.println(map); + log.info("短信发送内容:{}", map); // 发送请求 JSONObject jsonObject = sendRequest(msgToken, map); // 判断发送结果 int status = jsonObject.getInteger("code"); if (status == 200) { - log.info("=================================================================================================发送成功: {}", jsonObject.toJSONString()); + log.info("==================================================发送成功: {}", jsonObject.toJSONString()); } else { - log.error("=================================================================================================发送失败: {}", jsonObject.toJSONString()); + log.error("==================================================发送失败: {}", jsonObject.toJSONString()); throw new RuntimeException("Message sending failed with status code: " + status + ", Message: " + jsonObject.getString("message")); } } diff --git a/src/main/java/io/v/nutz/zhgh/qsv/service/impl/QsvSurveyServiceImpl.java b/src/main/java/io/v/nutz/zhgh/qsv/service/impl/QsvSurveyServiceImpl.java index 891c70c..c335559 100644 --- a/src/main/java/io/v/nutz/zhgh/qsv/service/impl/QsvSurveyServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/qsv/service/impl/QsvSurveyServiceImpl.java @@ -223,7 +223,7 @@ public class QsvSurveyServiceImpl extends BaseServiceImpl i // List answerExtList = answerRecords.stream().map(QsvUserAnswerRecord::getExtJson).toList(); // 查询活动题目列表 - List subjects = dao().query(QsvSubject.class, Cnd.where("activityId", "=", activityId)); + List subjects = dao().query(QsvSubject.class, Cnd.where("activityId", "=", activityId).asc("sortNum")); // 将题目列表转换为Map Map subjectMap = subjects.stream().collect(Collectors.toMap(QsvSubject::getId, v -> v)); // 获取题目ID列表 diff --git a/src/main/resources/views/mobile/qsv/survey/index.html b/src/main/resources/views/mobile/qsv/survey/index.html index 5b7c426..fb56d70 100644 --- a/src/main/resources/views/mobile/qsv/survey/index.html +++ b/src/main/resources/views/mobile/qsv/survey/index.html @@ -298,10 +298,17 @@ layout("/mobile/platform.html"){ return } } else if ("text" === subject.type) { - if (!subject.userFillContent) { - this.$toast.fail("第" + (i + 1) + "题未作答") - return + if(this.id==="726629ca0d074569bb1142353c5b932f"){ + if([2,4,6,7,9].includes(i + 1)){ + + } + }else{ + if (!subject.userFillContent) { + this.$toast.fail("第" + (i + 1) + "题未作答") + return + } } + } } this.autoSubmit()