From 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 13 九月 2021 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
index 4344379..0853990 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -6,12 +6,12 @@
import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
-import com.panzhihua.service_community.service.ComElderAuthRecordsService;
-import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
+import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,13 +20,10 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
-import com.panzhihua.service_community.service.ComEldersAuthUserService;
-import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
@@ -50,6 +47,8 @@
private ComEldersAuthElderlyService comEldersAuthElderlyService;
@Resource
private ComElderAuthRecordsService comElderAuthRecordsService;
+ @Resource
+ private ComPensionAuthRecordService comPensionAuthRecordService;
@PostMapping("/getAuth")
public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -268,4 +267,139 @@
return comElderAuthRecordsService.getElderAuthRecordsByIds(ids);
}
+ /**
+ * 批量导入高龄老人线下认证记录 listSaveElderAuthRecordExcelVO 批量导入高龄老人线下认证记录
+ * @param list 高龄老人线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("/authRecords/underLine/import")
+ public R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comElderAuthRecordsService.listSaveElderAuthRecordExcelVO(list, communityId, userId);
+ }
+
+ /**
+ * 导出高龄认证记录 exportElderAuthRecordsStatistic 导出高龄认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/statistic/export")
+ public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
+ return comElderAuthRecordsService.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO);
+ }
+
+ /**
+ * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 14:03
+ */
+ @PostMapping("/pensionAuthRecords/page")
+ public R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
+ return comPensionAuthRecordService.pagePensionAuthRecords(pageElderAuthRecordsDTO);
+ }
+
+ /**
+ * 根据养老认证记录id查询详情 detailPensionAuthRecords 根据养老认证记录id查询详情
+ * @param authRecordId 养老认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @GetMapping("/pensionAuthRecords/detail")
+ public R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId) {
+ return comPensionAuthRecordService.detailPensionAuthRecords(authRecordId);
+ }
+
+ /**
+ * 养老认证审核 examinePensionAuthRecords 养老认证审核
+ * @param comPensionAuthRecordVO 养老认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @PostMapping("/pensionAuthRecords/examine")
+ public R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) {
+ return comPensionAuthRecordService.examinePensionAuthRecords(comPensionAuthRecordVO);
+ }
+
+ /**
+ * 养老认证标记 signPensionAuthRecords 养老认证标记
+ * @param comPensionAuthRecordVO 养老认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/pensionAuthRecords/sign")
+ public R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) {
+ return comPensionAuthRecordService.signPensionAuthRecords(comPensionAuthRecordVO);
+ }
+
+ /**
+ * 根据养老认证记录id批量查询 getPensionAuthRecordsByIds 根据养老认证记录id批量查询
+ * @param ids 养老认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/pensionAuthRecords/getList")
+ public R getPensionAuthRecordsByIds(@RequestBody List<Long> ids){
+ return comPensionAuthRecordService.getPensionAuthRecordsByIds(ids);
+ }
+
+ /**
+ * 批量导入养老线下认证记录 listSavePensionAuthRecordExcelVO 批量导入养老线下认证记录
+ * @param list 养老线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/08 10:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("/pensionAuthRecords/underLine/import")
+ R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comPensionAuthRecordService.listSavePensionAuthRecordExcelVO(list, communityId, userId);
+ }
+
+ /**
+ * 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/pensionAuthRecords/statistic/export")
+ public R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
+ return comPensionAuthRecordService.exportPensionAuthRecordsStatistic(pageElderAuthRecordsDTO);
+ }
+
+ /**
+ * 定时任务每月1号0点统计高龄老人本期应该认证总人数
+ * @return 执行结果
+ */
+ @PostMapping("/authRecords/statistics")
+ public R timedTaskElderAuthStatisticsJobHandler(){
+ return comElderAuthRecordsService.timedTaskElderAuthStatisticsJobHandler();
+ }
+
+ /**
+ * 定时任务每年3月1号0点统计养老认证本期应该认证总人数
+ * @return 执行结果
+ */
+ @PostMapping("/pensionAuthRecords/statistics")
+ R timedTaskPensionAuthStatisticsJobHandler(){
+ return comPensionAuthRecordService.timedTaskPensionAuthStatisticsJobHandler();
+ }
+
+
}
--
Gitblit v1.7.1