springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -155,7 +155,7 @@ } comActMicroWishVO.setIsApplets(1); comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); return communityService.pageMicroWishApplets(comActMicroWishVO); } @ApiOperation("发布微心愿") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
@@ -35,4 +35,10 @@ @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成") private Integer type; @ApiModelProperty("操作备注") private String remark; @ApiModelProperty("反馈图片") private String imgUrl; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -95,10 +95,10 @@ private String photoPathList; @ApiModelProperty("当前页数") private Long pageNum; private Long pageNum = 1L; @ApiModelProperty("每页记录数") private Long pageSize; private Long pageSize = 10L; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -407,6 +407,16 @@ R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO); /** * 小程序分页查询微心愿 * * @param comActMicroWishVO * 查询参数 * @return 分页集合 */ @PostMapping("pagemicrowish/applets") R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO); /** * 心愿详情 * * @param id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -146,6 +146,8 @@ private ComActActEvaluateService comActActEvaluateService; @Resource private ComEldersAuthElderlyService comEldersAuthElderlyService; @Resource private ComActMicroWishOperationRecordService wishOperationRecordService; /** * 新增社区活动 @@ -821,6 +823,11 @@ return comActMicroWishService.pageMicroWish(comActMicroWishVO); } @PostMapping("pagemicrowish/applets") public R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO) { return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO); } /** * 心愿详情 * @@ -906,6 +913,8 @@ BeanUtils.copyProperties(comActMicroWishVO, comActMicroWishDO); boolean save = comActMicroWishService.save(comActMicroWishDO); if (save) { wishOperationRecordService.addOperationRecord("用户提交微心愿",comActMicroWishVO.getSponsorId() ,comActMicroWishDO.getId(),ComActMicroWishOperationRecordDO.type.ytj,"用户提交微心愿",null); return R.ok(); } return R.fail(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -104,6 +104,8 @@ "ORDER BY w.create_at desc "+ "</script>") IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO); IPage<ComActMicroWishVO> pageMicroWishApplets(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO); @Select("SELECT " + "w.id, " + "u.name sponsor_name, " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java
@@ -24,6 +24,7 @@ * @param wishId 微心愿id * @param type 操作类型 * @param remark 操作备注 * @param imgUrl 反馈图片 */ void addOperationRecord(String content,Long userId,Long wishId,Integer type,String remark); void addOperationRecord(String content,Long userId,Long wishId,Integer type,String remark,String imgUrl); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java
@@ -25,6 +25,8 @@ */ R pageMicroWish(ComActMicroWishVO comActMicroWishVO); R pageMicroWishApplets(ComActMicroWishVO comActMicroWishVO); /** * 心愿详情 * springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.service.impl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO; import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; @@ -33,9 +34,10 @@ * @param wishId 微心愿id * @param type 操作类型 * @param remark 操作备注 * @param imgUrl 反馈图片 */ @Override public void addOperationRecord(String content,Long userId,Long wishId,Integer type,String remark){ public void addOperationRecord(String content,Long userId,Long wishId,Integer type,String remark,String imgUrl){ ComActMicroWishOperationRecordDO wishOperationRecordDO = new ComActMicroWishOperationRecordDO(); wishOperationRecordDO.setWishId(wishId); wishOperationRecordDO.setUserId(userId); @@ -43,6 +45,9 @@ wishOperationRecordDO.setRemark(remark); wishOperationRecordDO.setContent(content); wishOperationRecordDO.setCreateTime(new Date()); if(StringUtils.isNotEmpty(imgUrl)){ wishOperationRecordDO.setImgUrl(imgUrl); } this.baseMapper.insert(wishOperationRecordDO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -22,6 +22,7 @@ import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO; import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO; import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; import com.panzhihua.service_community.service.ComActMicroWishService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,6 +51,8 @@ private ComActMicroWishFeedbackMapper comActMicroWishFeedbackMapper; @Resource private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper; @Resource private ComActMicroWishOperationRecordService wishOperationRecordService; /** * 分页查询微心愿 * @@ -72,6 +75,31 @@ page.setCurrent(pageNum); IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO); List<ComActMicroWishVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActMicroWishVO1 -> { if(userId != null){ Long id = comActMicroWishVO1.getId(); ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id) .eq(ComActMicroWishUserDO::getUserId, userId)); if (ObjectUtils.isEmpty(comActMicroWishUserDO)) { comActMicroWishVO1.setHaveGiveThumbsUp(0); } else { comActMicroWishVO1.setHaveGiveThumbsUp(1); } } comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone())); }); iPage.setRecords(records); } return R.ok(iPage); } @Override public R pageMicroWishApplets(ComActMicroWishVO comActMicroWishVO) { Long userId = comActMicroWishVO.getResponsibleId(); IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWishApplets(new Page(comActMicroWishVO.getPageNum() ,comActMicroWishVO.getPageSize()), comActMicroWishVO); List<ComActMicroWishVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActMicroWishVO1 -> { @@ -178,6 +206,7 @@ comActMicroWishDO.setStatus(7);//集心中 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.sh); comActMicroWishOperationRecordDO.setContent("审核通过"); comActMicroWishOperationRecordDO.setRemark("微心愿审核通过"); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 2: @@ -190,6 +219,7 @@ comActMicroWishDO.setStatus(4);//驳回 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.bh); comActMicroWishOperationRecordDO.setContent(rejectReason); comActMicroWishOperationRecordDO.setRemark("微心愿审核未通过"); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 3: @@ -198,6 +228,12 @@ comActMicroWishDO.setResponsibleId(responsibleId); comActMicroWishDO.setStatus(3);//进行中 comActMicroWishDO.setForm(1); //添加操作记录 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp); comActMicroWishOperationRecordDO.setContent("分配心愿"); comActMicroWishOperationRecordDO.setRemark("分配心愿"); comActMicroWishOperationRecordDO.setUserId(responsibleId); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 4: isUpdate = true; @@ -205,6 +241,12 @@ comActMicroWishDO.setResponsibleId(responsibleId); comActMicroWishDO.setStatus(3);//待确认 comActMicroWishDO.setForm(2); //添加操作记录 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fp); comActMicroWishOperationRecordDO.setContent("分配心愿"); comActMicroWishOperationRecordDO.setRemark("分配心愿"); comActMicroWishOperationRecordDO.setUserId(responsibleId); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 5: if(comActMicroWishVO.getFeedback().length() > 200){ @@ -217,12 +259,26 @@ comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList); comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId()); comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId()); if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.dqr)){ isUpdate = true; comActMicroWishDO.setStatus(ComActMicroWishDO.status.ywc); comActMicroWishDO.setStatus(ComActMicroWishDO.status.dqr); comActMicroWishDO.setFinishAt(date); comActMicroWishDO.setFinish(feedback); comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList); //添加操作记录 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk); comActMicroWishOperationRecordDO.setContent(feedback); comActMicroWishOperationRecordDO.setRemark("心愿已完成"); comActMicroWishOperationRecordDO.setImgUrl(feedbackPhotoPathList); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); }else{ //添加操作记录 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk); comActMicroWishOperationRecordDO.setContent(feedback); comActMicroWishOperationRecordDO.setRemark("社区反馈"); comActMicroWishOperationRecordDO.setImgUrl(feedbackPhotoPathList); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); } // else { // comActMicroWishDO.setStatus(3); @@ -274,6 +330,10 @@ comActMicroWishDO.setStatus(ComActMicroWishDO.status.dfp); comActMicroWishDO.setFeedbackAt(DateUtil.date()); comActMicroWishDAO.updateById(comActMicroWishDO); //完成集心添加操作记录 wishOperationRecordService.addOperationRecord("完成集心",comActMicroWishDO.getSponsorId() ,comActMicroWishDO.getId(),ComActMicroWishOperationRecordDO.type.jx,"用户完成集心",null); } return R.ok(); } @@ -295,8 +355,8 @@ return R.fail("心愿不存在"); } Integer status = comActMicroWishDO1.getStatus(); if (!status.equals(ComActMicroWishDO.status.ywc)) { return R.fail("心愿状态不是已完成状态"); if (!status.equals(ComActMicroWishDO.status.dqr)) { return R.fail("心愿状态不是待确认状态"); } ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO(); comActMicroWishDO.setId(comActMicroWishVO.getId()); @@ -306,6 +366,9 @@ comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate()); int update = comActMicroWishDAO.updateById(comActMicroWishDO); if (update>0) { //用户确认心愿添加操作记录 wishOperationRecordService.addOperationRecord(comActMicroWishVO.getEvaluate(),comActMicroWishDO1.getSponsorId() ,comActMicroWishDO1.getId(),ComActMicroWishOperationRecordDO.type.wc,"用户已确认",null); return R.ok(); } return R.fail(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
New file @@ -0,0 +1,95 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.service_community.dao.ComActMicroWishDAO"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActMicroWishDO"> <id column="id" property="id" /> <result column="sponsor_id" property="sponsorId" /> <result column="sponsor_phone" property="sponsorPhone" /> <result column="wish_name" property="wishName" /> <result column="status" property="status" /> <result column="form" property="form" /> <result column="responsible_id" property="responsibleId" /> <result column="create_at" property="createAt" /> <result column="examine_at" property="examineAt" /> <result column="distribution_at" property="distributionAt" /> <result column="feedback_at" property="feedbackAt" /> <result column="evaluate_at" property="evaluateAt" /> <result column="score" property="score" /> <result column="detail" property="detail" /> <result column="photo_path_list" property="photoPathList" /> <result column="community_id" property="communityId" /> <result column="evaluate" property="evaluate" /> <result column="finish_at" property="finishAt" /> <result column="finish_photo_path_list" property="finishPhotoPathList" /> <result column="finish" property="finish" /> <result column="reject_reason" property="rejectReason" /> <result column="feedback" property="feedback" /> <result column="feedback_photo_path_list" property="feedbackPhotoPathList" /> <result column="aim_num" property="aimNum" /> <result column="img_width" property="imgWidth" /> <result column="img_height" property="imgHeight" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, sponsor_id, sponsor_phone, wish_name, status, form, responsible_id, create_at, examine_at, distribution_at, feedback_at, evaluate_at, score, detail, photo_path_list, community_id, evaluate, finish_at, finish_photo_path_list, finish, reject_reason, feedback, feedback_photo_path_list, aim_num, img_width, img_height </sql> <select id="pageMicroWishApplets" parameterType="com.panzhihua.common.model.vos.community.ComActMicroWishVO" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO"> SELECT w.id, u.name sponsor_name, u.nick_name userNickName, u.image_url , w.sponsor_phone, w.wish_name, w.`status`, w.`feedback_at`, w.`examine_at`, w.`distribution_at`, w.`evaluate_at`, w.`photo_path_list`, count(wu.id)star_num, w.`detail`, w.form, w.reject_reason, su.`name` responsible_name, w.score, w.img_width, w.finish_at, w.aim_num, w.img_height, w.create_at FROM com_act_micro_wish w left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id left JOIN sys_user u ON w.sponsor_id = u.user_id left JOIN com_pb_service_team su ON w.responsible_id = su.id <where> <if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'> and w.community_id=#{comActMicroWishVO.communityId} </if> <if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'> AND w.`status` in (2,3) </if> <if test='comActMicroWishVO.status == 6 and comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'> AND w.`status` in (5,6) </if> <if test='comActMicroWishVO.status == 7 and comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'> AND w.`status` = 7 </if> <if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0 and comActMicroWishVO.status != null and comActMicroWishVO.status != 7 and comActMicroWishVO.status != 6 and comActMicroWishVO.status != 3'> AND w.status in (3, 5, 6) </if> <if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'> AND w.sponsor_id =#{comActMicroWishVO.userId} </if> </where> group by w.id ORDER BY w.create_at desc </select> </mapper>
