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/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/partybuilding/PartyCommitteeVO.java
@@ -46,9 +46,12 @@ private Integer age; @ApiModelProperty("职位") @NotBlank(groups = {AddGroup.class},message = "电话不能为空") @NotBlank(groups = {AddGroup.class},message = "职位不能为空") private String position; @ApiModelProperty("职位2") private String position_two; @ApiModelProperty("岗位职责") @NotBlank(groups = {AddGroup.class},message = "岗位职责不能为空") private String jobResponsibilities; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -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/HouseApi.java
@@ -71,6 +71,7 @@ sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("房源审核通过"); sysUserNoticeVO.setBusinessType(10); sysUserNoticeVO.setBusinessContent(""); sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经审核通过"); sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId()); sysUserNoticeVO.setBusinessContent(" "); @@ -82,12 +83,14 @@ } }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); 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/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,10 +96,12 @@ if (!carResult) { return R.fail("车牌号有误！"); } ComMngCarDO exist = comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>() .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum())); if (exist != null) { return R.ok("车辆已存在"); 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)) { springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java
@@ -29,55 +29,62 @@ /** * 电话 */ private String phone; private String phone; /** /** * 是否注册 */ private Integer isReg; private Integer isReg; /** /** * 姓名 */ private String name; private String name; /** /** * 性别 */ private Integer sex; private Integer sex; /** /** * 出生日期 */ private Date birthTime; private Date birthTime; /** /** * 职位 */ private String position; private String position; /** /** * 职位2 */ private String position_two; /** * 岗位职责 */ private String jobResponsibilities; private String jobResponsibilities; /** /** * 头像图片路径 */ private String photoPath; private String photoPath; /** /** * 创建时间 */ private Date createAt; private Date createAt; /** /** * 修改时间 */ private Date updateAt; private Date updateAt; /** /** * 社区id */ private Long communityId; private Long communityId; }
