springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -186,13 +186,27 @@ voList.add(vo); index++; } if(populationImportErrorVOList.isEmpty()){ //客户需要暂时注释，等客户处理完成需要恢复 // if(populationImportErrorVOList.isEmpty()){ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId); // if (!R.isOk(r)) { // throw new ServiceException(r.getMsg()); // } // }else{ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList)); // } R r = communityService.listSavePopulationServeExcelVO(voList, communityId); if (!R.isOk(r)) { throw new ServiceException(r.getMsg()); String errMsg = r.getMsg(); List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class); if(!errorList.isEmpty()){ populationImportErrorVOList.addAll(errorList); } }else{ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList)); }else{ if(!populationImportErrorVOList.isEmpty()){ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList)); } } } catch (NumberFormatException e) { List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>(); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -40,6 +41,7 @@ @ApiModelProperty("主营业务") @NotBlank(groups = {AddGroup.class},message = "主营业务不能为空") @Length(groups = {AddGroup.class}, max=500) private String busScope; @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.dtos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,8 +21,10 @@ @ApiModelProperty(value = "状态 0 调研中 1已停止") private Integer state; @ApiModelProperty(value = "发布开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; @ApiModelProperty(value = "发布结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -124,4 +124,7 @@ @ApiModelProperty(value = "后台登录人员id",hidden = true) private Long backUserId; @ApiModelProperty(value = "地址备注") private String addrRemark; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
@@ -88,7 +88,23 @@ @ApiModelProperty("近一个月离（返）攀情况") private String situation; /** * 证件照（人面像）照片 */ @ApiModelProperty("证件照（人面像）照片") private String cardPhotoFront; /** * 证件照（国徽面）照片 */ @ApiModelProperty("证件照（国徽面）照片") private String cardPhotoBack; /** * 户口本照片(多张以,号隔开) */ @ApiModelProperty("户口本照片(多张以,号隔开)") private String familyBook;
@@ -16,12 +16,14 @@ import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.listen.ComCvtServeExcelListen; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -80,7 +82,7 @@ @ApiOperation(value = "新增便民服务商家") @PostMapping("/business/add") public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) { public R addComCvtBusiness(@RequestBody @Validated(AddGroup.class) ComCvtBusinessDTO comCvtBusinessDTO) { Long communityId = this.getCommunityId(); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); 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/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java
@@ -71,8 +71,10 @@ sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("房源审核通过"); sysUserNoticeVO.setBusinessType(10); sysUserNoticeVO.setBusinessContent(""); sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经审核通过"); sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId()); sysUserNoticeVO.setBusinessContent(" "); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessStatus(2); R r2 = userService.addNotice(sysUserNoticeVO); @@ -81,15 +83,18 @@ } }else if(R.isOk(r) && 2==comOpsHouseVO.getStatus()){ //您提交的xxxx房屋出租审核已经审核通过/被驳回 //审核驳回添加提示信息 SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(comOpsHouseVO.getUserId()); sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("房源审核被驳回"); sysUserNoticeVO.setBusinessType(10); sysUserNoticeVO.setBusinessContent(comOpsHouseVO.getReason()); sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经被驳回"); sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId()); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessContent("驳回原因：" + comOpsHouseVO.getReason()); sysUserNoticeVO.setBusinessStatus(1); R r2 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r2)) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -152,6 +152,7 @@ "p.reject_reason,\n" + "p.is_hide,\n" + "p.happen_addr,\n" + "p.addr_remark,\n" + "su.`name`,\n" + "p.handle_result,\n" + "p.photo_path_list,\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -70,7 +70,10 @@ "AND ( w.`status` = 3 or w.`status` = 5 )\n" + " </if> " + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" + "AND w.`status` in (1,2) \n" + "AND w.`status` =1 \n" + " </if> " + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status==3 and comActMicroWishVO.isPageMyWish!=null '>" + "AND w.`status` in (2, 3) \n" + " </if> " + "<if test='comActMicroWishVO.createBegin != null '>" + "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" + 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" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -96,4 +96,8 @@ * 拒绝原因 */ private String rejectReason; /** * 地址备注 */ private String addrRemark; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -96,11 +96,13 @@ if (!carResult) { return R.fail("车牌号有误！"); } if (comMngCarSaveDTO.getId()==null) { ComMngCarDO exist = comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>() .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum())); if (exist != null) { return R.ok("车辆已存在"); } } ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId()); if (ObjectUtils.isEmpty(comMngStructAreaDO)) { return R.fail("小区不存在"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -255,11 +255,16 @@ index++; } //如果有错误，返回错误 //暂时注释，等客户完成任务需要恢复 /*if(!populationImportErrorVOList.isEmpty()){ return R.fail(JSON.toJSONString(populationImportErrorVOList)); } this.saveBatch(populationDOList);*/ this.saveBatch(populationDOList); if(!populationImportErrorVOList.isEmpty()){ return R.fail(JSON.toJSONString(populationImportErrorVOList)); } this.saveBatch(populationDOList); return R.ok("共计导入实有人口数量：" + populationDOList.size()); }
@@ -1505,6 +1505,9 @@ communityUserInfoVO.setIdCard(idCard); } communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt()); communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack()); communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront()); communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook()); communityUserInfoVO.setName(sysUserDO.getName()); String phone = sysUserDO.getPhone(); communityUserInfoVO.setPhone(phone);
