springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java
New file @@ -0,0 +1,37 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data @ApiModel public class ComActMicroWishFeedbackVO { /** * 反馈内容 */ @ApiModelProperty("反馈内容") private String content; /** * 反馈图片 */ @ApiModelProperty("反馈图片") private String imgUrl; /** * 反馈时间 */ @ApiModelProperty("反馈时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date creatTime; /** * 反馈人 */ @ApiModelProperty("反馈人") private String name; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
New file @@ -0,0 +1,38 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; @Data @ApiModel public class ComActMicroWishOperationRecordVO { /** * 操作内容 */ @ApiModelProperty("操作内容") private String content; /** * 人员姓名 */ @ApiModelProperty("人员姓名") private String name; /** * 创建时间 */ @ApiModelProperty("记录时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** * 操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 */ @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -9,6 +9,7 @@ import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -42,7 +43,7 @@ @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空") private String wishName; @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成") @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中") private Integer status; @ApiModelProperty("集星数") @@ -141,5 +142,13 @@ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true) private Integer isPageMyWish; @ApiModelProperty(value = "预约社区集心数") private Integer aimNum; @ApiModelProperty(value = "反馈列表") private List<ComActMicroWishFeedbackVO> feedbackVOList; @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取") private List<ComActMicroWishOperationRecordVO> operationRecordVOList; }
New file @@ -0,0 +1,34 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; import com.panzhihua.service_community.service.ComActMicroWishService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * @auther lyq * @create 2021-08-27 10:28:04 * @describe 前端控制器 */ @RestController @RequestMapping("/comActMicroWishOperationRecord") public class ComActMicroWishOperationRecordApi { @Resource private ComActMicroWishOperationRecordService comActMicroWishOperationRecordService; /** * 根据心愿id查询操作记录 * @param id * @return */ @GetMapping("/getByWishId") public R getByWishId(@RequestParam("id") Long id){ return comActMicroWishOperationRecordService.getByWishId(id); } }
@@ -126,7 +126,8 @@ "w.feedback_photo_path_list, " + "w.distribution_at, " + "w.evaluate_at, " + "w.evaluate " + "w.evaluate, " + "w.aim_num " + "FROM " + "com_act_micro_wish w " + "JOIN sys_user u ON w.sponsor_id = u.user_id " + @@ -213,4 +214,5 @@ "ORDER BY camw.create_at desc "+ " </script>") IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java
New file @@ -0,0 +1,23 @@ package com.panzhihua.service_community.dao; import com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO; import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * @auther lyq * @create 2021-08-26 14:26:50 * @describe mapper类 */ @Mapper public interface ComActMicroWishFeedbackMapper extends BaseMapper<ComActMicroWishFeedbackDO> { /** * 根据心愿Id查询反馈列表 * @param id * @return */ List<ComActMicroWishFeedbackVO> selectByWishId(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java
New file @@ -0,0 +1,23 @@ package com.panzhihua.service_community.dao; import com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO; import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * @auther lyq * @create 2021-08-27 10:28:04 * @describe mapper类 */ @Mapper public interface ComActMicroWishOperationRecordMapper extends BaseMapper<ComActMicroWishOperationRecordDO> { /** * 根据心愿Id查询操作记录 * @param id * @return */ List<ComActMicroWishOperationRecordVO> getByWishId(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java
@@ -12,4 +12,5 @@ **/ @Mapper public interface ComActMicroWishUserDAO extends BaseMapper<ComActMicroWishUserDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
@@ -40,7 +40,7 @@ /** * 状态 * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中 */ private Integer status; @@ -130,5 +130,22 @@ * 反馈图片集合，逗号分隔 */ private String feedbackPhotoPathList; /** * 目标集心数 */ private Integer aimNum; /** * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中 */ public interface status{ int dsh=1; int dfp=2; int jxz=3; int ybh=4; int dqr=5; int ywc=6; int jx=7; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java
New file @@ -0,0 +1,62 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import lombok.Data; /** * @auther lyq * @create 2021-08-26 14:26:50 * @describe 实体类 */ @Data @TableName("com_act_micro_wish_feedback") public class ComActMicroWishFeedbackDO implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.AUTO) private Integer id; /** * 微心愿Id */ private Long microId; /** * 用户id */ private Long userId; /** * 反馈内容 */ private String content; /** * 反馈图片 */ private String imgUrl; /** * 反馈时间 */ private Date creatTime; @Override public String toString() { return "ComActMicroWishFeedbackDO{" + "id=" + id + ", microId=" + microId + ", userId=" + userId + ", content=" + content + ", imgUrl=" + imgUrl + ", creatTime=" + creatTime + "}"; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
New file @@ -0,0 +1,77 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import lombok.Data; /** * @auther lyq * @create 2021-08-27 10:28:04 * @describe 实体类 */ @Data @TableName("com_act_micro_wish_operation_record") public class ComActMicroWishOperationRecordDO implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.AUTO) private Integer id; /** * 操作内容 */ private String content; /** * 人员id */ private Long userId; /** * 心愿Id */ private Long wishId; /** * 创建时间 */ private Date createTime; /** *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 */ private Integer type; @Override public String toString() { return "ComActMicroWishOperationRecordDO{" + "id=" + id + ", content='" + content + '\'' + ", userId=" + userId + ", wishId=" + wishId + ", createTime=" + createTime + ", type=" + type + '}'; } /** *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 */ public interface type{ int ytj=1; int sh=2; int bh=3; int jx=4; int fp=5; int wc=6; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO; import com.baomidou.mybatisplus.extension.service.IService; /** * @auther lyq * @create 2021-08-27 10:28:04 * @describe 服务类 */ public interface ComActMicroWishOperationRecordService extends IService<ComActMicroWishOperationRecordDO> { /** * 根据心愿id查询操作记录 * @param id * @return */ R getByWishId(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java
New file @@ -0,0 +1,27 @@ package com.panzhihua.service_community.service.impl; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO; import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * @auther lyq * @create 2021-08-27 10:28:04 * @describe 服务实现类 */ @Slf4j @Service public class ComActMicroWishOperationRecordServiceImpl extends ServiceImpl<ComActMicroWishOperationRecordMapper, ComActMicroWishOperationRecordDO> implements ComActMicroWishOperationRecordService { @Resource private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper; @Override public R getByWishId(Long id) { return R.ok(comActMicroWishOperationRecordMapper.getByWishId(id)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -7,20 +7,28 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO; import com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.common.model.vos.community.screen.work.MicroListVO; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.service_community.dao.ComActMicroWishDAO; import com.panzhihua.service_community.dao.ComActMicroWishFeedbackMapper; import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper; import com.panzhihua.service_community.dao.ComActMicroWishUserDAO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; 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.ComActMicroWishService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -37,7 +45,10 @@ private ComActMicroWishDAO comActMicroWishDAO; @Resource private ComActMicroWishUserDAO comActMicroWishUserDAO; @Resource private ComActMicroWishFeedbackMapper comActMicroWishFeedbackMapper; @Resource private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper; /** * 分页查询微心愿 * @@ -108,6 +119,18 @@ comActMicroWishVO.setHaveGiveThumbsUp(1); } } //查询反馈列表 if(comActMicroWishVO.getStatus()==5||comActMicroWishVO.getStatus()==6){ List<ComActMicroWishFeedbackVO> list=comActMicroWishFeedbackMapper.selectByWishId(id); if(!list.isEmpty()){ comActMicroWishVO.setFeedbackVOList(list); } } //查询操作记录 List<ComActMicroWishOperationRecordVO> list=comActMicroWishOperationRecordMapper.getByWishId(id); if(!list.isEmpty()){ comActMicroWishVO.setOperationRecordVOList(list); } comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone())); return R.ok(comActMicroWishVO); } @@ -119,6 +142,7 @@ * @return 操作结果 */ @Override @Transactional public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) { Long id = comActMicroWishVO.getId(); int type = comActMicroWishVO.getType().intValue(); @@ -129,16 +153,27 @@ ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO(); comActMicroWishDO.setId(id); Date date = new Date(); ComActMicroWishOperationRecordDO comActMicroWishOperationRecordDO=new ComActMicroWishOperationRecordDO(); comActMicroWishOperationRecordDO.setCreateTime(date); comActMicroWishOperationRecordDO.setUserId(comActMicroWishVO.getUserId()); comActMicroWishOperationRecordDO.setWishId(comActMicroWishVO.getId()); // 1 审核通过 2驳回 3分配人员 4发起活动 5反馈 switch (type){ case 1: comActMicroWishDO.setExamineAt(date); comActMicroWishDO.setStatus(2);//待分配 comActMicroWishDO.setAimNum(comActMicroWishVO.getAimNum()); comActMicroWishDO.setStatus(7);//集心中 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.sh); comActMicroWishOperationRecordDO.setContent("审核通过"); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 2: comActMicroWishDO.setExamineAt(date); comActMicroWishDO.setRejectReason(rejectReason); comActMicroWishDO.setStatus(4);//驳回 comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.bh); comActMicroWishOperationRecordDO.setContent("审核未通过"); comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO); break; case 3: comActMicroWishDO.setDistributionAt(date); @@ -156,13 +191,15 @@ if(comActMicroWishVO.getFeedback().length() > 200){ return R.fail("反馈字数不得超过200字"); } comActMicroWishDO.setFeedbackAt(date); comActMicroWishDO.setStatus(5);//待确认 comActMicroWishDO.setFeedback(feedback); comActMicroWishDO.setFinish(feedback); comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList); comActMicroWishDO.setFinishAt(date); comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList); //新增反馈记录 ComActMicroWishFeedbackDO comActMicroWishFeedbackDO=new ComActMicroWishFeedbackDO(); comActMicroWishFeedbackDO.setCreatTime(date); comActMicroWishFeedbackDO.setContent(feedback); comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList); comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId()); comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId()); comActMicroWishDO.setStatus(5); comActMicroWishFeedbackMapper.insert(comActMicroWishFeedbackDO); break; default: break; @@ -181,33 +218,36 @@ * @return 操作结果 */ @Override @Transactional(rollbackFor = Exception.class) public R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO) { Integer haveGiveThumbsUp = comActMicroWishVO.getHaveGiveThumbsUp(); Long userId = comActMicroWishVO.getSponsorId(); Long microWishId = comActMicroWishVO.getId(); ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId)); boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO); int num=0; if (haveGiveThumbsUp.intValue()==1) { if (empty) { ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO(); comActMicroWishUserDO1.setMicroWishId(microWishId); comActMicroWishUserDO1.setUserId(userId); num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1); }else{ return R.ok(); } }else { if (empty) { return R.ok(); } else { num= comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId()); //查询微心愿集心数并判断修改微心愿状态 ComActMicroWishDO comActMicroWishDO=comActMicroWishDAO.selectById(microWishId); Integer count=comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId)); if(comActMicroWishDO!=null&&comActMicroWishDO.getAimNum()!=null&&count<comActMicroWishDO.getAimNum()){ if(comActMicroWishDO.getStatus()==ComActMicroWishDO.status.jx){ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId)); boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO); int num=0; if (empty) { ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO(); comActMicroWishUserDO1.setMicroWishId(microWishId); comActMicroWishUserDO1.setUserId(userId); num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1); }else{ return R.fail("无法重新点心"); } if (num>0) { if(count>=comActMicroWishDO.getAimNum()-1){ comActMicroWishDO.setStatus(ComActMicroWishDO.status.dfp); comActMicroWishDAO.updateById(comActMicroWishDO); } return R.ok(); } } } if (num>0) { return R.ok(); } return R.fail(); return R.fail("该微心愿不可点心"); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml
New file @@ -0,0 +1,24 @@ <?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.ComActMicroWishFeedbackMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO"> <id column="id" property="id"/> <result column="micro_id" property="microId"/> <result column="user_id" property="userId"/> <result column="content" property="content"/> <result column="img_url" property="imgUrl"/> <result column="creat_time" property="creatTime"/> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id , micro_id, user_id, content, img_url, creat_time </sql> <select id="selectByWishId" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO"> select t.*,t1.name from com_act_micro_wish_feedback t left join sys_user t1 on t.user_id =t1.user_id where t.wish_id =#{id} order_by t.create_time desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml
New file @@ -0,0 +1,24 @@ <?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.ComActMicroWishOperationRecordMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO"> <id column="id" property="id" /> <result column="content" property="content" /> <result column="user_id" property="userId" /> <result column="wish_id" property="wishId" /> <result column="create_time" property="createTime" /> <result column="type" property="type"/> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, content, user_id, wish_id, create_time </sql> <select id="getByWishId" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO"> select t.*,t1.name from com_act_micro_wish_operation_record t left join sys_user t1 on t.user_id =t1.user_id where t.wish_id =#{id} order by t.create_time desc </select> </mapper>
