springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java
@@ -18,6 +18,7 @@ import com.panzhihua.common.model.vos.community.questnaire.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.ClazzUtils; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.community_backstage.config.SFTPConfig; import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler; @@ -55,7 +56,7 @@ @ApiOperation(value = "分页查询调查问卷", response = QuestnaireListVo.class) @PostMapping("/page") public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); ClazzUtils.setIfStringIsEmpty(pageQuestnaireDTO); pageQuestnaireDTO.setForMasses(null); pageQuestnaireDTO.setForVolunteer(true); pageQuestnaireDTO.setForParty(true); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -52,9 +52,10 @@ " </if> \n" + "<if test='pageQuestnaireDTO.startTime != null '>\n" + " AND aq.create_at BETWEEN \n" + "#{pageComActDTO.startTime} \n" + " AND #{pageQuestnaireDTO.endTime}\n" + " AND aq.create_at <![CDATA[>=]]> #{pageQuestnaireDTO.startTime} \n" + "</if>" + "<if test='pageQuestnaireDTO.endTime != null '>\n" + " AND aq.create_at <![CDATA[<=]]> #{pageQuestnaireDTO.endTime} \n" + " </if> \n" + " ORDER BY \n" + " aq.create_at DESC" +