springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
@@ -32,7 +32,7 @@ /** * 操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 */ @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成") @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8自动确认") private Integer type; @ApiModelProperty("操作备注") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -745,7 +745,7 @@ Long communityId = loginUserInfo.getCommunityId(); Long userId = loginUserInfo.getUserId(); comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setBackUserId(userId); // comActMicroWishVO.setBackUserId(userId); comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -11,6 +11,8 @@ import javax.annotation.Resource; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.*; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -86,34 +88,6 @@ import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.model.dos.ComActActEvaluateDO; import com.panzhihua.service_community.model.dos.ComActActPrizeDO; import com.panzhihua.service_community.model.dos.ComActDynDO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO; import com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO; import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO; import com.panzhihua.service_community.model.dos.ComMngStructAreaDO; import com.panzhihua.service_community.model.dos.EldersAuthDO; import com.panzhihua.service_community.service.ComActActEvaluateService; import com.panzhihua.service_community.service.ComActActPrizeService; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDynService; import com.panzhihua.service_community.service.ComActEasyPhotoActivityService; import com.panzhihua.service_community.service.ComActEasyPhotoService; import com.panzhihua.service_community.service.ComActMessageService; import com.panzhihua.service_community.service.ComActMicroWishService; import com.panzhihua.service_community.service.ComActQuestnaireService; import com.panzhihua.service_community.service.ComActService; import com.panzhihua.service_community.service.ComEldersAuthElderlyService; import com.panzhihua.service_community.service.ComEldersAuthUserService; import com.panzhihua.service_community.service.ComMngStructAreaDistrictService; import com.panzhihua.service_community.service.ComMngStructAreaService; import com.panzhihua.service_community.service.ComMngStructHouseService; import com.panzhihua.service_community.service.ComMngStructOtherBuildService; import com.panzhihua.service_community.service.ComMngVolunteerMngService; import com.panzhihua.service_community.service.EldersAuthService; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; @@ -939,7 +913,7 @@ boolean save = comActMicroWishService.save(comActMicroWishDO); if (save) { wishOperationRecordService.addOperationRecord("用户提交微心愿",comActMicroWishVO.getSponsorId() ,comActMicroWishDO.getId(),ComActMicroWishOperationRecordDO.type.ytj,"用户提交微心愿",null); ,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
@@ -43,7 +43,7 @@ "w.`detail`, " + "w.form, " + "w.reject_reason, " + "su.`name` responsible_name, " + "su1.`name` responsible_name, " + "w.score, " + "w.img_width, " + "w.finish_at, " + @@ -58,11 +58,11 @@ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " + " </if> " + "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" + "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " + "LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id " + " </if> " + "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" + " JOIN com_pb_service_team su ON w.responsible_id = su.id " + "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " + " JOIN sys_user su1 ON w.responsible_id = su1.user_id " + "AND su1.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " + " </if> " + " <where>" + "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
@@ -48,7 +48,7 @@ private Date createTime; /** *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 */ private Integer type; @@ -74,7 +74,7 @@ '}'; } /** *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 */ public interface type{ int ytj=1; @@ -84,5 +84,6 @@ int fp=5; int wc=6; int fk=7; int zd=8; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -405,6 +405,8 @@ List<Long> wishIds = comActMicroWishDAO.getWishAutoConfirmIds(); wishIds.forEach(wishId -> { //需要添加操作记录 wishOperationRecordService.addOperationRecord("系统自动确认微心愿",null ,wishId, ComActMicroWishOperationRecordDO.type.zd,"系统自动确认微心愿",null); }); int num=comActMicroWishDAO.updateStatusAutoConfirm(); log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
