springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -8,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -40,7 +41,7 @@ private String imageUrl; @ApiModelProperty("微心愿名称") @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空") // @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空") private String wishName; @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中") @@ -153,5 +154,11 @@ @ApiModelProperty(value = "下一个id数组") private List<Long> idList; @ApiModelProperty(value = "单张图片宽度") private BigDecimal imgWidth; @ApiModelProperty(value = "单张图片高度") private BigDecimal imgHeight; }
@@ -3,6 +3,7 @@ import java.util.List; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.community.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -62,20 +63,6 @@ import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO; import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO; import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO; import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO; import com.panzhihua.common.model.dtos.shop.ComShopCartDTO; import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO; @@ -5192,8 +5179,6 @@ */ @PostMapping("/activity/default-praise") R timedTaskActivityDefaultPraise(); /** * 小程序-用户新增话题 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -45,6 +45,8 @@ "w.reject_reason, " + "su.`name` responsible_name, " + "w.score, " + "w.img_width, " + "w.img_height, " + "w.create_at " + "FROM " + "com_act_micro_wish w " + @@ -83,7 +85,7 @@ "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} " + "AND #{comActMicroWishVO.createEnd}" + " </if> " + "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" + "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0 and comActMicroWishVO.status != null and comActMicroWishVO.status != 7'>" + "AND w.status in (3, 5, 6) " + " </if> " + "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" + @@ -105,6 +107,7 @@ "u.name sponsor_name, " + "u.nick_name userNickName, " + "w.create_at, " + "w.aim_num, " + "u.image_url, " + "w.sponsor_phone, " + "w.`status`, " + @@ -126,6 +129,8 @@ "w.feedback_photo_path_list, " + "w.distribution_at, " + "w.evaluate_at, " + "w.img_width, " + "w.img_height, " + "w.evaluate " + "FROM " + "com_act_micro_wish w " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
@@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** @@ -136,6 +137,16 @@ private Integer aimNum; /** * 单张图片宽度 */ private BigDecimal imgWidth; /** * 单张图片高度 */ private BigDecimal imgHeight; /** * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中 */ public interface status{ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -121,16 +121,14 @@ } } //查询反馈列表 if(comActMicroWishVO.getStatus()==5||comActMicroWishVO.getStatus()==6){ List<ComActMicroWishFeedbackVO> list=comActMicroWishFeedbackMapper.selectByWishId(id); if(!list.isEmpty()){ comActMicroWishVO.setFeedbackVOList(list); } List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id); if(!feedList.isEmpty()){ comActMicroWishVO.setFeedbackVOList(feedList); } //查询操作记录 List<ComActMicroWishOperationRecordVO> list=comActMicroWishOperationRecordMapper.getByWishId(id); if(!list.isEmpty()){ comActMicroWishVO.setOperationRecordVOList(list); List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id); if(!operationList.isEmpty()){ comActMicroWishVO.setOperationRecordVOList(operationList); } comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone())); //查询同类型id数组 @@ -204,7 +202,7 @@ comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList); comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId()); comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId()); if(comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){ comActMicroWishDO.setStatus(comActMicroWishVO.getStatus()); } else {
