新增问题校验；模板优化

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleQuestionMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface SysScaleQuestionMapper extends BaseMapperPlus<SysScaleQuestion, SysScaleQuestionVo> {
 
     List<SysScaleFactorVo> selectFactorListById(Long scaleId);
+
+    int countQuestionNumByScaleId(Long scaleId);
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -115,7 +116,10 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
         Long scaleId = bo.getScaleId();
         SysScale sysScale = scaleMapper.selectById(scaleId);
         Integer questionsNum = sysScale.getQuestionsNum();
-
+        int count = baseMapper.countQuestionNumByScaleId(scaleId);
+        if (count >= questionsNum - 1) {
+            throw new ServiceException("问题数量超过量表的限定数量，请确认后提交");
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setQuestionId(add.getQuestionId());

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java

@@ -294,7 +294,6 @@ public class WebServiceImpl implements IWebService {
                                 evalConclusion.setFactorRangeId(range.getRangeId());
                                 evalConclusion.setSituation(range.getSituation());
                                 evalConclusion.setSituationName(SituationEnum.getNameByCode(range.getSituation()));
-
                                 break;
                             }
                         } //else {

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleQuestionMapper.xml

@@ -26,5 +26,11 @@
         where sf.scale_id = #{scaleId}
         order by sq.question_order
     </select>
+
+    <select id="countQuestionNumByScaleId" resultType="int">
+        select count(*)
+        from sys_scale_question
+        where scale_id = #{scaleId}
+    </select>
 </mapper>