springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java
@@ -2,22 +2,17 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.PageComStreetDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.community.ComStreetVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * @description: 办事指南管理 @@ -33,7 +28,7 @@ @ApiOperation(value = "办事指南_新增") @PostMapping("addworkguide") public R addStreet(@RequestBody ComActWorkGuideVO workGuideVO) { public R addStreet(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) { LoginUserInfoVO loginUserInfo = getLoginUserInfo(); return communityService.addWorkGuide(workGuideVO,loginUserInfo.getUserId()); } @@ -41,7 +36,7 @@ @PostMapping("editworkguide") @ApiOperation(value = "办事指南_编辑") public R putWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO) { public R putWorkGuide(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) { LoginUserInfoVO loginUserInfo = getLoginUserInfo(); return communityService.editWorkGuide(workGuideVO,loginUserInfo.getUserId()); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -1,13 +1,13 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import com.google.common.collect.Lists; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import org.hibernate.validator.constraints.Length; import java.util.Date; import javax.validation.constraints.NotNull; import java.util.List; /** @@ -21,9 +21,13 @@ private Long id; @ApiModelProperty("办事指南标题") @NotNull(groups = {AddGroup.class}, message = "标题不能为空") @Length(groups = {AddGroup.class}, max = 35) private String title; @ApiModelProperty("办事指南内容") @NotNull(groups = {AddGroup.class}, message = "内容不能为空") @Length(groups = {AddGroup.class}, max = 500) private String content; @ApiModelProperty("办理时间") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -42,8 +42,9 @@ @Select("<script> " + "SELECT * \n" + "FROM\n" + "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" + "FROM \n" + " com_act_message t " + " where t.community_id=#{comActMessageVO.communityId}\n" + "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != ""'>" + " and t.user_account=#{comActMessageVO.userAccount} \n" + " </if> " + springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -415,7 +415,7 @@ /** * 人员详情 * *detailuser * @param userId 用户id * @return 人员详情 */ @@ -1501,7 +1501,7 @@ String idCard = sysUserDO.getIdCard(); if (!ObjectUtils.isEmpty(idCard)) { communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard)); communityUserInfoVO.setBirthday(IdCard.birthDay(idCard)); communityUserInfoVO.setBirthday(sysUserDO.getBirthday()); communityUserInfoVO.setIdCard(idCard); } communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
