springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java
@@ -25,16 +25,22 @@ @ApiModelProperty("用户id") private Long userId; @ApiModelProperty("提交时间") @ApiModelProperty("开始登记时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("用户昵称") private String nickName; @ApiModelProperty("题目") private String reserveSubContent; @ApiModelProperty("用户昵称") @ApiModelProperty("答案") private String answerContent; @ApiModelProperty("题目id") private Long reserveSubId; @ApiModelProperty("选项类型（0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传 12签名）") private Integer optionType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -4940,14 +4940,6 @@ R getWestCommunityLists(); /** * 综治app-小区列表 * @param villageListAppDTO 请求参数 * @return 小区列表 */ @PostMapping("/village/grid/list/app") R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO); /** * 分页查询退役军人列表 * * @param comExServicemanDTO @@ -7012,22 +7004,6 @@ R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO); /** * 生成二维码 * @param qrCodeVO * @return */ @PostMapping("/comActActivityCode/getQRCode") public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO); /** * 重置二维码 * @param qrCodeVO * @return */ @PostMapping("/comActActivityCode/resetQRCode") public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO); /** * 实有房屋数据修复定时任务 * @return 实有房屋数据修复定时任务 */ @@ -7150,48 +7126,6 @@ */ @PostMapping("/elders/pensionAuthRecord/add") R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO); /** * 活动报名签到情况 * @param id 活动主键id * @return */ @GetMapping("/activity/sign-in/list") R listSignInRecord(@RequestParam("id") Long id); /** * 活动签到记录 * @param id 活动主键 * @param userId 用户id * @return */ @GetMapping("/activity/regist/list") R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId); /** * 获取活动类型（目前只有志愿者活动需要获取） * @param communityId * @param type * @return */ @GetMapping("/activity/type/list") R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type); /** * 添加活动类型 * @param comActActivityTypeVO * @return */ @PostMapping("/activity/type/add") R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO); /** * 我的评价 * @param userId * @param activityId * @return */ @GetMapping("/activity/my-evaluate") R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId); /** * 分页查询居家隔离统计 @@ -7202,77 +7136,10 @@ R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO); /** * 分页查询物业宣传 * @param pageComPropertyPublicityDTO * 居家隔离导出 * @param pageReserveRegisterDetailedAdminDTO * @return */ @PostMapping("/property/publicity/page") R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO); /** * 新增物业宣传 * @param comPropertyPublicityDTO * @return */ @PostMapping("/property/publicity/add") R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO); /** * 修改物业宣传 * @param comPropertyPublicityDTO * @return */ @PostMapping("/property/publicity/update") R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO); /** * 查看物业宣传信息 * @param id * @return */ @GetMapping("/property/publicity/get") R getComPropertyPublicity(@RequestParam("id") Long id); /** * 删除物业宣传 * @param id * @return */ @DeleteMapping("/property/publicity/delete") R deleteComPropertyPublicity(@RequestParam("id") Long id); /** * 物业公司列表 * * @param villageId * @param communityId * @return */ @GetMapping("/property/publicity/list/property") R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId); /** * 小区列表 * @param propertyId * @param communityId * @return */ @GetMapping("/property/publicity/list/village") R listVillage(@RequestParam(value = "propertyId",required = false) Long propertyId, @RequestParam("communityId") Long communityId); /** * 分页查询物业宣传-小程序 * @param pageComPropertyPublicityDTO * @return */ @PostMapping("/property/publicity/page/applet") R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO); /** * 增加物业宣传浏览量 * @param id * @return */ @GetMapping("/property/publicity/incr-view") R incrPropertyPublicityView(@RequestParam("id") Long id); @PostMapping("/reserve/admin/homeQuarantine/export") R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -8,6 +8,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.BeanUtils; @@ -621,9 +622,9 @@ * 组合导出数据 * 用户问卷答案 */ R questnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO); QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(questnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class); List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs(); R exportResultR = communityService.exportHomeQuarantine(pageReserveRegisterDetailedAdminDTO); HomeQuarantineRegisterExportVO exportVO = JSON.parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class); List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs(); //构造表头 List<List<String>> headList = new ArrayList<List<String>>(); String firstRowContent = "重点地区或高风险地区来攀返攀人员信息统计表（居家隔离表）"; @@ -655,7 +656,7 @@ head2.add("隔离体温情况"); headList.add(head2); //数据转换 datalist = HomeQuarantineUtil.ReserveData(questnaireAnswersDTOS.getAnswers()); datalist = exportVO.getDataList(); WriteCellStyle headWriteCellStyle = new WriteCellStyle(); //设置头居中 headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
@@ -601,105 +601,12 @@ photo = Arrays.asList(comSwSafetyWorkRecordVO.getRecordPhoto().split(",")); } if (photo.size() != 0 && null != photo) { if (photo.size() == 1) { for (int i = 0; i < 9; i++) { if (i < 1) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } List<Object> list=new ArrayList<>(); for (int i = 0; i < photo.size(); i++) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_find_" + i, "d:/dangerReport/file/"); list.add(getImageStr("d:/dangerReport/file/" + comSwSafetyWorkRecordVO.getId() + "_find_" + i + ".jpg")); } if (photo.size() == 2) { for (int i = 0; i < 9; i++) { if (i < 2) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 3) { for (int i = 0; i < 9; i++) { if (i < 3) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 4) { for (int i = 0; i < 9; i++) { if (i < 4) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 5) { for (int i = 0; i < 9; i++) { if (i < 5) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 6) { for (int i = 0; i < 9; i++) { if (i < 6) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 7) { for (int i = 0; i < 9; i++) { if (i < 7) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 8) { for (int i = 0; i < 9; i++) { if (i < 8) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } } } if (photo.size() == 9) { for (int i = 0; i < 9; i++) { downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i, "d:/safetyWork/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg")); } } } else { for (int i = 0; i < 9; i++) { dataMap.put("imgStr" + (i + 1), getImageStr("d:/safetyWork/file/blank.jpg")); } dataMap.put("imgList",list); } // 备注 if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRemark())) { @@ -884,105 +791,12 @@ photo = Arrays.asList(comSwPatrolRecordVO.getRecordPhoto().split(",")); } if (photo.size() != 0 && null != photo) { if (photo.size() == 1) { for (int i = 0; i < 9; i++) { if (i < 1) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } List<Object> list=new ArrayList<>(); for (int i = 0; i < photo.size(); i++) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_find_" + i, "d:/dangerReport/file/"); list.add(getImageStr("d:/dangerReport/file/" + comSwPatrolRecordVO.getId() + "_find_" + i + ".jpg")); } if (photo.size() == 2) { for (int i = 0; i < 9; i++) { if (i < 2) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 3) { for (int i = 0; i < 9; i++) { if (i < 3) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 4) { for (int i = 0; i < 9; i++) { if (i < 4) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 5) { for (int i = 0; i < 9; i++) { if (i < 5) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 6) { for (int i = 0; i < 9; i++) { if (i < 6) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 7) { for (int i = 0; i < 9; i++) { if (i < 7) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 8) { for (int i = 0; i < 9; i++) { if (i < 8) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } } } if (photo.size() == 9) { for (int i = 0; i < 9; i++) { downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i, "d:/patrolRecord/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg")); } } } else { for (int i = 0; i < 9; i++) { dataMap.put("imgStr" + (i + 1), getImageStr("d:/patrolRecord/file/blank.jpg")); } dataMap.put("imgList",list); } // 备注 if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRemark())) { @@ -1094,9 +908,6 @@ sftp.uploadMore(ftpUrl, name , inputStream); sftp.logout(); inputStream.close(); FileUtils.deleteDirectory(new File(property+File.separator+"word"+File.separator)); FileUtils.deleteDirectory(new File(zipFile)); FileUtils.deleteDirectory(new File("d:/patrolRecord/file/")); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (SftpException e) { @@ -1209,182 +1020,17 @@ dataMap.put("takeSteps", ""); } // 措施照片 List<String> stepsPhoto = new ArrayList<>(); List<String> photo1 = new ArrayList<>(); if (StringUtils.isNotEmpty(comSwDangerReportVO.getStepsPhoto())) { stepsPhoto = Arrays.asList(comSwDangerReportVO.getStepsPhoto().split(",")); photo1 = Arrays.asList(comSwDangerReportVO.getStepsPhoto().split(",")); } if (stepsPhoto.size() != 0 && null != stepsPhoto) { if (stepsPhoto.size() == 1) { for (int i = 0; i < 9; i++) { if (i < 1) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 1) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } if (photo1.size() != 0 && null != photo1) { List<Object> list=new ArrayList<>(); for (int i = 0; i < photo1.size(); i++) { downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } if (stepsPhoto.size() == 2) { for (int i = 0; i < 9; i++) { if (i < 2) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 2) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 3) { for (int i = 0; i < 9; i++) { if (i < 3) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 3) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 4) { for (int i = 0; i < 9; i++) { if (i < 4) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 4) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 5) { for (int i = 0; i < 9; i++) { if (i < 5) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 5) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 6) { for (int i = 0; i < 9; i++) { if (i < 6) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 6) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 7) { for (int i = 0; i < 9; i++) { if (i < 7) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 7) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 8) { for (int i = 0; i < 9; i++) { if (i < 8) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } } for (int i = 0; i < 9; i++) { if (i < 8) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (stepsPhoto.size() == 9) { for (int i = 0; i < 9; i++) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } for (int i = 0; i < 9; i++) { downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg")); } } } else { for (int i = 0; i < 9; i++) { dataMap.put("imgStr" + (i + 1), getImageStr("d:/dangerReport/file/blank.jpg")); } for (int i = 0; i < 9; i++) { dataMap.put("imgStr" + (i + 19), getImageStr("d:/dangerReport/file/blank.jpg")); } dataMap.put("imgList",list); } // 社区处理建议 if (StringUtils.isNotEmpty(comSwDangerReportVO.getCommunitySuggestion())) { @@ -1423,110 +1069,17 @@ dataMap.put("findRecord", ""); } // 记录照片 List<String> photo = new ArrayList<>(); List<String> photo2 = new ArrayList<>(); if (StringUtils.isNotEmpty(comSwDangerReportVO.getRecordPhoto())) { photo = Arrays.asList(comSwDangerReportVO.getRecordPhoto().split(",")); photo2 = Arrays.asList(comSwDangerReportVO.getRecordPhoto().split(",")); } if (photo.size() != 0 && null != photo) { if (photo.size() == 1) { for (int i = 0; i < 9; i++) { if (i < 1) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } if (photo2.size() != 0 && null != photo2) { List<Object> list=new ArrayList<>(); for (int i = 0; i < photo2.size(); i++) { downloadPicture(photo2.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } if (photo.size() == 2) { for (int i = 0; i < 9; i++) { if (i < 2) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 3) { for (int i = 0; i < 9; i++) { if (i < 3) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 4) { for (int i = 0; i < 9; i++) { if (i < 4) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 5) { for (int i = 0; i < 9; i++) { if (i < 5) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 6) { for (int i = 0; i < 9; i++) { if (i < 6) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 7) { for (int i = 0; i < 9; i++) { if (i < 7) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 8) { for (int i = 0; i < 9; i++) { if (i < 8) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } else { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } } } if (photo.size() == 9) { for (int i = 0; i < 9; i++) { downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/"); dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg")); } } } else { for (int i = 0; i < 9; i++) { dataMap.put("imgStr" + (i + 10), getImageStr("d:/dangerReport/file/blank.jpg")); } dataMap.put("imgList2",list); } // 备注 if (StringUtils.isNotEmpty(comSwDangerReportVO.getRemark())) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -442,16 +442,6 @@ if (null == id || 0 == id) { return R.fail("动态主键不能为空"); } Date publishAt = partyCommitteeVO.getPublishAt(); if (!ObjectUtils.isEmpty(publishAt)) { long time = publishAt.getTime(); long l = System.currentTimeMillis(); if (l > time) { partyCommitteeVO.setStatus(1); } else { partyCommitteeVO.setStatus(2); } } return partyBuildingService.updateYnamic(partyCommitteeVO); }
@@ -33,8 +33,8 @@ Integer columnWidth = this.dataLength(cellDataList, cell, isHead); if (columnWidth >= 0) { if (columnWidth > 25) { columnWidth = 25; if (columnWidth > 20) { columnWidth = 20; } Integer maxColumnWidth = (Integer)((Map)maxColumnWidthMap).get(cell.getColumnIndex()); @@ -42,6 +42,9 @@ ((Map)maxColumnWidthMap).put(cell.getColumnIndex(), columnWidth); writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 75); } if(cell.getStringCellValue().equals("有无")){ writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(),30*75); } } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -332,4 +332,14 @@ public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) { return comActReserveAnswerContentService.pageRegisterHomeQuarantine(detailedAdminDTO); } /** * 居家隔离导出 * @param detailedAdminDTO * @return */ @PostMapping("/admin/homeQuarantine/export") public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) { return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
@@ -54,4 +54,11 @@ IPage<String> pageRegisterHomeQuarantine(@Param("page") Page page, @Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO); List<HomeQuarantineRegisterStatisticsVO> selectStatistics(@Param("reserveId") Long reserveId, @Param("record") String record); /** * 查询居家隔离统计身份证号码 * @param detailedAdminDTO * @return */ List<String> exportHomeQuarantine(@Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
@@ -51,6 +51,8 @@ */ ConvenientMerchantVO selectMerchantById(@Param("merchantId") Long merchantId); List<ConvenientMerchantVO> selectMerchantByName(@Param("communityId") Long communityId, @Param("currentMon") String currentMon); /** * 获取社区下热门商家 * springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java
@@ -32,4 +32,11 @@ * @return */ R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO); /** * 居家隔离导出 * @param detailedAdminDTO * @return */ R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -1,12 +1,15 @@ package com.panzhihua.service_community.service.impl; import java.net.URL; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import javax.annotation.Resource; import javax.xml.bind.DatatypeConverter; import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -52,19 +55,7 @@ @Override public R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){ QuestnaireAnswersDTO result = new QuestnaireAnswersDTO(); //查询题目 List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda() .eq(ComActReserveSubDO::getReserveId, pageReserveRegisterDetailedAdminDTO.getReserveId()).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId)); List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>(); list.forEach(subDo -> { if(!subDo.getType().equals(5)){ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO(); BeanUtils.copyProperties(subDo, comActQuestnaireSubVO); listSubVo.add(comActQuestnaireSubVO); } }); result.setSubs(listSubVo); result.setSubs(retrieveQuestnaireSub(pageReserveRegisterDetailedAdminDTO)); //查询用户回答 List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO); @@ -157,23 +148,35 @@ map.put("nub", nub + ""); List<HomeQuarantineRegisterStatisticsVO> statisticsList = this.baseMapper.selectStatistics(detailedAdminDTO.getReserveId(), record); StringBuffer conditions = new StringBuffer(); //渲染首次登记时间 map.put("time", DateUtils.format(statisticsList.get(0).getCreateAt(), DateUtils.ymdhms_format)); statisticsList.forEach(e -> { //渲染登记时间 map.put("time", DateUtils.format(e.getCreateAt(), DateUtils.ymdhms_format)); String reserveSubContent = e.getReserveSubContent(); String dateString = dateFormat.format(e.getCreateAt()); if (reserveSubContent.contains("上午体温")) { if (conditions.indexOf(dateString + " " + "上午体温") == -1) { int index = conditions.indexOf(dateString + " " + "上午体温"); if (index == -1) { conditions.append(dateString + " " + "上午体温：" + e.getAnswerContent() + "℃" + "\n"); } else { conditions.replace(index, conditions.indexOf("℃", index), dateString + " " + "上午体温：" + e.getAnswerContent()); } } else if (reserveSubContent.contains("下午体温")) { if (conditions.indexOf(dateString + " " + "下午体温") == -1) { int index = conditions.indexOf(dateString + " " + "下午体温"); if (index == -1) { conditions.append(dateString + " " + "下午体温：" + e.getAnswerContent() + "℃" + "\n"); } else { conditions.replace(index, conditions.indexOf("℃", index), dateString + " " + "下午体温：" + e.getAnswerContent()); } } else if (reserveSubContent.contains("隔离情况")) { if (conditions.indexOf(dateString + " " + "当日隔离情况") == -1) { int index = conditions.indexOf(dateString + " " + "当日隔离情况"); if (index == -1) { conditions.append(dateString + " " + "当日隔离情况：" + e.getAnswerContent() + "\n"); conditions.append("————————" + "\n"); } else { conditions.replace(index, conditions.indexOf("\n", index), dateString + " " + "当日隔离情况：" + e.getAnswerContent()); } } else { map.put(e.getReserveSubId() + "", e.getAnswerContent()); @@ -187,4 +190,105 @@ resultPage.setRecords(resultMapList); return R.ok(resultPage); } /** * 居家隔离导出 * @param detailedAdminDTO * @return */ @Override public R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) { HomeQuarantineRegisterExportVO exportVO = new HomeQuarantineRegisterExportVO(); //题目 exportVO.setSubs(retrieveQuestnaireSub(detailedAdminDTO)); //结果数据集合 List<List<Object>> resultList = new ArrayList<>(); List<String> idCards = this.baseMapper.exportHomeQuarantine(detailedAdminDTO); if (!idCards.isEmpty()) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); for (String idCard : idCards) { //构建单个用户数据 List<Object> userData = new ArrayList<>(); List<HomeQuarantineRegisterStatisticsVO> statisticsList = this.baseMapper.selectStatistics(detailedAdminDTO.getReserveId(), idCard); HomeQuarantineRegisterStatisticsVO firstStatisticsVO = statisticsList.get(0); userData.add(firstStatisticsVO.getNickName()); userData.add(DateUtils.format(firstStatisticsVO.getCreateAt(), DateUtils.ymdhms_format)); int size = statisticsList.size(); List<HomeQuarantineRegisterStatisticsVO> lastStatisticsVOList = statisticsList.subList(size - 13, size); for (HomeQuarantineRegisterStatisticsVO statisticsVO : lastStatisticsVOList) { //判断当前的组件类型是否是图片上传，导出时需要导出图片 if (statisticsVO.getOptionType().equals(11)) { try { userData.add(new URL(statisticsVO.getAnswerContent())); } catch (Exception e) { userData.add(" "); log.error("导出转换图片失败！"); } continue; } //判断当前组件类型是否签名 if (statisticsVO.getOptionType().equals(12)) { try { userData.add(DatatypeConverter.parseBase64Binary(statisticsVO.getAnswerContent().substring(statisticsVO.getAnswerContent().indexOf(",") + 1))); } catch (Exception e) { userData.add(" "); log.error("导出转换图片失败！"); } continue; } userData.add(statisticsVO.getAnswerContent()); } StringBuffer conditions = new StringBuffer(); statisticsList.forEach(e -> { String reserveSubContent = e.getReserveSubContent(); String dateString = dateFormat.format(e.getCreateAt()); if (reserveSubContent.contains("上午体温")) { int index = conditions.indexOf(dateString + " " + "上午体温"); if (index == -1) { conditions.append(dateString + " " + "上午体温：" + e.getAnswerContent() + "℃" + "\n"); } else { conditions.replace(index, conditions.indexOf("℃", index), dateString + " " + "上午体温：" + e.getAnswerContent()); } } else if (reserveSubContent.contains("下午体温")) { int index = conditions.indexOf(dateString + " " + "下午体温"); if (index == -1) { conditions.append(dateString + " " + "下午体温：" + e.getAnswerContent() + "℃" + "\n"); } else { conditions.replace(index, conditions.indexOf("℃", index), dateString + " " + "下午体温：" + e.getAnswerContent()); } } else if (reserveSubContent.contains("隔离情况")) { int index = conditions.indexOf(dateString + " " + "当日隔离情况"); if (index == -1) { conditions.append(dateString + " " + "当日隔离情况：" + e.getAnswerContent() + "\n"); conditions.append("————————" + "\n"); } else { conditions.replace(index, conditions.indexOf("\n", index), dateString + " " + "当日隔离情况：" + e.getAnswerContent()); } } }); userData.add(conditions.toString()); resultList.add(userData); } } exportVO.setDataList(resultList); return R.ok(exportVO); } private List<ComActQuestnaireSubVO> retrieveQuestnaireSub(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) { //查询题目 List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda() .eq(ComActReserveSubDO::getReserveId, detailedAdminDTO.getReserveId()).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId)); List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>(); list.forEach(subDo -> { if(!subDo.getType().equals(5)){ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO(); BeanUtils.copyProperties(subDo, comActQuestnaireSubVO); listSubVo.add(comActQuestnaireSubVO); } }); return listSubVo; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -133,6 +133,9 @@ if(comActDO!=null){ convenientMerchantDO.setCommunityName(comActDO.getName()); } else { convenientMerchantDO.setCommunityName("西区社区"); } } String account = convenientMerchantDTO.getAccount(); if (isNotBlank(account)) { @@ -286,6 +289,15 @@ page.setSize(pagePopularMerchantDTO.getPageSize()); page.setCurrent(pagePopularMerchantDTO.getPageNum()); IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon); if(pagePopularMerchantDTO.getPageNum().equals(1L)){ //第一页默认把犇师傅维修中心加载到第一个 List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon); if(merchantList != null && merchantList.size() > 0){ merchantList.addAll(merchantVOList.getRecords()); merchantVOList.setRecords(merchantList); } } return R.ok(merchantVOList); }
@@ -145,29 +145,51 @@ LEFT JOIN com_act_reserve_answer_content carac ON carr.id=carac.reserve_record_id LEFT JOIN com_act_reserve_sub t ON carac.reserve_sub_id = t.id WHERE carr.reserve_id = #{detailedAdminDTO.reserveId} AND t.content LIKE '身份证%' <if test='detailedAdminDTO.startTime != null and detailedAdminDTO.startTime != ""'> AND carr.create_at <![CDATA[ >= ]]> #{detailedAdminDTO.startTime} </if> <if test='detailedAdminDTO.endTime != null and detailedAdminDTO.endTime != ""'> AND carr.create_at <![CDATA[ <= ]]> #{detailedAdminDTO.endTime} </if> <if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """> AND carac.answer_content LIKE CONCAT (#{detailedAdminDTO.keyword},'%') </if> ORDER BY carr.id DESC LIMIT 9999999 ) temp GROUP BY answer_content ORDER BY id DESC ORDER BY carr.id ASC LIMIT 9999999) temp WHERE 1=1 <if test='detailedAdminDTO.startTime != null and detailedAdminDTO.startTime != ""'> AND temp.create_at <![CDATA[ >= ]]> #{detailedAdminDTO.startTime} </if> <if test='detailedAdminDTO.endTime != null and detailedAdminDTO.endTime != ""'> AND temp.create_at <![CDATA[ <= ]]> #{detailedAdminDTO.endTime} </if> GROUP BY answer_content ORDER BY id DESC </select> <select id="selectStatistics" resultType="com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterStatisticsVO"> SELECT carr.id, carr.create_at, carac.reserve_record_id, car.content AS reserveSubContent, carac.answer_content AS answerContent, carac.reserve_sub_id AS reserveSubId, car.`type` SELECT carr.id, carr.create_at, su.nick_name, carac.reserve_record_id, car.content AS reserveSubContent, carac.answer_content AS answerContent, carac.reserve_sub_id AS reserveSubId, car.`type` AS optionType FROM com_act_reserve_record AS carr LEFT JOIN com_act_reserve_answer_content carac ON carr.id=carac.reserve_record_id LEFT JOIN com_act_reserve_sub AS car ON carac.reserve_sub_id = car.id LEFT JOIN sys_user su ON carr.user_id = su.user_id WHERE carr.id IN ( SELECT t1.reserve_record_id FROM com_act_reserve_answer_content t1 LEFT JOIN com_act_reserve_record t2 ON t1.reserve_record_id = t2.id WHERE t2.reserve_id = #{reserveId} AND t1.answer_content = #{record} ) ORDER BY carr.id ASC </select> <select id="exportHomeQuarantine" resultType="java.lang.String"> SELECT answer_content FROM ( SELECT carr.id, carac.answer_content FROM com_act_reserve_record AS carr LEFT JOIN com_act_reserve_answer_content carac ON carr.id=carac.reserve_record_id LEFT JOIN com_act_reserve_sub t ON carac.reserve_sub_id = t.id WHERE carr.reserve_id = #{detailedAdminDTO.reserveId} AND t.content LIKE '身份证%' <if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """> AND carac.answer_content LIKE CONCAT (#{detailedAdminDTO.keyword},'%') </if> ORDER BY carr.id ASC LIMIT 9999999) temp WHERE 1=1 <if test='detailedAdminDTO.startTime != null and detailedAdminDTO.startTime != ""'> AND temp.create_at <![CDATA[ >= ]]> #{detailedAdminDTO.startTime} </if> <if test='detailedAdminDTO.endTime != null and detailedAdminDTO.endTime != ""'> AND temp.create_at <![CDATA[ <= ]]> #{detailedAdminDTO.endTime} </if> GROUP BY answer_content ORDER BY id DESC </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml
@@ -79,6 +79,67 @@ <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0"> and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory} </if> <if test="pageElderAuthRecordsDTO.isAlive != null"> and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive} </if> <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''"> and (ceae.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%') or cear.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%') or ceae.id_card = #{pageElderAuthRecordsDTO.idCard}) </if> order by cear.create_at desc </select> <select id="export" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO"> SELECT cear.id, su.`name` submitUserName, ceae.phone, ceae.`name`, ceae.id_card, ceae.sex, ceae.birthday, ceae.personnel_category, cear.address, ceae.is_alive, cear.auth_method, cear.auth_period, cear.auth_video, cear.auth_date, cear.mark, cear.approval_status, cear.approver_id, su1.`name` as approverName, cear.approval_date, cear.auth_status FROM com_elder_auth_records cear LEFT JOIN com_elder_auth_elderlies ceae ON cear.elderlies_id = ceae.id LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id WHERE ceae.community_id = #{pageElderAuthRecordsDTO.communityId} <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''"> and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod} </if> <if test="pageElderAuthRecordsDTO.authMethod != null and pageElderAuthRecordsDTO.authMethod != 0"> and cear.auth_method = #{pageElderAuthRecordsDTO.authMethod} </if> <if test="pageElderAuthRecordsDTO.authDateBegin != null and pageElderAuthRecordsDTO.authDateBegin != ''"> and cear.auth_date <![CDATA[ >= ]]> #{pageElderAuthRecordsDTO.authDateBegin} </if> <if test="pageElderAuthRecordsDTO.authDateEnd != null and pageElderAuthRecordsDTO.authDateEnd != ''"> and cear.auth_date <![CDATA[ <= ]]> #{pageElderAuthRecordsDTO.authDateEnd} </if> <if test="pageElderAuthRecordsDTO.approvalStatus != null and pageElderAuthRecordsDTO.approvalStatus != 0"> and cear.approval_status = #{pageElderAuthRecordsDTO.approvalStatus} </if> <if test="pageElderAuthRecordsDTO.authStatus != null and pageElderAuthRecordsDTO.authStatus != 0"> and cear.auth_status = #{pageElderAuthRecordsDTO.authStatus} </if> <if test="pageElderAuthRecordsDTO.personnelCategory != null and pageElderAuthRecordsDTO.personnelCategory != 0"> and ceae.personnel_category = #{pageElderAuthRecordsDTO.personnelCategory} </if> <if test="pageElderAuthRecordsDTO.isAlive != null and pageElderAuthRecordsDTO.isAlive != 0"> and ceae.is_alive = #{pageElderAuthRecordsDTO.isAlive} </if> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
@@ -65,18 +65,18 @@ ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','1','%')) as huoTotal ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','2','%')) as xunTotal ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','3','%')) as yiTotal ,(select count(id) from com_sw_safety_work_record where community_id = #{communityId}) as safetyWorkTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId}) as dangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and status = '3') as handledDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','1','%')) as huoDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','2','%')) as xunDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','3','%')) as yiDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal ,(select count(id) from com_sw_danger_report where community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_safety_work_record t2 on t1.report_id = t2.id where t.community_id = #{communityId}) as safetyWorkTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId}) as dangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and status = '3') as handledDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%')) as huoDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%')) as xunDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%')) as yiDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1 on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal from com_sw_patrol_record as cmp where community_id = #{communityId} </select>
@@ -68,6 +68,46 @@ LEFT JOIN sys_user su ON ccm.user_id = su.user_id WHERE ccm.id = #{merchantId} </select> <select id="selectMerchantByName" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> SELECT temp.id, temp.NAME, temp.introduction, temp.logo, temp.serviceScope, IF ( SUM( temp.consultation_volume ) IS NULL, 0, SUM( temp.consultation_volume )) AS monthConsultationVolume FROM ( SELECT ccm.id, ccm.NAME, ccm.introduction, ccm.logo, cccs.consultation_volume, GROUP_CONCAT( ccss.service_name ) AS serviceScope FROM com_convenient_merchants ccm LEFT JOIN ( SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id WHERE ( ccm.community_id = #{communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` = '犇师傅维修中心' GROUP BY cccs.id ) temp GROUP BY temp.id ORDER BY SUM( temp.consultation_volume ) DESC </select> <select id="getPopularMerchants" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> SELECT temp.id, temp.name, temp.introduction, temp.logo, @@ -79,7 +119,7 @@ FROM com_convenient_merchants ccm LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id WHERE ( ccm.community_id = #{communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 GROUP BY cccs.id WHERE ( ccm.community_id = #{communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' GROUP BY cccs.id ) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC </select> <select id="getClassifyMerchants" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
