From f84385a5dc86de01b889f1c8dbe93f2eeb7d0ea7 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 06 九月 2021 16:05:01 +0800
Subject: [PATCH] 修改bug以及办事指南增加字段
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 14 +++++++++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java | 11 +++++++----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml | 4 +++-
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java
index c6422b9..196acea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java
@@ -17,15 +17,18 @@
@ApiModel("办事指南分类列表")
public class ComActWorkGuideAppletsVO {
- @ApiModelProperty("办事指南id")
+ @ApiModelProperty("分类id")
private Long id;
- @ApiModelProperty("办事指南标题")
+ @ApiModelProperty("分类名称")
private String classifyName;
- @ApiModelProperty("办事指南内容")
+ @ApiModelProperty("分类图标url")
private String pictureUrl;
- @ApiModelProperty("办事指南信息")
+ @ApiModelProperty("办事指南数量")
+ private Integer count;
+
+ @ApiModelProperty("办事指南列表")
private List<ComActWorkGuideDetailAppletsVO> guideDetailList = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 004977b..d8c7e9d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper;
import com.panzhihua.service_community.dao.ComActReserveSubMapper;
import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO;
@@ -97,7 +98,18 @@
if(!registerDetailedAnswerList.isEmpty()){
for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
if(!detailed.getType().equals(5)){
- map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
+ if(detailed.getType().equals(1)){
+ String key = detailed.getReserveSubId() + "";
+ String value = map.get(key).toString();
+ if(StringUtils.isNotEmpty(value)){
+ value = value + "," + detailed.getAnswerContent();
+ }else{
+ value = detailed.getAnswerContent();
+ }
+ map.put(key,value);
+ }else{
+ map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
+ }
}
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml
index dce74f6..4916c3c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml
@@ -33,7 +33,9 @@
</select>
<select id="listWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO">
- select id,classify_name,picture_url from com_act_work_guide_classify
+ SELECT cawgc.id, cawgc.classify_name, cawgc.picture_url,( SELECT count( id ) FROM com_act_work_guide WHERE classify = cawgc.id ) AS `count`
+ FROM
+ com_act_work_guide_classify AS cawgc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1