From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
index 3baf868..dd9edfa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.vaccines.EnrollUserByAppDTO;
@@ -10,7 +11,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
-import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngVaccinesDAO;
@@ -23,7 +23,9 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @auther lyq
@@ -63,22 +65,25 @@
if(user.getIsUser() == null){
user.setIsUser(2);
}
+ if(StringUtils.isEmpty(user.getJob())){
+ user.setJob("暂无");
+ }
//查询当前用户是否已经报名
ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
- .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId()).eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId()));
+ .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId())
+ .eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId())
+ .eq(ComMngVaccinesEnrollRecordDO::getFamilyUserType,user.getIsUser()));
if(enrollRecordDO != null){
user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.yes);
}else{
user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.no);
}
-
- if(StringUtils.isEmpty(user.getJob())){
- user.setJob("暂无");
- }
-
});
}
- return R.ok(userLists);
+
+ List<VaccinesEnrollUserByAppVO> newUserLists = userLists.stream().sorted(Comparator.comparing(VaccinesEnrollUserByAppVO::getIsEnroll).reversed()
+ .thenComparing(Comparator.comparing(VaccinesEnrollUserByAppVO::getCreateAt).reversed())).collect(Collectors.toList());
+ return R.ok(newUserLists);
}
/**
@@ -130,6 +135,7 @@
vaccinesEnrollRecordDO.setUserId(enrollByAppDTO.getUserId());
vaccinesEnrollRecordDO.setFamilyUserId(userByAppDTO.getUserId());
vaccinesEnrollRecordDO.setType(enrollByAppDTO.getVaccinesId());
+ vaccinesEnrollRecordDO.setCommunityId(enrollByAppDTO.getCommunityId());
vaccinesEnrollRecordDOList.add(vaccinesEnrollRecordDO);
}
}
@@ -144,7 +150,28 @@
* @param vaccinesByAdminDTO 请求参数
* @return 登记列表
*/
+ @Override
public R getVaccinesEnrollListByAdmin(VaccinesEnrollByAdminDTO vaccinesByAdminDTO){
- return R.ok(this.baseMapper.getVaccinesEnrollListByAdmin(new Page<VaccinesEnrollByAdminVO>(vaccinesByAdminDTO.getPageNum(),vaccinesByAdminDTO.getPageSize()),vaccinesByAdminDTO));
+ IPage<VaccinesEnrollByAdminVO> enrollByAdminVOIPage = this.baseMapper.getVaccinesEnrollListByAdmin(new Page<VaccinesEnrollByAdminVO>(vaccinesByAdminDTO.getPageNum(),vaccinesByAdminDTO.getPageSize()),vaccinesByAdminDTO);
+ if(!enrollByAdminVOIPage.getRecords().isEmpty()){
+ for (VaccinesEnrollByAdminVO enroll:enrollByAdminVOIPage.getRecords()) {
+ if(enroll.getIdCard().length() != 18){
+ enroll.setSex(3);
+ }else{
+ enroll.setSex(IdCard.sex(enroll.getIdCard()));
+ }
+ }
+ }
+ return R.ok(enrollByAdminVOIPage);
+ }
+
+ /**
+ * 根据条件导出疫苗登记记录
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 导出登记列表
+ */
+ @Override
+ public R exportVaccinesEnrollListByAdmin(VaccinesEnrollByAdminDTO vaccinesByAdminDTO){
+ return R.ok(this.baseMapper.exportVaccinesEnrollListByAdmin(vaccinesByAdminDTO));
}
}
--
Gitblit v1.7.1