bugfixed

CeDo

2021-05-19 3716638dcafae6003028922d915196fc5546abc7

bugfixed

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java

@@ -108,9 +108,9 @@
     * @param pageEldersAuthDTO 搜索条件
     * @return 查找结果
     */
    @PostMapping("export")
    @PostMapping("/export")
    @ApiOperation(value = "导出高龄认证信息")
    R<String> export(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){
    R<String> export(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        String ftpUrl = "/mnt/data/web/excel/";

        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1560,7 +1560,8 @@
        if(theFamily==null){
            return R.fail("家庭成员信息错误");
        }
        if(theFamily.getAge()>=80){
        Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
        if(age>=80){
            Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
@@ -1571,7 +1572,9 @@
            eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
            eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
            //根据身份证查询出籍贯 出生日期
            String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());

            Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(birthDay);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java

@@ -47,10 +47,10 @@
            " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.authUserName != null'>" +
            " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
            " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
            " </if> " +
            "<if test='pageEldersAuthDTO.type == 1 '>" +
            "  AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
            "  AND  DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.type == 2 '>" +
                "<if test='pageEldersAuthDTO.createAtStart != null'>" +
@@ -103,7 +103,6 @@
            " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
            " <where> " +


            "<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" +
            " AND ea.id in " +
            "<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n" +
@@ -119,10 +118,10 @@
                " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.authUserName != null'>" +
                " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
                " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
                " </if> " +
                "<if test='pageEldersAuthDTO.type == 1 '>" +
                "  AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
                "  AND  DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.type == 2 '>" +
                    "<if test='pageEldersAuthDTO.createAtStart != null'>" +
@@ -137,4 +136,12 @@
            " ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order}  " +
            "</script>")
    List<ExcelElderAuthDTO> selectByParams( @Param("pageEldersAuthDTO")  PageEldersAuthDTO pageEldersAuthDTO);

    @Select("<script> " +
            "SELECT CONCAT(ap.province_name, ad.district_name) AS domicile\n" +
            "FROM com_mng_struct_area_province ap LEFT JOIN com_mng_struct_area_city ct ON ap.province_adcode = ct.province_adcode\n" +
            " LEFT JOIN com_mng_struct_area_district ad ON ct.city_adcode = ad.city_adcode "  +
            "  WHERE substring(ad.district_adcode, 1, 6) = substring(#{idCard}, 1, 6) "+
            "</script>")
    String selectDomicile(@Param("idCard")String idCard);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java

@@ -65,4 +65,11 @@
     * @return 维护结果
     */
    R queryExportData(PageEldersAuthDTO pageEldersAuthDTO);

    /**
     * 查询籍贯
     * @param idCard
     * @return
     */
    String queryDomicile(String idCard);
}

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

@@ -142,4 +142,9 @@
        page.setCurrent(10000);
        return R.ok(eldersAuthDAO.selectByParams(pageEldersAuthDTO));
    }

    @Override
    public String queryDomicile(String idCard) {
        return eldersAuthDAO.selectDomicile(idCard);
    }
}