bug修复

huanghongfa

2021-09-28 5c936bc6e4d3827515ac67dc438a319aea1017f3

bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -26,6 +26,7 @@
    private static DateTimeFormatter format_ymdhmssss = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
    private static DateTimeFormatter format_ymds = DateTimeFormatter.ofPattern("yyyyMMdd");
    private static DateTimeFormatter format_yms = DateTimeFormatter.ofPattern("yyyyMM");
    private static DateTimeFormatter format_y = DateTimeFormatter.ofPattern("yyyy");

    /**
     * 将日期对象格式化成指定的字符串格式
@@ -901,4 +902,13 @@
        String nowtime = getCurrentDate().format(format_yms);
        return nowtime;
    }

    /**
     * 获取当前年字符串
     * @return
     */
    public static String getCurrentDateString_YYYY() {
        String nowtime = getCurrentDate().format(format_y);
        return nowtime;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthHistoryRecordDO.java

@@ -137,6 +137,14 @@
     */
    private Long approverId;

    /**
     * 本期是否已认证（1.是 2.否）
     */
    public interface isAuth{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComPensionAuthHistoryRecordDO{" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java

@@ -106,6 +106,13 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        try {
            //关键词为空时需要进行加密，通过加密去检索身份证号筛选高龄认证记录
            String idCard = AESUtil.encrypt128(pageElderAuthRecordsDTO.getSearchKey(), aesKey);
            pageElderAuthRecordsDTO.setIdCard(idCard);
        }catch (Exception e){
            log.error("查询高龄认证记录转换身份证号失败");
        }
        IPage<ComPensionAuthRecordVO> iPage = comPensionAuthRecordDAO.pagePensionAuthRecords(page, pageElderAuthRecordsDTO);
        if (!iPage.getRecords().isEmpty()) {
            iPage.getRecords().forEach(comPensionAuthRecordVO -> {
@@ -375,14 +382,9 @@
                comPensionAuthStatisticsDO.setSum(comPensionAuthPensionerDOS.size());
            }
            comPensionAuthStatisticsDAO.insert(comPensionAuthStatisticsDO);
            //上期已认证人数
            int authSum = comPensionAuthPensionerDAO.havePensionAuthPensionerAmount(act.getCommunityId(), String.valueOf(year - 1));
            ComPensionAuthStatisticsDO comPensionAuthStatisticsDO1 = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>()
                    .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, act.getCommunityId()).eq(ComPensionAuthStatisticsDO::getYear, year - 1));
            comPensionAuthStatisticsDO1.setAuthSum(authSum);
            comPensionAuthStatisticsDO1.setNoAuthSum(comPensionAuthStatisticsDO1.getSum() - comPensionAuthStatisticsDO1.getAuthSum());
            comPensionAuthStatisticsDAO.updateById(comPensionAuthStatisticsDO1);
        });


        return R.ok();
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java

@@ -71,6 +71,12 @@
    private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
    @Resource
    private ComPensionAuthHistoryRecordMapper comPensionAuthHistoryRecordMapper;
    @Resource
    private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
    @Resource
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;

    @Value("${domain.aesKey:}")
    private String aesKey;
@@ -573,21 +579,41 @@
    public R timedTaskEldersRecordAuthJobHandler(){
        Date nowDate = new Date();

        String authPeriod = DateUtils.getCurrentDateString_YYYY_MM();
        //高龄认证本期期数
        String elderAuthPeriod = DateUtils.getCurrentDateString_YYYY_MM();
        //养老认证本期期数
        String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();

        //养老认证本期期数
        //查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
        List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
        authElderliesList.forEach(authElderlies -> {
            //查询高龄认证记录
            ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                    .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authElderlies.getId())
                    .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authPeriod));
                    .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,elderAuthPeriod));
            if(authHistoryRecordDO == null){
                authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                BeanUtils.copyProperties(authElderlies,authHistoryRecordDO);
                authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.no);
                authHistoryRecordDO.setElderliesId(authElderlies.getId());
                authHistoryRecordDO.setAuthPeriod(authPeriod);
                authHistoryRecordDO.setAuthPeriod(elderAuthPeriod);
                authHistoryRecordDO.setCreateAt(nowDate);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }

            //查询养老认证记录
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
                    .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authElderlies.getId())
                    .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,pensionAuthPeriod));
            if(pensionAuthDO == null){
                pensionAuthDO = new ComPensionAuthHistoryRecordDO();
                BeanUtils.copyProperties(authElderlies,pensionAuthDO);
                pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.no);
                pensionAuthDO.setElderliesId(authElderlies.getId());
                pensionAuthDO.setAuthPeriod(pensionAuthPeriod);
                pensionAuthDO.setCreateAt(nowDate);
                comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
            }
        });

@@ -614,12 +640,51 @@
                }else{
                    authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                    BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
                    //查询老人信息
                    ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                    if(authElderliesDO != null){
                        BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                    }
                    authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                    authHistoryRecordDO.setAuthId(authRecords.getId());
                    comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
                }
            }
        });

        //查询养老认证记录列表
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                .ge(ComPensionAuthRecordDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
        //遍历养老认证记录列表
        pensionAuthList.forEach(authRecords -> {
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
                    .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authRecords.getPensionerId())
                    .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
            if(pensionAuthDO != null){//存在记录
                if(pensionAuthDO.getIsAuth().equals(ComPensionAuthHistoryRecordDO.isAuth.no)){
                    pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                    pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApprovalDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApproverId(authRecords.getApproverId());
                    pensionAuthDO.setSubmitUserId(authRecords.getSubmitUserId());
                    pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
                    pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
                    pensionAuthDO.setAuthId(authRecords.getId());
                    comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
                }
            }else{
                pensionAuthDO = new ComPensionAuthHistoryRecordDO();
                BeanUtils.copyProperties(authRecords,pensionAuthDO);
                //查询老人信息
                ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                if(authPensionerDO != null){
                    BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                }
                pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                pensionAuthDO.setAuthId(authRecords.getId());
                comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
            }
        });
        return R.ok();
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml

@@ -59,10 +59,10 @@
            and cpar.auth_method = #{pageElderAuthRecordsDTO.authMethod}
        </if>
        <if test="pageElderAuthRecordsDTO.authDateBegin != null and pageElderAuthRecordsDTO.authDateBegin != ''">
            and cpar.auth_date after #{pageElderAuthRecordsDTO.authDateBegin}
            and cpar.auth_date <![CDATA[ >= ]]> #{pageElderAuthRecordsDTO.authDateBegin}
        </if>
        <if test="pageElderAuthRecordsDTO.authDateEnd != null and pageElderAuthRecordsDTO.authDateEnd != ''">
            and cpar.auth_date before #{pageElderAuthRecordsDTO.authDateEnd}
            and cpar.auth_date <![CDATA[ <= ]]> #{pageElderAuthRecordsDTO.authDateEnd}
        </if>
        <if test="pageElderAuthRecordsDTO.approvalStatus != null and pageElderAuthRecordsDTO.approvalStatus != 0">
            and cpar.approval_status = #{pageElderAuthRecordsDTO.approvalStatus}
@@ -78,7 +78,8 @@
        </if>
        <if test="pageElderAuthRecordsDTO.searchKey != null and pageElderAuthRecordsDTO.searchKey != ''">
            and (cpap.`name` like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')
            or  cpar.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%'))
            or  cpar.mark like concat ('%', #{pageElderAuthRecordsDTO.searchKey}, '%')
            or cpap.id_card = #{pageElderAuthRecordsDTO.idCard})
        </if>
        order by cpar.create_at desc
    </select>