From c3e1cda0b4c8bebef839e69be3b05ffb1402316c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 09:19:04 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml | 37 ++++++++++++++++++++-----------------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java | 5 +++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java | 4 ++--
7 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java
index 253bc9f..f08c764 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java
@@ -18,9 +18,9 @@
private String option;
@ExcelProperty(value = "参与人数百分比", index = 2)
private BigDecimal tag;
- @ExcelProperty(value = "选择该选项人数", index = 3)
+ @ExcelProperty(value = "该选项选择总次数", index = 3)
private Integer count;
- @ExcelProperty(value = "该题目参与人数", index = 4)
+ @ExcelProperty(value = "该题目选择总次数", index = 4)
private Integer allCount;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java
index 8e1f7f5..87f1ae5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java
@@ -61,4 +61,7 @@
@ApiModelProperty("是否可重复提交（1.是 2.否）")
private Integer isRepeat;
+
+ @ApiModelProperty("图标类型")
+ private Integer imgType;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
index f1e295f..99d0c00 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
@@ -110,6 +110,11 @@
*/
private Long updateBy;
+ /**
+ * 处理人id
+ */
+ private Long handleId;
+
@Override
public String toString() {
return "ComActReserveRecordDO{" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 7c75673..306657d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -192,6 +192,9 @@
if (vo.getAdverPositionApplication().equals(ComActQuestnaireDO.isOk.yes)) {
sb.append("首页应用,");
}
+ if (vo.getIsCover().equals(ComActQuestnaireDO.isOk.yes)) {
+ sb.append("设置封面,");
+ }
String advertPosition = sb.toString();
if (advertPosition.length() > 0) {
vo.setAdvertPosition(advertPosition.substring(0, advertPosition.length() - 1));
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index f6848f4..84c61c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -275,6 +275,7 @@
reserveRecordDO.setReserveTime(reserveTime);
reserveRecordDO.setUpdateAt(nowDate);
reserveRecordDO.setUpdateBy(userId);
+ reserveRecordDO.setHandleId(userId);
updateList.add(reserveRecordDO);
}
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
index 0737791..4fa7860 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
@@ -52,6 +52,7 @@
start_time BETWEEN #{startTime} AND #{endTime} OR
end_time BETWEEN #{startTime} AND #{endTime}
)
+ and is_hide = 0 and state != 3
<if test="id != null">
AND id != #{id}
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml
index c623c69..fa234f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml
@@ -21,11 +21,12 @@
<result column="create_by" property="createBy"/>
<result column="update_at" property="updateAt"/>
<result column="update_by" property="updateBy"/>
+ <result column="handle_id" property="handleId"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, user_id, reserve_id, community_id, type, name, phone, status, content, remark, act_remark, reserve_time, json_object, create_at, create_by, update_at, update_by
+ id, user_id, reserve_id, community_id, type, name, phone, status, content, remark, act_remark, reserve_time, json_object, create_at, create_by, update_at, update_by, handle_id
</sql>
<select id="pageReserveList" resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveRecordListVO">
@@ -156,23 +157,24 @@
<select id="registerStatisticsExportAdmin" parameterType="com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO"
resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO">
- SELECT
- car.title,
- count( carr.id ) AS count,
- ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = #{registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
+ SELECT DISTINCT
+ car.id,
+ car.title,
+ ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = #{registerStatisticsDTO.communityId} AND `status` = 2 AND reserve_id = car.id
+ <if test="registerStatisticsDTO.startTime != null and registerStatisticsDTO.startTime != """>
+ AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{registerStatisticsDTO.startTime}
+ </if>
+ <if test="registerStatisticsDTO.endTime != null and registerStatisticsDTO.endTime != """>
+ AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{registerStatisticsDTO.endTime}
+ </if>
+ ) AS count,
+ ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = #{registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
FROM
- com_act_reserve_record AS carr
- LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
+ com_act_reserve AS car
WHERE
- carr.type = 2
- AND carr.community_id = #{registerStatisticsDTO.communityId}
- AND carr.`status` = 2
- <if test="registerStatisticsDTO.startTime != null and registerStatisticsDTO.startTime != """>
- AND DATE_FORMAT(carr.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{registerStatisticsDTO.startTime}
- </if>
- <if test="registerStatisticsDTO.endTime != null and registerStatisticsDTO.endTime != """>
- AND DATE_FORMAT(carr.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{registerStatisticsDTO.endTime}
- </if>
+ car.type = 2
+ AND car.community_id = #{registerStatisticsDTO.communityId}
+
GROUP BY
car.id
</select>
@@ -186,7 +188,7 @@
carr.phone,
carr.reserve_time,
carr.`content`,
- carr.remark,
+ su1.`name` as remark,
carr.act_remark,
carr.`status`,
car.`title`,
@@ -194,6 +196,7 @@
FROM
com_act_reserve_record AS carr
LEFT JOIN sys_user AS su ON su.user_id = carr.user_id
+ LEFT JOIN sys_user AS su1 ON su1.user_id = carr.handle_id
LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
WHERE
carr.`type` = 1
--
Gitblit v1.7.1