fix: 问题组模块

gis_cms/src/main/java/com/gis/cms/entity/po/QuestionGroupEntity.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -32,4 +33,9 @@ public class QuestionGroupEntity extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "是否显示，1：显示， 0：不显示, 默认显示")
     private Integer display;
+
+    @Transient
+    @ApiModelProperty(value = "题目数量")
+    private Integer questionCount;
+
 }

gis_cms/src/main/java/com/gis/cms/service/impl/QuestionGroupServiceImpl.java

@@ -26,8 +26,10 @@ import tk.mybatis.mapper.entity.Condition;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -80,13 +82,29 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
         if (display != null) {
             condition.and().andEqualTo("display", display);
         }
+        condition.orderBy("createTime").desc();
 
+        PageInfo<QuestionGroupEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+        List<QuestionGroupEntity> list = pageInfo.getList();
 
+        List<QuestionGroupEntity> result = new ArrayList<>();
+
+        for (QuestionGroupEntity q : list) {
+            Integer count = getQuesitongCount(q.getId());
+            q.setQuestionCount(count);
+            result.add(q);
+        }
+
+        pageInfo.setList(result);
 
-        condition.orderBy("createTime").desc();
-        PageInfo<QuestionGroupEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
         return Result.success(pageInfo);
 
+
+    }
+
+    private Integer getQuesitongCount(Long id){
+        List<QuestionAnswerEntity> answerEntityList = questionAnswerService.findByQuestionGroupId(id);
+        return answerEntityList.size();
     }
 
     @Override

gis_common/src/main/java/com/gis/common/base/entity/vo/LogVo.java

@@ -20,5 +20,8 @@ public class LogVo extends BaseEntity {
     @ApiModelProperty(value = "操作记录")
     private String description;
 
+    @ApiModelProperty(value = "ip地址")
+    private String ip;
+
 
 }