springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; /** * 高领老人分页查询条件 * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * */ @Data @ApiModel("高领老人分页查询条件") public class PageEldersAuthHistoryDTO { @ApiModelProperty(value = "月份") private Integer month; @ApiModelProperty(value = "分页-当前页数,默认1", example = "1") private Long pageNum = 1L; @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10") private Long pageSize = 10L; @ApiModelProperty(value = "社区ID", hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryVO.java
New file @@ -0,0 +1,39 @@ 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; /** * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * @date 2021-06-09 * */ @Data @ApiModel("高龄老人报表记录返回参数") public class ComEldersAuthHistoryVO { @ApiModelProperty(value = "主键id") private Long id; @ApiModelProperty(value = "年份") private Integer year; @ApiModelProperty(value = "月份") private Integer month; @ApiModelProperty(value = "高龄老人总人数") private Integer sum; @ApiModelProperty(value = "已认证人数") private Integer authSum; @ApiModelProperty(value = "未认证人数") private Integer noAuthSum; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -630,6 +630,18 @@ return dateString; } /** * 获取当前月第一天 * @return */ public static Date getFirstDayOfMonth() { Calendar cal = Calendar.getInstance(); cal.add(Calendar.MONTH,0); int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH); cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00); return cal.getTime(); } @@ -638,6 +650,7 @@ // Date date= new Date(); // Date after = new Date(); // System.out.println(calTimeDifference(date,after)); System.out.println(getFirstDayOfMonth()); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthHistoryApi.java
New file @@ -0,0 +1,43 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO; import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/elders/history") @Api(tags = {"高龄老人报表模块"}) public class EldersAuthHistoryApi { @Resource private CommunityService communityService; /** * 高领老人列表 * @param pageEldersAuthElderlyDTO * @return */ @PostMapping("/page") @ApiOperation(value = "分页查询老人报表记录", response = ComEldersAuthHistoryVO.class) public R query(@Validated @RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){ // return communityService.pageQueryEldersAuthHistory(pageEldersAuthElderlyDTO); return null; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthHistoryRecordDO.java
@@ -34,6 +34,10 @@ */ private Long userId; /** * 认证记录id 列：auth_id */ private Long authId; /** * 名称 列: name */ private String name; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -19,6 +19,7 @@ import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.*; @@ -53,6 +54,8 @@ private ComEldersAuthElderlyMapper comEldersAuthElderlyMapper; @Resource private SysConfMapper sysConfDao; @Resource private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper; /** * 新增高龄认证 @@ -256,6 +259,22 @@ this.baseMapper.insert(eldersAuthDO); //认证成功 添加认证记录 ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>() .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,eldersAuthDO.getIdCard()).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth())); if(authHistoryRecordDO == null){ authHistoryRecordDO = new ComEldersAuthHistoryRecordDO(); authHistoryRecordDO.setUserId(authGetResultDTO.getAuthUserId()); authHistoryRecordDO.setAuthId(eldersAuthDO.getId()); BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO); authHistoryRecordDO.setId(null); authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(eldersAuthDO.getIdCard()))); authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard())); authHistoryRecordDO.setIsAuth(1); authHistoryRecordDO.setDomicile(domicile); comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO); } authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes); comEldersAuthUserMapper.updateById(authUserDO);
